diff --git a/app/src/main/java/helium314/keyboard/latin/settings/Settings.java b/app/src/main/java/helium314/keyboard/latin/settings/Settings.java
index 577f8c95f..29dc5fa91 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/Settings.java
+++ b/app/src/main/java/helium314/keyboard/latin/settings/Settings.java
@@ -94,7 +94,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     public static final String PREF_BLOCK_POTENTIALLY_OFFENSIVE = "block_potentially_offensive";
     public static final String PREF_LANGUAGE_SWITCH_KEY = "language_switch_key";
     public static final String PREF_SHOW_EMOJI_KEY = "show_emoji_key";
-    public static final String PREF_FIX_TOOLBAR_DIRECTION = "fix_toolbar_direction";
+    public static final String PREF_VARIABLE_TOOLBAR_DIRECTION = "var_toolbar_direction";
     public static final String PREF_ADDITIONAL_SUBTYPES = "additional_subtypes";
     public static final String PREF_ENABLE_SPLIT_KEYBOARD = "split_keyboard";
     public static final String PREF_SPLIT_SPACER_SCALE = "split_spacer_scale";
diff --git a/app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java b/app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java
index 643880d0e..2549748f1 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java
+++ b/app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java
@@ -68,7 +68,7 @@ public class SettingsValues {
     public final boolean mShowsPopupHints;
     public final boolean mSpaceForLangChange;
     public final boolean mShowsEmojiKey;
-    public final boolean mFixToolbarDirection;
+    public final boolean mVarToolbarDirection;
     public final boolean mUsePersonalizedDicts;
     public final boolean mUseDoubleSpacePeriod;
     public final boolean mBlockPotentiallyOffensive;
@@ -151,7 +151,7 @@ public SettingsValues(final Context context, final SharedPreferences prefs, fina
         mShowsPopupHints = prefs.getBoolean(Settings.PREF_SHOW_POPUP_HINTS, false);
         mSpaceForLangChange = prefs.getBoolean(Settings.PREF_SPACE_TO_CHANGE_LANG, true);
         mShowsEmojiKey = prefs.getBoolean(Settings.PREF_SHOW_EMOJI_KEY, false);
-        mFixToolbarDirection = prefs.getBoolean(Settings.PREF_FIX_TOOLBAR_DIRECTION, true);
+        mVarToolbarDirection = prefs.getBoolean(Settings.PREF_VARIABLE_TOOLBAR_DIRECTION, true);
         mUsePersonalizedDicts = prefs.getBoolean(Settings.PREF_KEY_USE_PERSONALIZED_DICTS, true);
         mUseDoubleSpacePeriod = prefs.getBoolean(Settings.PREF_KEY_USE_DOUBLE_SPACE_PERIOD, true)
                 && inputAttributes.mIsGeneralTextInput;
diff --git a/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.java b/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.java
index b3f74a6f4..84e1a39c6 100644
--- a/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.java
+++ b/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.java
@@ -264,7 +264,7 @@ private void updateKeys() {
 
     public void setRtl(final boolean isRtlLanguage) {
         final int layoutDirection;
-        if (Settings.getInstance().getCurrent().mFixToolbarDirection)
+        if (!Settings.getInstance().getCurrent().mVarToolbarDirection)
             layoutDirection = ViewCompat.LAYOUT_DIRECTION_LOCALE;
         else{
             layoutDirection = isRtlLanguage ? ViewCompat.LAYOUT_DIRECTION_RTL : ViewCompat.LAYOUT_DIRECTION_LTR;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8ff9a1591..c7eedde01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -776,8 +776,8 @@ New dictionary:
     <string name="action_none">None</string>
     <!-- Option to move the cursor when swiping the spacebar -->
     <string name="space_swipe_move_cursor_entry">Move Cursor</string>
-    <!-- Title of the settings to fix toolbar direction -->
-    <string name="fix_toolbar_direction">Fix toolbar direction</string>
-    <!-- Description of the fix_toolbar_direction setting -->
-    <string name="fix_toolbar_direction_summary">If disabled, the direction of the active layout will be used</string>
+    <!-- Title of the settings for variable toolbar direction -->
+    <string name="var_toolbar_direction">Variable toolbar direction</string>
+    <!-- Description of the variable toolbar direction setting -->
+    <string name="var_toolbar_direction_summary">Reverse direction when a right-to-left keyboard subtype is selected</string>
 </resources>
diff --git a/app/src/main/res/xml/prefs_screen_preferences.xml b/app/src/main/res/xml/prefs_screen_preferences.xml
index c591b918e..e473f5895 100644
--- a/app/src/main/res/xml/prefs_screen_preferences.xml
+++ b/app/src/main/res/xml/prefs_screen_preferences.xml
@@ -99,9 +99,9 @@
             android:title="@string/toolbar_keys" />
 
         <SwitchPreference
-            android:key="fix_toolbar_direction"
-            android:title="@string/fix_toolbar_direction"
-            android:summary="@string/fix_toolbar_direction_summary"
+            android:key="var_toolbar_direction"
+            android:title="@string/var_toolbar_direction"
+            android:summary="@string/var_toolbar_direction_summary"
             android:defaultValue="true"
             android:persistent="true" />