diff --git a/app/src/main/res/layout/activity_dir_picker.xml b/app/src/main/res/layout/activity_dir_picker.xml
index e20203c9f..7ac7024eb 100644
--- a/app/src/main/res/layout/activity_dir_picker.xml
+++ b/app/src/main/res/layout/activity_dir_picker.xml
@@ -45,6 +45,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="right"
         android:text="@android:string/ok"
-        android:textColor="?attr/textColorThemePrimary"/>
+        android:textColor="?attr/colorPrimary"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_set_security.xml b/app/src/main/res/layout/activity_set_security.xml
index 78328fc72..8c8b6d79b 100755
--- a/app/src/main/res/layout/activity_set_security.xml
+++ b/app/src/main/res/layout/activity_set_security.xml
@@ -78,7 +78,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?attr/textColorThemeAccent"
+            android:textColor="?attr/colorAccent"
             android:text="@android:string/cancel"/>
 
         <Button
@@ -87,7 +87,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?attr/textColorThemePrimary"
+            android:textColor="?attr/colorPrimary"
             android:text="@string/set"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 21253316d..f2c732d03 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -141,7 +141,8 @@
                     style="@style/ButtonInCard"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1"
+                    android:textColor="?attr/textColorThemePrimary"/>
 
                 <View
                     android:layout_width="1dp"
diff --git a/app/src/main/res/layout/scene_analytics.xml b/app/src/main/res/layout/scene_analytics.xml
index 08bf353ed..9d95b872d 100644
--- a/app/src/main/res/layout/scene_analytics.xml
+++ b/app/src/main/res/layout/scene_analytics.xml
@@ -75,7 +75,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?attr/textColorThemeAccent"
+            android:textColor="?attr/colorAccent"
             android:textStyle="bold"
             android:text="@string/reject"/>
 
@@ -85,7 +85,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?attr/textColorThemePrimary"
+            android:textColor="?attr/colorPrimary"
             android:textStyle="bold"
             android:text="@string/accept"/>
 
diff --git a/app/src/main/res/layout/scene_cookie_sign_in.xml b/app/src/main/res/layout/scene_cookie_sign_in.xml
index 8eb018853..18c6ddd44 100644
--- a/app/src/main/res/layout/scene_cookie_sign_in.xml
+++ b/app/src/main/res/layout/scene_cookie_sign_in.xml
@@ -146,7 +146,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?attr/textColorThemePrimary"
+            android:textColor="?attr/colorPrimary"
             android:textStyle="bold"
             android:text="@android:string/ok"/>
 
diff --git a/app/src/main/res/layout/scene_crash.xml b/app/src/main/res/layout/scene_crash.xml
index 67d6d44ec..a5139a6be 100644
--- a/app/src/main/res/layout/scene_crash.xml
+++ b/app/src/main/res/layout/scene_crash.xml
@@ -75,7 +75,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?attr/textColorThemeAccent"
+            android:textColor="?attr/colorAccent"
             android:textStyle="bold"
             android:text="@android:string/cancel"/>
 
@@ -85,7 +85,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?attr/textColorThemePrimary"
+            android:textColor="?attr/colorPrimary"
             android:textStyle="bold"
             android:text="@string/send"/>
 
diff --git a/app/src/main/res/layout/scene_login.xml b/app/src/main/res/layout/scene_login.xml
index 37f287ff3..73142248b 100644
--- a/app/src/main/res/layout/scene_login.xml
+++ b/app/src/main/res/layout/scene_login.xml
@@ -130,7 +130,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:textColor="?attr/textColorThemeAccent"
+                    android:textColor="?attr/colorAccent"
                     android:textStyle="bold"
                     android:text="@string/register"/>
 
@@ -140,7 +140,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:textColor="?attr/textColorThemePrimary"
+                    android:textColor="?attr/colorPrimary"
                     android:textStyle="bold"
                     android:text="@string/sign_in"/>
 
diff --git a/app/src/main/res/layout/scene_select_site.xml b/app/src/main/res/layout/scene_select_site.xml
index 5abb06e91..741691e82 100644
--- a/app/src/main/res/layout/scene_select_site.xml
+++ b/app/src/main/res/layout/scene_select_site.xml
@@ -115,7 +115,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?attr/textColorThemePrimary"
+            android:textColor="?attr/colorPrimary"
             android:textStyle="bold"
             android:text="@android:string/ok"/>
 
diff --git a/app/src/main/res/layout/scene_warning.xml b/app/src/main/res/layout/scene_warning.xml
index fff53ac11..2dfc62f42 100644
--- a/app/src/main/res/layout/scene_warning.xml
+++ b/app/src/main/res/layout/scene_warning.xml
@@ -74,7 +74,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?attr/textColorThemeAccent"
+            android:textColor="?attr/colorAccent"
             android:textStyle="bold"
             android:text="@string/reject"/>
 
@@ -84,7 +84,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?attr/textColorThemePrimary"
+            android:textColor="?attr/colorPrimary"
             android:textStyle="bold"
             android:text="@string/accept"/>
 
diff --git a/app/src/main/res/layout/search_action.xml b/app/src/main/res/layout/search_action.xml
index 2dde3b7ac..ae75a85ce 100644
--- a/app/src/main/res/layout/search_action.xml
+++ b/app/src/main/res/layout/search_action.xml
@@ -26,7 +26,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:textColor="?attr/textColorThemePrimary"
+        android:textColor="?attr/colorPrimary"
         android:textStyle="bold"
         style="?attr/buttonBarPositiveButtonStyle"/>