diff --git a/yg/skin.cpp b/yg/skin.cpp
index af11cd364d..84076730bc 100644
--- a/yg/skin.cpp
+++ b/yg/skin.cpp
@@ -22,13 +22,16 @@ namespace yg
   Skin::Skin(shared_ptr<ResourceManager> const & resourceManager,
              Skin::TSkinPages const & pages)
     : m_pages(pages),
-      m_resourceManager(resourceManager)
+      m_resourceManager(resourceManager),
+      m_textPagesCount(2),
+      m_dynamicPagesCount(2),
+      m_staticPagesCount(pages.size())
   {
-    m_startDynamicPage = m_pages.size();
-    m_currentDynamicPage = m_pages.size();
-    /// adding at least two for proper double buffering,
-    /// although even 1 will work.
-    addDynamicPages(3);
+    m_startTextPage = m_currentTextPage = m_pages.size();
+    addDynamicPages(m_textPagesCount);
+
+    m_startDynamicPage = m_currentDynamicPage = m_pages.size();
+    addDynamicPages(m_dynamicPagesCount);
   }
 
   void Skin::addDynamicPages(int count)
@@ -115,6 +118,7 @@ namespace yg
   uint32_t Skin::mapGlyph(GlyphKey const & gk)
   {
     uint32_t res = invalidPageHandle();
+
     for (uint8_t i = 0; i < m_pages.size(); ++i)
     {
       res = m_pages[i]->findGlyph(gk);
@@ -122,10 +126,10 @@ namespace yg
         return packID(i, res);
     }
 
-    if (!m_pages[m_currentDynamicPage]->hasRoom(gk))
-      changeCurrentDynamicPage();
+    if (!m_pages[m_currentTextPage]->hasRoom(gk))
+      changeCurrentTextPage();
 
-    return packID(m_currentDynamicPage, m_pages[m_currentDynamicPage]->mapGlyph(gk));
+    return packID(m_currentTextPage, m_pages[m_currentTextPage]->mapGlyph(gk));
   }
 
   Skin::TSkinPages const & Skin::pages() const
@@ -187,7 +191,7 @@ namespace yg
     m_pages[m_currentDynamicPage]->clearFontHandles();
 
     /// 2. choose next dynamic page
-    if (m_currentDynamicPage == m_pages.size() - 1)
+    if (m_currentDynamicPage == m_startDynamicPage + m_dynamicPagesCount - 1)
       m_currentDynamicPage = m_startDynamicPage;
     else
       ++m_currentDynamicPage;
@@ -196,6 +200,20 @@ namespace yg
     callClearPageFns(m_currentDynamicPage);
   }
 
+  void Skin::changeCurrentTextPage()
+  {
+    callOverflowFns(m_currentTextPage);
+
+    m_pages[m_currentTextPage]->clearFontHandles();
+
+    if (m_currentTextPage == m_startTextPage + m_textPagesCount - 1)
+      m_currentTextPage = m_startTextPage;
+    else
+      ++m_currentTextPage;
+
+    callClearPageFns(m_currentTextPage);
+  }
+
   uint32_t Skin::invalidHandle() const
   {
     return 0xFFFFFFFF;
diff --git a/yg/skin.hpp b/yg/skin.hpp
index 545d7b2aa1..d6f0f7ee74 100644
--- a/yg/skin.hpp
+++ b/yg/skin.hpp
@@ -48,6 +48,15 @@ namespace yg
 
     uint8_t m_startDynamicPage;
     uint8_t m_currentDynamicPage;
+    uint8_t m_dynamicPagesCount;
+
+    uint8_t m_startTextPage;
+    uint8_t m_currentTextPage;
+    uint8_t m_textPagesCount;
+
+    uint8_t m_startStaticPage;
+    uint8_t m_currentStaticPage;
+    uint8_t m_staticPagesCount;
 
     shared_ptr<ResourceManager> m_resourceManager;
 
@@ -82,7 +91,9 @@ namespace yg
 
     void clearPageHandles(uint8_t pageID);
     void onOverflow(uint8_t pageID);
+
     void changeCurrentDynamicPage();
+    void changeCurrentTextPage();
 
   public: