diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
index c075563f4..1089280de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
@@ -32,6 +32,8 @@ public class GBPrefs {
     private static final boolean AUTO_START_DEFAULT = true;
     private static final String BG_JS_ENABLED = "pebble_enable_background_javascript";
     private static final boolean BG_JS_ENABLED_DEFAULT = false;
+    public static final String RTL_SUPPORT = "rtl";
+    public static final String RTL_CONTEXTUAL_ARABIC = "contextualArabic";
     public static boolean AUTO_RECONNECT_DEFAULT = true;
 
     public static final String USER_NAME = "mi_user_alias";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java
index 73c4beb93..0f90132f0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java
@@ -18,7 +18,7 @@ public class RtlUtils {
      */
     public static boolean rtlSupport()
     {
-        return GBApplication.getPrefs().getBoolean("rtl", false);
+        return GBApplication.getPrefs().getBoolean(GBPrefs.RTL_SUPPORT, false);
     }
 
     public enum characterType{
@@ -65,7 +65,7 @@ public class RtlUtils {
      */
     public static boolean contextualSupport()
     {
-        return GBApplication.getPrefs().getBoolean("contextualArabic", false);
+        return GBApplication.getPrefs().getBoolean(GBPrefs.RTL_CONTEXTUAL_ARABIC, false);
     }
 
     //map with brackets chars to change there direction
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationServiceTestCase.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationServiceTestCase.java
index 46301175b..4eee67733 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationServiceTestCase.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationServiceTestCase.java
@@ -119,7 +119,7 @@ public class DeviceCommunicationServiceTestCase extends TestBase {
     public void testRtlSupport() {
         SharedPreferences settings = GBApplication.getPrefs().getPreferences();
         SharedPreferences.Editor editor = settings.edit();
-        editor.putBoolean("rtl", true);
+        editor.putBoolean(GBPrefs.RTL_SUPPORT, true);
         editor.commit();
 
         Intent intent = mDeviceService.createIntent().putExtra(EXTRA_NOTIFICATION_BODY, "English and עברית");
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/RtlUtilsTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/RtlUtilsTest.java
index 9a33af015..910c1454c 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/RtlUtilsTest.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/RtlUtilsTest.java
@@ -5,6 +5,7 @@ import android.content.SharedPreferences;
 import org.junit.Test;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.RtlUtils;
 
 import static org.junit.Assert.assertEquals;
@@ -332,14 +333,14 @@ public class RtlUtilsTest extends TestBase {
     private void setDefaultRtl() {
         SharedPreferences settings = GBApplication.getPrefs().getPreferences();
         SharedPreferences.Editor editor = settings.edit();
-        editor.remove("rtl");
+        editor.remove(GBPrefs.RTL_SUPPORT);
         editor.apply();
     }
 
     private void enableRtl(boolean enable) {
         SharedPreferences settings = GBApplication.getPrefs().getPreferences();
         SharedPreferences.Editor editor = settings.edit();
-        editor.putBoolean("rtl", enable);
+        editor.putBoolean(GBPrefs.RTL_SUPPORT, enable);
         editor.apply();
     }
 
@@ -355,14 +356,14 @@ public class RtlUtilsTest extends TestBase {
     private void setDefaultContextual() {
         SharedPreferences settings = GBApplication.getPrefs().getPreferences();
         SharedPreferences.Editor editor = settings.edit();
-        editor.remove("contextualArabic");
+        editor.remove(GBPrefs.RTL_CONTEXTUAL_ARABIC);
         editor.apply();
     }
 
     private void enableContextual(boolean enable) {
         SharedPreferences settings = GBApplication.getPrefs().getPreferences();
         SharedPreferences.Editor editor = settings.edit();
-        editor.putBoolean("contextualArabic", enable);
+        editor.putBoolean(GBPrefs.RTL_CONTEXTUAL_ARABIC, enable);
         editor.apply();
     }
 }