diff --git a/res/layout/main.xml b/res/layout/main.xml
index 875c0f94c..ec5805537 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -57,6 +57,7 @@
 	  android:id="@+id/FullscreenControlButton"
 	  android:layout_width="55px"
 	  android:layout_height="55px"
+	  android:hint="@string/menu_exitfullscreen"
 	  android:background="#DDFFFFFF"
 	  android:src="@drawable/fullscreen_exit"
 	  android:layout_alignParentRight="true"
@@ -64,10 +65,10 @@
 	  />
       
       <Button
-	  android:id="@+id/btn_back_to_top"
+	  android:id="@+id/button_backtotop"
 	  android:layout_width="fill_parent"                    
 	  android:layout_height="wrap_content"
-	  android:text="@string/button_text_back_to_top"
+	  android:text="@string/button_backtotop"
 	  android:alpha="0.6"
 	  android:textColor="@android:color/black"
 	  android:textStyle="bold"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6760f5cb9..2fecee868 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Soek</string>
     <string name="menu_searchintext">Soek in teks</string>
     <string name="menu_randomarticle">Lukrake artikel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Volle skerm</string>
+    <string name="menu_exitfullscreen">Sluit volskerm</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Soek</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f32bc506f..c64423f3a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">إبحث</string>
     <string name="menu_searchintext">إبحث في النص</string>
     <string name="menu_randomarticle">مقالة عشوائية</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">ملئ الشاشة</string>
+    <string name="menu_exitfullscreen">أنهي نمط ملء الشاشة</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">إبحث</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 853b70285..4488d8493 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">অনুসন্ধান</string>
     <string name="menu_searchintext">লিখনীত বিচাৰক</string>
     <string name="menu_randomarticle">যাদৃচ্ছিক ৰচনা</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">পূর্ণাঙ্গ স্ক্রিন</string>
+    <string name="menu_exitfullscreen">পূৰ্ণাঙ্গ স্ক্ৰীণ বন্ধ কৰক</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">অনুসন্ধান</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ba/strings.xml b/res/values-ba/strings.xml
index 8afbed626..ccbaeb8f9 100644
--- a/res/values-ba/strings.xml
+++ b/res/values-ba/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Эҙләү</string>
     <string name="menu_searchintext">Текста табырға</string>
     <string name="menu_randomarticle">Осраҡлы мәҡәлә</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Тулы экран</string>
+    <string name="menu_exitfullscreen">Тулы экран режимынан сығырға</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Эҙләү</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 59e548b0a..279fb3e47 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Пошук</string>
     <string name="menu_searchintext">Знайсці ў тэксце</string>
     <string name="menu_randomarticle">Выпадковы артыкул</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Поўны экран</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Пошук</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cc00e4ffc..e2e9d9a0a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Търсене</string>
     <string name="menu_searchintext">Откриване в текста</string>
     <string name="menu_randomarticle">Случайна статия</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Цял екран</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Търсене</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-bm/strings.xml b/res/values-bm/strings.xml
index a158d749d..92601ec25 100644
--- a/res/values-bm/strings.xml
+++ b/res/values-bm/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Ɲinini kɛ</string>
     <string name="menu_searchintext">Ɲinini kɛ sɛbɛnni kɔnɔ</string>
     <string name="menu_randomarticle">Laala kunnafoni</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Ekaran fa</string>
+    <string name="menu_exitfullscreen">Bɔ ekaran falen na</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Ɲinini kɛ</string>
     <string name="articlesearch_hint">I ka kunnafoni ɲinintaw sɛbɛn yan.</string>
     <string name="choose_file">I mago bɛ fisiye min na ZIMU kɔnɔ, o suganti yan.</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Bonyali/dɔgɔyali butɔn dɔ jira ekaran kininfɛ seleke la, ka taa duguma.</string>
     <string name="pref_nightmode">A kɛ sufɛla ɲɛ ye.</string>
     <string name="pref_nightmode_summary">Kunnafoni minnu ɲɛ cogoya yɛlɛmanen don, olu jira.</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 5e127b6f1..c233d3266 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">অনুসন্ধান</string>
     <string name="menu_searchintext">লেখায় খুঁজুন</string>
     <string name="menu_randomarticle">অজানা যে-কোনো নিবন্ধ</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">পূর্ণাঙ্গ স্ক্রিন</string>
+    <string name="menu_exitfullscreen">পূর্ণঙ্গ স্ক্রীন বন্ধ করুন</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">অনুসন্ধান</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-br/strings.xml b/res/values-br/strings.xml
index f1975c7d6..624f005a5 100644
--- a/res/values-br/strings.xml
+++ b/res/values-br/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Klask</string>
     <string name="menu_searchintext">Kavout en destenn</string>
     <string name="menu_randomarticle">Ur pennad dre zegouezh</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Skramm leun</string>
+    <string name="menu_exitfullscreen">Kuitaat ar mod skramm leun</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Klask</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b732e8675..5cbdf7a23 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Cerca</string>
     <string name="menu_searchintext">Cercar en el text</string>
     <string name="menu_randomarticle">Article a l\'atzar</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Pantalla completa</string>
+    <string name="menu_exitfullscreen">Surt del mode de pantalla sencera</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Cerca</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Seleccioneu un fitxer de contingut ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Mostrar un botó de zoom a la part inferior dreta de la pantalla</string>
     <string name="pref_nightmode">Mode nocturn</string>
     <string name="pref_nightmode_summary">Mostrar els articles amb colors inverses</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8d6efb320..08268c075 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Vyhledávání</string>
     <string name="menu_searchintext">Najít v textu</string>
     <string name="menu_randomarticle">Náhodný článek</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Celá obrazovka</string>
