diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 5fde06f75d..64d45f1447 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -979,7 +979,7 @@ namespace MWGui
             case MWGui::GM_Barter:
                 mControllerButtons.mA = "#{sSell}";
                 mControllerButtons.mB = "#{Interface:Cancel}";
-                mControllerButtons.mX = "#{sOffer}";
+                mControllerButtons.mX = "#{Interface:Offer}";
                 mControllerButtons.mR2 = "#{sBarter}";
                 break;
             case MWGui::GM_Inventory:
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 8d7cfac586..c1fba27cfb 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -226,7 +226,7 @@ namespace
 
             mControllerButtons.mA = "#{Interface:Select}";
             mControllerButtons.mX = "#{OMWEngine:JournalQuests}";
-            mControllerButtons.mY = "#{sTopics}";
+            mControllerButtons.mY = "#{Interface:Topics}";
 
             mQuestMode = false;
             mAllQuests = false;
@@ -696,10 +696,23 @@ namespace
 
         MWGui::ControllerButtons* getControllerButtons() override
         {
-            mControllerButtons.mB = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{Interface:Close}";
-            mControllerButtons.mL1 = mOptionsMode ? "" : "#{sPrev}";
-            mControllerButtons.mR1 = mOptionsMode ? "" : "#{sNext}";
-            mControllerButtons.mR3 = mOptionsMode && mQuestMode ? "#{OMWEngine:JournalShowAll}" : "";
+            if (mOptionsMode || mStates.size() > 1)
+                mControllerButtons.mB = "#{Interface:Back}";
+            else
+                mControllerButtons.mB = "#{Interface:Close}";
+
+            mControllerButtons.mL1.clear();
+            mControllerButtons.mR1.clear();
+            mControllerButtons.mR3.clear();
+            if (!mOptionsMode)
+            {
+                mControllerButtons.mL1 = "#{Interface:Prev}";
+                mControllerButtons.mR1 = "#{Interface:Next}";
+            }
+            else if (mQuestMode)
+            {
+                mControllerButtons.mR3 = "#{OMWEngine:JournalShowAll}";
+            }
             return &mControllerButtons;
         }
 
diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp
index 5e0a889a0f..20c17aa701 100644
--- a/apps/openmw/mwgui/merchantrepair.cpp
+++ b/apps/openmw/mwgui/merchantrepair.cpp
@@ -32,7 +32,7 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mDisableGamepadCursor = true;
-            mControllerButtons.mA = "#{sRepair}";
+            mControllerButtons.mA = "#{Interface:Repair}";
             mControllerButtons.mB = "#{Interface:Cancel}";
         }
     }
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index 6064fcfd94..119376bbb2 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -40,7 +40,7 @@ namespace MWGui
 
         mToolIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onSelectItem);
 
-        mControllerButtons.mA = "#{sRepair}";
+        mControllerButtons.mA = "#{Interface:Repair}";
         mControllerButtons.mB = "#{Interface:Cancel}";
         mControllerButtons.mY = "#{OMWEngine:RepairTool}";
     }
diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp
index de1ceaa573..0113045c83 100644
--- a/apps/openmw/mwgui/scrollwindow.cpp
+++ b/apps/openmw/mwgui/scrollwindow.cpp
@@ -41,7 +41,7 @@ namespace MWGui
 
         mControllerScrollWidget = mTextView;
         mControllerButtons.mB = "#{Interface:Close}";
-        mControllerButtons.mDpad = "#{sScrolldown}";
+        mControllerButtons.mDpad = "#{Interface:ScrollDown}";
 
         center();
     }
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 73b526a44b..656adcb4b7 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -85,7 +85,7 @@ namespace MWGui
         {
             setPinButtonVisible(false);
             mControllerButtons.mLStick = "#{Interface:Mouse}";
-            mControllerButtons.mRStick = "#{sScrolldown}";
+            mControllerButtons.mRStick = "#{Interface:ScrollDown}";
             mControllerButtons.mB = "#{Interface:Back}";
         }
 
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index bc57cb2c08..d238db70c9 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -190,7 +190,7 @@ namespace MWGui
 
             mControllerButtons.mA = "#{Interface:Buy}";
             mControllerButtons.mB = "#{Interface:Cancel}";
