diff --git a/app/src/main/res/layout/dialog_addtoplaylist.xml b/app/src/main/res/layout/dialog_addtoplaylist.xml
index ac22b5eba..534f719bf 100644
--- a/app/src/main/res/layout/dialog_addtoplaylist.xml
+++ b/app/src/main/res/layout/dialog_addtoplaylist.xml
@@ -34,6 +34,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/addToPlaylist"
+            android:textColor="?attr/colorSurface"
             android:padding="8dp"
             android:layout_margin="8dp"/>
 
diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml
index 2ffe670a3..f921ef2f6 100644
--- a/app/src/main/res/layout/dialog_create_playlist.xml
+++ b/app/src/main/res/layout/dialog_create_playlist.xml
@@ -49,6 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/cancel"
+            android:textColor="?attr/colorSurface"
             android:padding="8dp"
             android:layout_margin="8dp"/>
     <Button
@@ -56,6 +57,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/createPlaylist"
+        android:textColor="?attr/colorSurface"
         android:padding="8dp"
         android:layout_margin="8dp"/>
 
diff --git a/app/src/main/res/layout/dialog_download.xml b/app/src/main/res/layout/dialog_download.xml
index a78e445f7..e714c5d2f 100644
--- a/app/src/main/res/layout/dialog_download.xml
+++ b/app/src/main/res/layout/dialog_download.xml
@@ -49,6 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/download"
+            android:textColor="?attr/colorSurface"
             android:padding="8dp"
             android:layout_margin="8dp"
             android:layout_gravity="center"/>
diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml
index 0f3ff1f26..dc006bf64 100644
--- a/app/src/main/res/layout/dialog_login.xml
+++ b/app/src/main/res/layout/dialog_login.xml
@@ -81,6 +81,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/register"
+            android:textColor="?attr/colorSurface"
             android:padding="8dp"
             android:layout_margin="8dp"/>
     <Button
@@ -88,6 +89,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/login"
+        android:textColor="?attr/colorSurface"
         android:padding="8dp"
         android:layout_margin="8dp"/>
 
diff --git a/app/src/main/res/layout/dialog_logout.xml b/app/src/main/res/layout/dialog_logout.xml
index d75838396..347ea3a93 100644
--- a/app/src/main/res/layout/dialog_logout.xml
+++ b/app/src/main/res/layout/dialog_logout.xml
@@ -27,6 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/logout"
+            android:textColor="?attr/colorSurface"
             android:padding="8dp"
             android:layout_margin="8dp"
             android:layout_gravity="center"/>
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index df6ba6943..b9f75dea1 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -56,6 +56,7 @@
                     android:text="@string/createPlaylist"
                     android:layout_gravity="center"
                     android:layout_margin="8dp"
+                    android:textColor="?attr/colorSurface"
                     android:drawableLeft="@drawable/ic_add" />
                 <RelativeLayout
                     android:layout_width="match_parent"