+    <string name="menu_exitfullscreen">Ukončit celoobrazovkový režim</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Vyhledávání</string>
     <string name="articlesearch_hint">Pro vyhledání článků pište</string>
     <string name="choose_file">Vyberte obsahový soubor ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Zobrazit tlačítko přiblížení v pravém dolním rohu obrazovky</string>
     <string name="pref_nightmode">Noční režim</string>
     <string name="pref_nightmode_summary">Zobrazuje stránky v obrácených barvách.</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-cv/strings.xml b/res/values-cv/strings.xml
index ffbdef30c..66c65e9d2 100644
--- a/res/values-cv/strings.xml
+++ b/res/values-cv/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Шырав</string>
     <string name="menu_searchintext">Текстра шыра</string>
     <string name="menu_randomarticle">Ăнсăртран илнĕ статья</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Тулли экран</string>
+    <string name="menu_exitfullscreen">Тулли мар экран</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Шырав</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index 4b0ee7b40..88a9d1f18 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Chwilio</string>
     <string name="menu_searchintext">Chwilio\'r testun</string>
     <string name="menu_randomarticle">Erthygl ar hap</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Sgrin lawn</string>
+    <string name="menu_exitfullscreen">Gadael y modd sgrin lawn</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Chwilio</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 883ebc6ff..2ad1a56bb 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Søg</string>
     <string name="menu_searchintext">Find i teksten</string>
     <string name="menu_randomarticle">Tilfældig artikel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Fuld skærm</string>