-            mControllerButtons.mX = "#{sOffer}";
+            mControllerButtons.mX = "#{Interface:Offer}";
             mControllerButtons.mR3 = "#{Interface:Info}";
             mControllerButtons.mL2 = "#{Interface:Inventory}";
         }
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index b5d9fd317b..e83c327125 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -41,7 +41,7 @@ namespace MWGui
         if (Settings::gui().mControllerMenus)
         {
             mDisableGamepadCursor = true;
-            mControllerButtons.mA = "#{sTravel}";
+            mControllerButtons.mA = "#{Interface:Travel}";
             mControllerButtons.mB = "#{Interface:Cancel}";
         }
     }
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 7d5fb0503e..8663ea1071 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -330,8 +330,17 @@ namespace MWGui
 
     ControllerButtons* WaitDialog::getControllerButtons()
     {
-        mControllerButtons.mA = mSleeping ? "#{sRest}" : "#{sWait}";
-        mControllerButtons.mX = mSleeping && mUntilHealedButton->getVisible() ? "#{sUntilHealed}" : "";
+        mControllerButtons.mX.clear();
+        if (mSleeping)
+        {
+            mControllerButtons.mA = "#{Interface:Rest}";
+            if (mUntilHealedButton->getVisible())
+                mControllerButtons.mX = "#{Interface:UntilHealed}";
+        }
+        else
+        {
+            mControllerButtons.mA = "#{Interface:Wait}";
+        }
         return &mControllerButtons;
     }
 
diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml
index cef128fdb6..0ff365ae60 100644
--- a/files/data-mw/l10n/Interface/gmst.yaml
+++ b/files/data-mw/l10n/Interface/gmst.yaml
@@ -16,12 +16,20 @@ Next: "sNext"
 No: "sNo"
 None: "sNone"
 Off: "sOff"
+Offer: "sOffer"
 OK: "sOK"
 On: "sOn"
 Prev: "sPrev"
+Repair: "sRepair"
+Rest: "sRest"
+ScrollDown: "sScrolldown"
 ScrollUp: "sScrollup"
 Select: "sSelect"
 Soul: "sSoulGem"
 Take: "sTake"
 TakeAll: "sTakeAll"
+Topics: "sTopics"
+Travel: "sTravel"
+UntilHealed: "sUntilHealed"
+Wait: "sWait"
 Yes: "sYes"
diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml
index 0413292169..98a34a1f0b 100644
--- a/files/data/l10n/Interface/de.yaml
+++ b/files/data/l10n/Interface/de.yaml
@@ -41,13 +41,21 @@ No: "Nein"
 None: "Keine"
 NotAvailableShort: "N/A"
 Off: "Aus"
+Offer: "Angebot"
 OK: "OK"
 On: "An"
 Prev: "Zurück"
+Repair: "Reparieren"
 Reset: "Zurücksetzen"
+Rest: "Rasten"
+ScrollDown: "Nach unten scrollen"
 ScrollUp: "Nach oben scrollen"
 Select: "Auswählen"
 Soul: "Seele"
 Take: "Nehmen"
 TakeAll: "Alles nehmen"
+Topics: "Themen"
+Travel: "Reisen"
+UntilHealed: "Bis geheilt"
+Wait: "Warten"
 Yes: "Ja"
diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
index 0a97542c35..10b0793eba 100644
--- a/files/data/l10n/Interface/en.yaml
+++ b/files/data/l10n/Interface/en.yaml
@@ -32,13 +32,21 @@ No: "No"
 None: "None"
 NotAvailableShort: "N/A"
 Off: "Off"
+Offer: "Offer"
 OK: "OK"
 On: "On"
 Prev: "Prev"
+Repair: "Repair"
 Reset: "Reset"
