diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 47dcfff2..82f05c90 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -433,7 +433,7 @@ public class GBApplication extends Application {
     public static int getTextColor(Context context) {
         TypedValue typedValue = new TypedValue();
         Resources.Theme theme = context.getTheme();
-        theme.resolveAttribute(android.R.attr.textColor, typedValue, true);
+        theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true);
         return typedValue.data;
     }
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f44e70aa..3c1ab6bd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <style name="GadgetbridgeTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:textColor">@color/primarytext_light</item>
+        <item name="android:textColorPrimary">@color/primarytext_light</item>
         <item name="android:textColorSecondary">@color/secondarytext</item>
         <item name="colorPrimary">@color/primary_light</item>
         <item name="colorPrimaryDark">@color/primarydark_light</item>
@@ -21,7 +21,7 @@
 
     <!-- dark theme -->
     <style name="GadgetbridgeThemeDark" parent="Theme.AppCompat">
-        <item name="android:textColor">@color/primarytext_dark</item>
+        <item name="android:textColorPrimary">@color/primarytext_dark</item>
         <item name="android:textColorSecondary">@color/secondarytext</item>
         <item name="colorPrimary">@color/primary_dark</item>
         <item name="colorPrimaryDark">@color/primarydark_dark</item>