+    <string name="menu_exitfullscreen">Forlad fuldskærm</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Søg</string>
     <string name="articlesearch_hint">Skriv for at finde artikler</string>
     <string name="choose_file">Vælg en ZIM indholdsfil (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Få vist en zoom-knap i skærmens nederste højre hjørne</string>
     <string name="pref_nightmode">Nat-tilstand</string>
     <string name="pref_nightmode_summary">Vis artikler med inverterede farver</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9ab6e3398..e2eb9e63c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Suche</string>
     <string name="menu_searchintext">Im Text suchen</string>
     <string name="menu_randomarticle">Zufälliger Artikel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Vollbildmodus</string>
+    <string name="menu_exitfullscreen">Vollbildmodus beenden</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Suche</string>
     <string name="articlesearch_hint">Zum Suchen von Artikeln tippen</string>
     <string name="choose_file">Wähle eine ZIM-Inhaltsdatei aus (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Einen Zoombutton in der rechten unteren Ecke anzeigen</string>
     <string name="pref_nightmode">Nachtmodus</string>
     <string name="pref_nightmode_summary">Artikel mit umgekehrten Farben ansehen</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 10c5fe234..178dfa42e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Αναζήτηση</string>
     <string name="menu_searchintext">Εύρεση στο κείμενο</string>
     <string name="menu_randomarticle">Τυχαίο άρθρο</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Πλήρης οθόνη</string>
+    <string name="menu_exitfullscreen">Έξοδος από τη λειτουργία πλήρους οθόνης</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Αναζήτηση</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 638ffe949..7f085488d 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Serĉi</string>
     <string name="menu_searchintext">Trovi en teksto</string>
     <string name="menu_randomarticle">Hazarda artikolo</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Plenekrane</string>
+    <string name="menu_exitfullscreen">Eliri la plenekranan reĝimon</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Serĉi</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 308a1b0a3..3304ad013 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Buscar</string>
     <string name="menu_searchintext">Buscar en el texto</string>
     <string name="menu_randomarticle">Página aleatoria</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Pantalla completa</string>
+    <string name="menu_exitfullscreen">Salir del modo de pantalla completa</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Buscar</string>
     <string name="articlesearch_hint">Tipo de búsqueda de artículos</string>
     <string name="choose_file">Seleccione un archivo de contenido de ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Mostrar un botón de zoom en la esquina inferior derecha de la pantalla</string>
     <string name="pref_nightmode">Modo nocturno</string>
     <string name="pref_nightmode_summary">Mostrar artículos con colores revertidas</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 19f496b29..5e878549a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Otsi</string>
     <string name="menu_searchintext">Otsi tekstist</string>
     <string name="menu_randomarticle">Juhuslik artikkel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Täisekraan</string>
+    <string name="menu_exitfullscreen">Välju täisekraani režiimist</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Otsi</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ecd960b84..3c506f1df 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">جستجو</string>
     <string name="menu_searchintext">جستجو در متن</string>
     <string name="menu_randomarticle">مقاله تصادفی</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">تمام صفحه</string>
+    <string name="menu_exitfullscreen">خروج از حالت تمام‌صفحه</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">جستجو</string>
     <string name="articlesearch_hint">برای یافتن مقاله‌ها تایپ کنید</string>
     <string name="choose_file">یک پروندهٔ محتوایی ZIM را انتخاب کنید (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">نمایش یک دکمهٔ بزرگ/کوچک‌نمایی در گوشهٔ سمت راست پایین صفحه</string>
     <string name="pref_nightmode">حالت شبانه</string>
     <string name="pref_nightmode_summary">نمایش مقاله‌ها با رنگ‌های معکوس‌شده</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1e26b9c8d..9a7b19fc4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Haku</string>
     <string name="menu_searchintext">Etsi tekstissä</string>
     <string name="menu_randomarticle">Satunnainen artikkeli</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Koko näyttö</string>
+    <string name="menu_exitfullscreen">Poistu koko näytön tilasta</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Haku</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-fo/strings.xml b/res/values-fo/strings.xml
index 2e3b7bae4..21ef3d0da 100644
--- a/res/values-fo/strings.xml
+++ b/res/values-fo/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Leita</string>
     <string name="menu_searchintext">Finn í teksti</string>
     <string name="menu_randomarticle">Tilvildarlig grein</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Fullan skerm</string>
+    <string name="menu_exitfullscreen">Far burtur frá fullum skermi</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Leita</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 236d5b386..abbf74f22 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Rechercher</string>
     <string name="menu_searchintext">Rechercher dans le texte</string>
     <string name="menu_randomarticle">Article au hasard</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Plein écran</string>
+    <string name="menu_exitfullscreen">Quitter le mode plein écran</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Rechercher</string>
     <string name="articlesearch_hint">Taper pour rechercher des articles</string>
     <string name="choose_file">Sélectionner un fichier de contenu ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Afficher un bouton de zoom dans le coin inférieur droit de l’écran</string>
     <string name="pref_nightmode">Mode nocturne</string>
     <string name="pref_nightmode_summary">Afficher les articles en couleurs inversées</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 2571479a9..2f14d5a5d 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Procurar</string>
     <string name="menu_searchintext">Atopar no texto</string>
     <string name="menu_randomarticle">Artigo ao chou</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Pantalla completa</string>
+    <string name="menu_exitfullscreen">Saír do modo de pantalla completa</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Procurar</string>
     <string name="articlesearch_hint">Empece a escribir para procurar artigos</string>
     <string name="choose_file">Seleccione un ficheiro de contido ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Mostrar un botón de zoom no recuncho inferior dereito da pantalla</string>
     <string name="pref_nightmode">Modo nocturno</string>
     <string name="pref_nightmode_summary">Mostrar os artigos coas cores invertidas</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index e900b84dc..03cda1b7f 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">શોધો</string>
     <string name="menu_searchintext">ભાષા ના સંદર્ભ  માં શોધો</string>
     <string name="menu_randomarticle">કોઈપણ એક લેખ</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">આખી સ્ક્રિન</string>
+    <string name="menu_exitfullscreen">પૂર્ણ સ્ક્રીન સ્થિતિમાંથી બહાર નીકળો</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">શોધો</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">ZIM માહિતી ફાઇલ (*.zim) પસંદ કરો</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">રાત્રિ સ્થિતિ</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 7826a8834..6d056dd31 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">חיפוש</string>
     <string name="menu_searchintext">חיפוש בטקסט</string>
     <string name="menu_randomarticle">ערך אקראי</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">מסך מלא</string>
+    <string name="menu_exitfullscreen">יציאה ממצב מסך מלא</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">חיפוש</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d6fea9c73..0dc24de31 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">खोजें</string>
     <string name="menu_searchintext">पाठ में खोजें</string>
     <string name="menu_randomarticle">यादृच्छिक अनुच्छेद</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">संपूर्ण स्क्रीन</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">खोजें</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 70776ed18..dbf2a5dab 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Traži</string>
     <string name="menu_searchintext">Nađi u tekstu</string>
     <string name="menu_randomarticle">Slučajni članak</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Preko cijelog zaslona</string>
+    <string name="menu_exitfullscreen">Izađi iz prikaza preko cijelog zaslona</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Traži</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6c44676c3..a75cd8b40 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Keresés</string>
     <string name="menu_searchintext">Keresés a szövegben</string>
     <string name="menu_randomarticle">Lap találomra</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Teljes képernyő</string>
+    <string name="menu_exitfullscreen">Kilépés a teljes képernyős üzemmódból</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Keresés</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ia/strings.xml b/res/values-ia/strings.xml
index 24c46a9e1..6afc95674 100644
--- a/res/values-ia/strings.xml
+++ b/res/values-ia/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Cercar</string>
     <string name="menu_searchintext">Cercar in texto</string>
     <string name="menu_randomarticle">Articulo aleatori</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Schermo complete</string>
+    <string name="menu_exitfullscreen">Exir del schermo complete</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Cercar</string>
     <string name="articlesearch_hint">Dactylographar pro cercar articulos</string>
     <string name="choose_file">Selige un file de contento ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Monstrar un button de zoom in le angulo inferior dextre del schermo</string>
     <string name="pref_nightmode">Modo nocturne</string>
     <string name="pref_nightmode_summary">Monstrar articulos in colores invertite</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 072eb7ebe..12ba4a910 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Cari</string>
     <string name="menu_searchintext">Cari di teks</string>
     <string name="menu_randomarticle">Artikel sembarang</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Layar penuh</string>
+    <string name="menu_exitfullscreen">Keluar dari mode layar penuh</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Cari</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ie/strings.xml b/res/values-ie/strings.xml
index b21ba71de..81ad7af2e 100644
--- a/res/values-ie/strings.xml
+++ b/res/values-ie/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Sercha</string>
     <string name="menu_searchintext">Constatar in textu</string>
     <string name="menu_randomarticle">Articul sporadic</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Scren ampli</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Sercha</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a768b7d3a..239f7f55b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Ricerca</string>
     <string name="menu_searchintext">Trova nel testo</string>
     <string name="menu_randomarticle">Voce a caso</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">A tutto schermo</string>
+    <string name="menu_exitfullscreen">Esci dalla modalità a tutto schermo</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Ricerca</string>
     <string name="articlesearch_hint">Scrivi per ricercare le voci</string>
     <string name="choose_file">Seleziona un file di contenuto ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Visualizza un pulsante di zoom nell\'angolo inferiore destro dello schermo</string>
     <string name="pref_nightmode">Modalità notte</string>
     <string name="pref_nightmode_summary">Visualizza le voci con colori invertiti</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8279017c6..6f6da4eee 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">検索</string>
     <string name="menu_searchintext">テキストで検索</string>
     <string name="menu_randomarticle">ランダム記事</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">全画面表示</string>
+    <string name="menu_exitfullscreen">全画面表示モードを終了</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">検索</string>
     <string name="articlesearch_hint">記事の検索</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">画面右下隅にズーム ボタンを表示する</string>
     <string name="pref_nightmode">夜モード</string>
     <string name="pref_nightmode_summary">記事を反転色で表示する</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-jv/strings.xml b/res/values-jv/strings.xml
index c7facd57e..a2b27d77e 100644
--- a/res/values-jv/strings.xml
+++ b/res/values-jv/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Golèk</string>
     <string name="menu_searchintext">Temukna nèng teks</string>
     <string name="menu_randomarticle">Waton artikel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Layar wutuh</string>
+    <string name="menu_exitfullscreen">Metu saka modé layar kebak</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Golèk</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 073fd15f0..84a4b7b34 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">ძიება</string>
     <string name="menu_searchintext">ძიება ტექსტში</string>
     <string name="menu_randomarticle">შემთხვევითი სტატია</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">სრულ ეკრანზე</string>
+    <string name="menu_exitfullscreen">მთლიანი ეკრანის რეჟიმიდან გამოსვლა</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">ძიება</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index af67676f5..c6c7e68da 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">ស្វែងរក</string>
     <string name="menu_searchintext">ស្វែងរកក្នុងអត្ថបទ</string>
     <string name="menu_randomarticle">អត្ថបទចៃដន្យ</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">ទំហំពេញអេក្រង់</string>
+    <string name="menu_exitfullscreen">ចេញពីម៉ូដទំហំពេញអេក្រង់</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">ស្វែងរក</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 307717441..b8af60314 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">ಅನ್ವೇಷಿಸಿ</string>
     <string name="menu_searchintext">ಪಠ್ಯದಲ್ಲಿ ಹುಡುಕಿ</string>
     <string name="menu_randomarticle">ಯಾವುದಾದರೊಂದು ಲೇಖನ</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">ಪೂರ್ಣಪರದೆ</string>
+    <string name="menu_exitfullscreen">ಪೂರ್ಣ ತೆರೆಯನ್ನು ನಿರ್ಗಮಿಸಿ</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">ಅನ್ವೇಷಿಸಿ</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 877fee190..e03cdf07d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">찾기</string>
     <string name="menu_searchintext">본문에서 찾기</string>
     <string name="menu_randomarticle">임의 문서</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">전체 화면</string>
+    <string name="menu_exitfullscreen">전체 화면 모드에서 나가기</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">찾기</string>
     <string name="articlesearch_hint">문서를 찾아보는 종류</string>
     <string name="choose_file">ZIM 콘텐츠 파일 (*.zim) 선택</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">야간 모드</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 6673d48f0..b43ec36e9 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Издөө</string>
     <string name="menu_searchintext">Тексттен табуу</string>
     <string name="menu_randomarticle">Тушкелди макала</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Толук көрүнүшү</string>
+    <string name="menu_exitfullscreen">Толук көрүнүштөн чыгуу</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Издөө</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index abfbc2729..feb7ef6e8 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Sichen</string>
     <string name="menu_searchintext">Am Text sichen</string>
     <string name="menu_randomarticle">Zoufällegen Artikel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Ganzen Ecran</string>
+    <string name="menu_exitfullscreen">Aus dem Modus vum ganzen Ecran erausgoen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Sichen</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-li/strings.xml b/res/values-li/strings.xml
index 909773e4c..7c874a461 100644
--- a/res/values-li/strings.xml
+++ b/res/values-li/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Zeuk</string>
     <string name="menu_searchintext">Zeuk in teks</string>
     <string name="menu_randomarticle">Willekäörig artikel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Volledig sjirm</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Zeuk</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 5bfd68e62..af328550d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Paieška</string>
     <string name="menu_searchintext">Rasti tekste</string>
     <string name="menu_randomarticle">Atsitiktinis straipsnis</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Visas ekranas</string>
+    <string name="menu_exitfullscreen">Išeiti iš viso ekrano režimo</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Paieška</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f89e47af8..d6a882a68 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Meklēt</string>
     <string name="menu_searchintext">Atrast tekstā</string>
     <string name="menu_randomarticle">Nejaušs raksts</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Pilnekrāna režīms</string>
+    <string name="menu_exitfullscreen">Iziet no pilnekrāna režīma</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Meklēt</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Nakts režīms</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index b4b313cc5..5685790c4 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Пребарување</string>
     <string name="menu_searchintext">Пронајди во текстот</string>
     <string name="menu_randomarticle">Случајна статија</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">На цел екран</string>
+    <string name="menu_exitfullscreen">Излези од цел екран</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Пребарување</string>
     <string name="articlesearch_hint">Тип за пребарување статии</string>
     <string name="choose_file">Изберете ZIM-податотека (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Прикажуваај копче за приближување во долниот десен агол</string>
     <string name="pref_nightmode">Ноќен режим</string>
     <string name="pref_nightmode_summary">Прикажувај ги статиите во обратни бои</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 7adf82b13..c83745e6e 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">തിരയുക</string>
     <string name="menu_searchintext">എഴുത്തിൽ തിരയുക</string>
     <string name="menu_randomarticle">ഏതെങ്കിലും ലേഖനം</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">മുഴുവന്‍ സ്ക്രീനില്‍</string>
+    <string name="menu_exitfullscreen">പൂർണ സ്ക്രീനിൽ നിന്ന് പുറത്തു കടക്കുക</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">തിരയുക</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 3b10c9d99..56babdd13 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Хайлт</string>
     <string name="menu_searchintext">Бичвэрээс хайх</string>
     <string name="menu_randomarticle">Санаандгүй сонгосон нийлэл</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Дэлгэц дүүргэн харах</string>
+    <string name="menu_exitfullscreen">Энгийн хэлбэрт шилжих</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Хайлт</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 59fcf5c3b..09b5e53e4 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Cari</string>
     <string name="menu_searchintext">Cari dalam teks</string>
     <string name="menu_randomarticle">Rencana rawak</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Skrin penuh</string>
+    <string name="menu_exitfullscreen">Keluar dari ragam skrin penuh</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Cari</string>
     <string name="articlesearch_hint">Taip untuk mencari rencana</string>
     <string name="choose_file">Pilih Fail Kandungan ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Paparkan butang zum pada sudut kanan bawah skrin</string>
     <string name="pref_nightmode">Mod malam</string>
     <string name="pref_nightmode_summary">Paparkan rencana yang diterbalikkan warnanya</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-mt/strings.xml b/res/values-mt/strings.xml
index e588a6af6..61fc017e0 100644
--- a/res/values-mt/strings.xml
+++ b/res/values-mt/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Fittex</string>
     <string name="menu_searchintext">Sib fit-test</string>
     <string name="menu_randomarticle">Artiklu kwalunkwe</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Skrin sħiħ</string>
+    <string name="menu_exitfullscreen">Oħroġ mill-modalità ta\' skrin sħiħ</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Fittex</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b1293455f..058278853 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">ရှာ​ဖွေ​ရန်​</string>
     <string name="menu_searchintext">စာပိုဒ်ထဲတွင် ရှာရန်</string>
     <string name="menu_randomarticle">ကျပန်း စာတွဲ</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">မျက်နှာဖွင့်အပြည့်</string>
+    <string name="menu_exitfullscreen">မျက်နှာဖွင့်အပြည့်မှ ထွက်ရန်</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">ရှာ​ဖွေ​ရန်​</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cfbe8f819..d44f7994c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Søk</string>
     <string name="menu_searchintext">Finn i tekst</string>
     <string name="menu_randomarticle">Tilfeldig artikkel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Fullskjerm</string>
+    <string name="menu_exitfullscreen">Avslutt fullskjermmodus</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Søk</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index df94a66ed..7615c59ae 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">खोज</string>
     <string name="menu_searchintext">अर्को भेट्टउने</string>
     <string name="menu_randomarticle">कुनै लेख</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">पूरा पर्दा</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">खोज</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1c39f51f8..2fe6cd430 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Zoeken</string>
     <string name="menu_searchintext">Zoeken in tekst</string>
     <string name="menu_randomarticle">Willekeurig artikel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Volledig scherm</string>
+    <string name="menu_exitfullscreen">Volledig schermmodus verlaten</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Zoeken</string>
     <string name="articlesearch_hint">Voer tekst in om pagina\'s te zoeken</string>
     <string name="choose_file">Selecteer een ZIM inhoudsbestand (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Rechtsonder een zoomknop weergeven</string>
     <string name="pref_nightmode">Nachtmodus</string>
     <string name="pref_nightmode_summary">Pagina\'s weergeven met omgekeerde kleuren</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-nn/strings.xml b/res/values-nn/strings.xml
index 77397c369..5cfe3bf24 100644
--- a/res/values-nn/strings.xml
+++ b/res/values-nn/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Søk</string>
     <string name="menu_searchintext">Finn i tekst</string>
     <string name="menu_randomarticle">Tilfeldig artikkel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Fullskjerm</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Søk</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-oc/strings.xml b/res/values-oc/strings.xml
index 2f88368ba..d6cd50902 100644
--- a/res/values-oc/strings.xml
+++ b/res/values-oc/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Cèrca</string>
     <string name="menu_searchintext">Trobar dins lo tèxte</string>
     <string name="menu_randomarticle">Article per escasença</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Plen ecran</string>
+    <string name="menu_exitfullscreen">Quitar lo mòde ecran complet</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Cèrca</string>
     <string name="articlesearch_hint">Picar per recercar d\'articles</string>
     <string name="choose_file">Seleccionar un fichièr de contengut ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Afichar un boton de zoom dins lo canton inferior drech de l’ecran</string>
     <string name="pref_nightmode">Mòde nocturne</string>
     <string name="pref_nightmode_summary">Afichar los articles en colors inversadas</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 068eacaa9..9bc5622df 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">ଖୋଜିବେ</string>
     <string name="menu_searchintext">ଲେଖାରେ ଖୋଜିବେ</string>
     <string name="menu_randomarticle">ଯାହିତାହି ପ୍ରସଙ୍ଗ</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">ପୁରା ସ୍କ୍ରିନ</string>
+    <string name="menu_exitfullscreen">ପୁରା ସ୍କ୍ରିନ ମୋଡରୁ ଓହରି ଆସିବେ</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">ଖୋଜିବେ</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fbb58319f..6a489def0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Szukaj</string>
     <string name="menu_searchintext">Znajdź w tekście</string>
     <string name="menu_randomarticle">Losowy artykuł</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Pełny ekran</string>
+    <string name="menu_exitfullscreen">Wyjdź z trybu pełnego ekranu</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Szukaj</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Tryb nocny</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ps/strings.xml b/res/values-ps/strings.xml
index 3277f4441..76a5cc443 100644
--- a/res/values-ps/strings.xml
+++ b/res/values-ps/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">پلټل</string>
     <string name="menu_searchintext">په متن کې موندل</string>
     <string name="menu_randomarticle">ناټاکلې ليکنه</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">ډکه پرده</string>
+    <string name="menu_exitfullscreen">د بشپړ پردې ښکارېدنې نه وتل</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">پلټل</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">د ZIM مېنځپانگې يوه دوتنه ټاکل (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">د شپې بڼه</string>
     <string name="pref_nightmode_summary">رنگ اړول شوې ليکنې ښکاره کول</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index eab6f3247..aa014d4fb 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Pesquisar</string>
     <string name="menu_searchintext">Procurar no texto</string>
     <string name="menu_randomarticle">Artigo aleatório</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Ecrã completo</string>
+    <string name="menu_exitfullscreen">Sair do modo de tela inteira</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Pesquisar</string>
     <string name="articlesearch_hint">Digite para pesquisar artigos.</string>
     <string name="choose_file">Selecione um arquivo de conteúdo ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-qu/strings.xml b/res/values-qu/strings.xml
index 7fad1f8cd..e93c7903e 100644
--- a/res/values-qu/strings.xml
+++ b/res/values-qu/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Maskay</string>
     <string name="menu_searchintext">Qillqapi maskay</string>
     <string name="menu_randomarticle">Mayninpi p\'anqa</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Hunt\'a qhawana pampa</string>
+    <string name="menu_exitfullscreen">Hunt\'a qhawana pampamanta lluqsiy</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Maskay</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Tuta laya</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 2c74b485d..be7345711 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Tschertgar</string>
     <string name="menu_searchintext">Tschertgar en il text</string>
     <string name="menu_randomarticle">Artitgel casual</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Maletg entir</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Tschertgar</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 280ebff4d..9dd612773 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Căutare</string>
     <string name="menu_searchintext">Căutare în text</string>
     <string name="menu_randomarticle">Articol aleatoriu</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Ecran complet</string>
+    <string name="menu_exitfullscreen">Ieșire din modul ecran complet</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Căutare</string>
     <string name="articlesearch_hint">Tastați pentru a căuta articole</string>
     <string name="choose_file">Alegeți un fișier cu conținut ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Afișează un buton de zoom în colțul din dreapta jos al ecranului</string>
     <string name="pref_nightmode">Mod de noapte</string>
     <string name="pref_nightmode_summary">Afișează articolele în culori inversate</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 27cb88e8f..440be8323 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Поиск</string>
     <string name="menu_searchintext">Найти в тексте</string>
     <string name="menu_randomarticle">Случайная статья</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">На весь экран</string>
+    <string name="menu_exitfullscreen">Выход из полноэкранного режима</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Поиск</string>
     <string name="articlesearch_hint">Введите для поиска статей</string>
     <string name="choose_file">Выберите ZIM-файл (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Отображать кнопку масштабирования в правом нижнем углу экрана</string>
     <string name="pref_nightmode">Ночной режим</string>
     <string name="pref_nightmode_summary">Показать статьи в «ночном режиме»</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-sa/strings.xml b/res/values-sa/strings.xml
index 1750c01df..bcbbcf265 100644
--- a/res/values-sa/strings.xml
+++ b/res/values-sa/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">अन्वेषणम्</string>
     <string name="menu_searchintext">पाठे अन्विष्यताम्</string>
     <string name="menu_randomarticle">यादृच्छिक लेख</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">संपूर्ण पटल</string>
+    <string name="menu_exitfullscreen">सम्पूर्णपटलावस्थातः बहिर्गम्यताम्</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">अन्वेषणम्</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-sh/strings.xml b/res/values-sh/strings.xml
index d17c9ac7d..7356f72d1 100644
--- a/res/values-sh/strings.xml
+++ b/res/values-sh/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Traži</string>
     <string name="menu_searchintext">Pronađi u tekstu</string>
     <string name="menu_randomarticle">Slučajni članak</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Cijeli ekran</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Traži</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 76ff70e04..f489ce863 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">ගවේෂණය</string>
     <string name="menu_searchintext">පෙළෙහි සොයන්න</string>
     <string name="menu_randomarticle">අහඹු ලිපිය</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">පූර්ණ තිරය</string>
+    <string name="menu_exitfullscreen">පූර්ණ තිර ආකාරයෙන් ඉවත් වන්න</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">ගවේෂණය</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3118ca070..52dab28c8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Hľadať</string>
     <string name="menu_searchintext">Nájsť v texte</string>
     <string name="menu_randomarticle">Náhodný článok</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Celá obrazovka</string>
+    <string name="menu_exitfullscreen">Ukončiť režim celej obrazovky</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Hľadať</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 7fd2874a1..04ccf2369 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Iskanje</string>
     <string name="menu_searchintext">Najdi v besedilu</string>
     <string name="menu_randomarticle">Naključni članek</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Celoten zaslon</string>
+    <string name="menu_exitfullscreen">Izhod iz celozaslonskega načina</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Iskanje</string>
     <string name="articlesearch_hint">Vrsta iskanih člankov</string>
     <string name="choose_file">Izberite datoteko z vsebino ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">V spodnjem desnem vogalu zaslona prikaži gumb za zumiranje</string>
     <string name="pref_nightmode">Nočni način</string>
     <string name="pref_nightmode_summary">Prikaz člankov z obrnjenimi barvami</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 59699a99d..26ce7c2e9 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Kërko</string>
     <string name="menu_searchintext">Kërko në tekst</string>
     <string name="menu_randomarticle">Artikull i  rastit</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Ekran i plotë</string>
+    <string name="menu_exitfullscreen">Dil nga ekrani i plotë</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Kërko</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-su/strings.xml b/res/values-su/strings.xml
index e6ad15df8..616c0291b 100644
--- a/res/values-su/strings.xml
+++ b/res/values-su/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Paluruh</string>
     <string name="menu_searchintext">Téangan dina téks</string>
     <string name="menu_randomarticle">Artikel acak</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Layar pinuh</string>
+    <string name="menu_exitfullscreen">Kaluar ti modeu layar pinuh</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Paluruh</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 083e16dd1..aecae08ba 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Sök</string>
     <string name="menu_searchintext">Hitta i text</string>
     <string name="menu_randomarticle">Slumpmässig artikel</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Helskärm</string>
+    <string name="menu_exitfullscreen">Avsluta helskärmsläge</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Sök</string>
     <string name="articlesearch_hint">Skriv för att kolla upp artiklar</string>
     <string name="choose_file">Välj en ZIM-innehållsfil (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Visa en zoomknapp längst ned i det högra hörnet på skärmen</string>
     <string name="pref_nightmode">Nattläge</string>
     <string name="pref_nightmode_summary">Visa artiklar med inverterade färger</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2143a3673..2f7c91863 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Tafuta</string>
     <string name="menu_searchintext">Tafuta katika makala</string>
     <string name="menu_randomarticle">Ukurasa wa bahati</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Skrini nzima</string>
+    <string name="menu_exitfullscreen">Toka kwa modi ya Skrini nzima</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Tafuta</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 784cb46c9..5f315a3aa 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">தேடு</string>
     <string name="menu_searchintext">உரையில் கண்டுபிடி</string>
     <string name="menu_randomarticle">தொடர்பற்ற கட்டுரை</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">முழு திரை</string>
+    <string name="menu_exitfullscreen">முழு திரை வகையிலிருந்து வெளியேறு</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">தேடு</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">ZIM கோப்பை தேர்வு செய் (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 9a25d917f..579bd4671 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">వెతుకు</string>
     <string name="menu_searchintext">పాఠ్యంలో వెతుకు</string>
     <string name="menu_randomarticle">యాదృచ్చిక వ్యాసం</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">నిండుతెర</string>
+    <string name="menu_exitfullscreen">పూర్తి తెర విధానము నిష్క్రమించు</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">వెతుకు</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 854b9bfb4..69217fb5e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">ค้นหา</string>
     <string name="menu_searchintext">ค้นหาในข้อความ</string>
     <string name="menu_randomarticle">สุ่มบทความ</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">เต็มหน้าจอ</string>
+    <string name="menu_exitfullscreen">ออกจากโหมดเต็มหน้าจอ</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">ค้นหา</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 520748e23..8f44bf22d 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Humanap</string>
     <string name="menu_searchintext">Hanapin sa teksto</string>
     <string name="menu_randomarticle">Alin mang artikulo</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Buong panooran</string>
+    <string name="menu_exitfullscreen">Huwag buong panooran</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Humanap</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 89fab0bbf..0a94eec89 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Ara</string>
     <string name="menu_searchintext">Metinde bul</string>
     <string name="menu_randomarticle">Rastgele madde</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Tam ekran</string>
+    <string name="menu_exitfullscreen">Tam ekran modundan çık</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Ara</string>
     <string name="articlesearch_hint">Makalelerde aranacak kelimeyi yazın</string>
     <string name="choose_file">Bir ZIM İçerik Dosyası seçin (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Ekranın sağ alt köşesinde bir zum butonu görüntüle</string>
     <string name="pref_nightmode">Gece modu</string>
     <string name="pref_nightmode_summary">Makaleleri dönüştürülmüş renklerle göster</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5e2e33e8d..425a3289e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Знайти</string>
     <string name="menu_searchintext">Знайти в тексті</string>
     <string name="menu_randomarticle">Випадкова стаття</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Повноекранний режим</string>
+    <string name="menu_exitfullscreen">Вийти з повноекранного режиму</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Знайти</string>
     <string name="articlesearch_hint">Наберіть для пошуку статей</string>
     <string name="choose_file">Виберіть файл вмісту ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Відображати кнопку масштаб у нижньому правому куті екрану</string>
     <string name="pref_nightmode">Нічний режим</string>
     <string name="pref_nightmode_summary">Показати статті з повернутими кольорами</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index a8d3c5e87..184287172 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">تلاش</string>
     <string name="menu_searchintext">متن میں تلاش کریں</string>
     <string name="menu_randomarticle">تصادفی مقالہ</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">مکمل تظاہرہ</string>
+    <string name="menu_exitfullscreen">اندازِ مکمل تظاہرہ کو ختم کریں</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">تلاش</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 75aeea689..4e5f44f68 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Qidiruv</string>
     <string name="menu_searchintext">Matndan qidirish</string>
     <string name="menu_randomarticle">Tasodifiy sahifa</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Toʻliq ekran</string>
+    <string name="menu_exitfullscreen">Toʻliq ekran tartibidan chiqish</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Qidiruv</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d89543048..94ad35f65 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Tìm kiếm</string>
     <string name="menu_searchintext">Tìm trong Văn bản</string>
     <string name="menu_randomarticle">Bài viết Ngẫu nhiên</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Toàn màn hình</string>
+    <string name="menu_exitfullscreen">Thoát chế độ toàn màn hình</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Tìm kiếm</string>
     <string name="articlesearch_hint">Gõ để tra cứu bài</string>
     <string name="choose_file">Chọn một Tập tin Nội dung ZIM (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Hiện nút thu phóng ở góc phải bên dưới của màn hình</string>
     <string name="pref_nightmode">Chế độ ban đêm</string>
     <string name="pref_nightmode_summary">Đảo ngược màu sắc trong bài</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-yi/strings.xml b/res/values-yi/strings.xml
index aae243b38..258352f3a 100644
--- a/res/values-yi/strings.xml
+++ b/res/values-yi/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">זוכן</string>
     <string name="menu_searchintext">זוכן אין טעקסט</string>
     <string name="menu_randomarticle">צופֿעליגער ארטיקל</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">פֿולער עקראן</string>
+    <string name="menu_exitfullscreen">אוועקגיין פון פולן עקראן מאדע</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">זוכן</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-yo/strings.xml b/res/values-yo/strings.xml
index f444ad889..d206fd4ae 100644
--- a/res/values-yo/strings.xml
+++ b/res/values-yo/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Àwárí</string>
     <string name="menu_searchintext">Ìwárí nínú ìkọ</string>
     <string name="menu_randomarticle">Àyọkà àrìnnàkò</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Ojúìran kíkúnrẹ́rẹ́</string>
+    <string name="menu_exitfullscreen">Ìjáde kúrò ní ojúìran kíkúnrẹ́rẹ́</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Àwárí</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 1b0cde366..d69e605a1 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">搜索</string>
     <string name="menu_searchintext">在文本中查找</string>
     <string name="menu_randomarticle">随机页面</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">全屏</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">搜索</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 80016551d..16bd667e6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10,8 +10,9 @@
     <string name="menu_search">Search article</string>
     <string name="menu_searchintext">Find in page</string>
     <string name="menu_randomarticle">Random article</string>
-    <string name="menu_fullscreen">Fullscreen</string>
-    <string name="menu_exitfullscreen">Exit fullScreen</string>
+    <string name="menu_fullscreen">Full screen</string>
+    <string name="menu_exitfullscreen">Exit full screen</string>
+    <string name="button_backtotop">Back to Top</string>
     <string name="search_label">Search</string>
     <string name="articlesearch_hint">Type to lookup articles</string>
     <string name="choose_file">Select a ZIM Content File (*.zim)</string>
@@ -37,7 +38,6 @@
     <string name="pref_zoom_enable_summary">Display a zoom button in the screen bottom right corner</string>
     <string name="pref_nightmode">Night mode</string>
     <string name="pref_nightmode_summary">Show articles with reverted colors</string>
-    <string name="button_pref_title">Back to top button</string>
-    <string name="button_pref_description">Adds a button to the end of the page to scroll up to top</string>
-    <string name="button_text_back_to_top">Back To Top</string>
+    <string name="pref_backtotop">Back to Top button</string>
+    <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 5ce7a4ac7..36d47a6e2 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,33 +1,33 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory 
-        android:key="pref_display"
-        android:title="@string/pref_display_title">
-        
-        
-        <ListPreference
-        	android:key="pref_zoom"
-        	android:title="@string/pref_zoom_title"
-        	android:dialogTitle="@string/pref_zoom_dialogtitle"
-        	android:entries="@array/pref_zoom_entries"
-        	android:entryValues="@array/pref_zoom_entryvalues"
-        	android:defaultValue="automatic" />
-        <CheckBoxPreference android:key="pref_zoom_enabled" android:title="@string/pref_zoom_enable" android:summary="@string/pref_zoom_enable_summary" android:defaultValue="false"/>
-        <CheckBoxPreference android:key="pref_nightmode" android:title="@string/pref_nightmode" android:defaultValue="false" android:summary="@string/pref_nightmode_summary"/>
-        <CheckBoxPreference android:key="pref_top_button" android:title="@string/button_pref_title" android:summary="@string/button_pref_description" android:defaultValue="true"/>        
-    </PreferenceCategory>
+  <PreferenceCategory 
+      android:key="pref_display"
+      android:title="@string/pref_display_title">
     
-    <PreferenceCategory 
-           android:title="@string/pref_info_title"
-           android:key="pref_info">
+    <ListPreference
+	android:key="pref_zoom"
+	android:title="@string/pref_zoom_title"
+	android:dialogTitle="@string/pref_zoom_dialogtitle"
+	android:entries="@array/pref_zoom_entries"
+	android:entryValues="@array/pref_zoom_entryvalues"
+	android:defaultValue="automatic" />
+    <CheckBoxPreference android:key="pref_zoom_enabled" android:title="@string/pref_zoom_enable" android:summary="@string/pref_zoom_enable_summary" android:defaultValue="false"/>
+    <CheckBoxPreference android:key="pref_nightmode" android:title="@string/pref_nightmode" android:defaultValue="false" android:summary="@string/pref_nightmode_summary"/>
+    <CheckBoxPreference android:key="pref_backtotop" android:title="@string/pref_backtotop" android:summary="@string/pref_backtotop_summary" android:defaultValue="true"/>
 
-      <EditTextPreference
-	  android:key="pref_version"
-	  android:title="@string/pref_info_version"
-	  android:enabled="false" 
-	  android:selectable="false"
-	  android:persistent="false"
-	  android:shouldDisableView="false"/>
-
-    </PreferenceCategory>
-       
+  </PreferenceCategory>
+  
+  <PreferenceCategory 
+      android:title="@string/pref_info_title"
+      android:key="pref_info">
+    
+    <EditTextPreference
+	android:key="pref_version"
+	android:title="@string/pref_info_version"
+	android:enabled="false" 
+	android:selectable="false"
+	android:persistent="false"
+	android:shouldDisableView="false"/>
+    
+  </PreferenceCategory>
+  
 </PreferenceScreen>