+Rest: "Rest"
+ScrollDown: "Scroll Down"
 ScrollUp: "Scroll Up"
 Select: "Select"
 Soul: "Soul"
 Take: "Take"
 TakeAll: "Take All"
+Topics: "Topics"
+Travel: "Travel"
+UntilHealed: "Until Healed"
+Wait: "Wait"
 Yes: "Yes"
diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml
index df5d950e5d..7de0a23a27 100644
--- a/files/data/l10n/Interface/fr.yaml
+++ b/files/data/l10n/Interface/fr.yaml
@@ -32,13 +32,21 @@ No: "Non"
 None: "Aucun"
 NotAvailableShort: "N/A"
 Off: "Inactif"
+Offer: "Proposer"
 OK: "Valider"
 On: "Actif"
 Prev: "Précédent"
+Repair: "Réparer"
 Reset: "Réinitialiser"
+Rest: "Repos"
+ScrollDown: "Défilement bas"
 ScrollUp: "Défilement haut"
 Select: "Sélectionner"
 Soul: "Ame"
 Take: "Prendre"
 TakeAll: "Tout prendre"
+Topics: "Sujets"
+Travel: "Voyager"
+UntilHealed: "Récup. totale"
+Wait: "Attendre"
 Yes: "Oui"
diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml
index cb71ed6fcd..07f7480146 100644
--- a/files/data/l10n/Interface/pl.yaml
+++ b/files/data/l10n/Interface/pl.yaml
@@ -30,13 +30,21 @@ No: "Nie"
 None: "Brak"
 NotAvailableShort: "N/D"
 Off: "Wył."
+Offer: "Zaoferuj"
 OK: "OK"
 On: "Wł."
 Prev: "Poprz."
+Repair: "Naprawa"
 Reset: "Przywróć"
+Rest: "Odpocznij"
+ScrollDown: "Przewiń w dół"
 ScrollUp: "Przewiń w górę"
 Select: "Wybierz"
 Soul: "Dusza"
 Take: "Weź"
 TakeAll: "Weź wszystko"
+Topics: "Tematy"
+Travel: "Podróż"
+UntilHealed: "Do wyzdr."
+Wait: "Czekaj"
 Yes: "Tak"
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
index 03d7ba53b1..7281635aac 100644
--- a/files/data/l10n/Interface/ru.yaml
+++ b/files/data/l10n/Interface/ru.yaml
@@ -29,13 +29,21 @@ No: "Нет"
 None: "Нет"
 NotAvailableShort: "Н/Д"
 Off: "Выкл"
+Offer: "Предложить"
 OK: "OK"
 On: "Вкл"
 Prev: "Пред"
+Repair: "Ремонт"
 Reset: "Сбросить"
+Rest: "Отдых"
+ScrollDown: "Прокрутить вниз"
 ScrollUp: "Прокрутить вверх"
 Select: "Выбрать"
 Soul: "Душа"
 Take: "Взять"
 TakeAll: "Взять все"
+Topics: "Темы"
+Travel: "Путешествие"
+UntilHealed: "Выздороветь"
+Wait: "Ждать"
 Yes: "Да"
diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml
index 8e183edb55..f33d9a7947 100644
--- a/files/data/l10n/Interface/sv.yaml
+++ b/files/data/l10n/Interface/sv.yaml
@@ -32,13 +32,21 @@ No: "Nej"
 None: "Inget"
 NotAvailableShort: "N/A"
 Off: "Av"
+Offer: "Föreslå"
 OK: "Ok"
 On: "På"
 Prev: "Föreg."
+Repair: "Laga"
 Reset: "Återställ"
+Rest: "Vila"
+ScrollDown: "Scrolla ner"
 ScrollUp: "Scrolla upp"
 Select: "Välj"
 Soul: "Själ"
 Take: "Ta"
 TakeAll: "Ta allt"
+Topics: "Ämnen"
+Travel: "Res"
+UntilHealed: "Tills återställd"
+Wait: "Vänta"
 Yes: "Ja"