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/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml
index cef128fdb6..dd20f4132a 100644
--- a/files/data-mw/l10n/Interface/gmst.yaml
+++ b/files/data-mw/l10n/Interface/gmst.yaml
@@ -24,4 +24,5 @@ Select: "sSelect"
 Soul: "sSoulGem"
 Take: "sTake"
 TakeAll: "sTakeAll"
+Topics: "sTopics"
 Yes: "sYes"
diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml
index 0413292169..211faf3d29 100644
--- a/files/data/l10n/Interface/de.yaml
+++ b/files/data/l10n/Interface/de.yaml
@@ -50,4 +50,5 @@ Select: "Auswählen"
 Soul: "Seele"
 Take: "Nehmen"
 TakeAll: "Alles nehmen"
+Topics: "Themen"
 Yes: "Ja"
diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
index 0a97542c35..05a1a1fb7c 100644
--- a/files/data/l10n/Interface/en.yaml
+++ b/files/data/l10n/Interface/en.yaml
@@ -41,4 +41,5 @@ Select: "Select"
 Soul: "Soul"
 Take: "Take"
 TakeAll: "Take All"
+Topics: "Topics"
 Yes: "Yes"
diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml
index df5d950e5d..c886c9ba0c 100644
--- a/files/data/l10n/Interface/fr.yaml
+++ b/files/data/l10n/Interface/fr.yaml
@@ -41,4 +41,5 @@ Select: "Sélectionner"
 Soul: "Ame"
 Take: "Prendre"
 TakeAll: "Tout prendre"
+Topics: "Sujets"
 Yes: "Oui"
diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml
index cb71ed6fcd..457d3e903f 100644
--- a/files/data/l10n/Interface/pl.yaml
+++ b/files/data/l10n/Interface/pl.yaml
@@ -39,4 +39,5 @@ Select: "Wybierz"
 Soul: "Dusza"
 Take: "Weź"
 TakeAll: "Weź wszystko"
+Topics: "Tematy"
 Yes: "Tak"
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
index 03d7ba53b1..0f49a2bea7 100644
--- a/files/data/l10n/Interface/ru.yaml
+++ b/files/data/l10n/Interface/ru.yaml
@@ -38,4 +38,5 @@ Select: "Выбрать"
 Soul: "Душа"
 Take: "Взять"
 TakeAll: "Взять все"
+Topics: "Темы"
 Yes: "Да"