diff --git a/app/src/main/res/layout/dialog_addtoplaylist.xml b/app/src/main/res/layout/dialog_addtoplaylist.xml
index 2ab8632b3..afbf4485d 100644
--- a/app/src/main/res/layout/dialog_addtoplaylist.xml
+++ b/app/src/main/res/layout/dialog_addtoplaylist.xml
@@ -1,41 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
 
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:gravity="center"
         android:layout_margin="10dp"
+        android:gravity="center"
+        android:text="@string/app_name"
         android:textSize="20sp" />
 
     <Spinner
         android:id="@+id/playlists_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:layout_margin="8dp" />
+        android:layout_margin="8dp"
+        android:padding="8dp" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
+    <Button
+        android:id="@+id/addToPlaylist"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
-
-        <Button
-            android:id="@+id/addToPlaylist"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/addToPlaylist"
-            android:textColor="@color/white"
-            android:padding="8dp"
-            android:layout_margin="8dp" />
-
-    </LinearLayout>
+        android:layout_gravity="right"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="8dp"
+        android:backgroundTint="@android:color/transparent"
+        android:padding="8dp"
+        android:text="@string/addToPlaylist"
+        android:textColor="?attr/colorPrimary"
+        android:textSize="14sp" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml
index c2b7aace7..7bd59c774 100644
--- a/app/src/main/res/layout/dialog_create_playlist.xml
+++ b/app/src/main/res/layout/dialog_create_playlist.xml
@@ -22,9 +22,9 @@
         app:hintEnabled="false"
 
         android:layout_marginTop="16dp"
-        android:layout_marginLeft="7dp"
-        android:layout_marginRight="7dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="10dp"
 
         app:boxCornerRadiusBottomStart="15dp"
         app:boxCornerRadiusBottomEnd="15dp"
@@ -45,25 +45,32 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="center">
+        android:gravity="right">
 
         <Button
             android:id="@+id/cancel_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/cancel"
-            android:textColor="@color/white"
+            android:layout_gravity="right"
+            android:backgroundTint="@android:color/transparent"
+            android:textColor="?attr/colorPrimary"
+            android:textSize="14sp"
             android:padding="8dp"
-            android:layout_margin="8dp" />
+            android:layout_marginBottom="8dp" />
 
         <Button
             android:id="@+id/create_new_playlist"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/createPlaylist"
-            android:textColor="@color/white"
+            android:layout_gravity="right"
+            android:backgroundTint="@android:color/transparent"
+            android:textColor="?attr/colorPrimary"
+            android:textSize="14sp"
             android:padding="8dp"
-            android:layout_margin="8dp" />
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="8dp" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_download.xml b/app/src/main/res/layout/dialog_download.xml
index a96474cf7..39e99024b 100644
--- a/app/src/main/res/layout/dialog_download.xml
+++ b/app/src/main/res/layout/dialog_download.xml
@@ -51,8 +51,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/download"
-        android:textColor="@color/white"
+        android:layout_gravity="right"
+        android:backgroundTint="@android:color/transparent"
+        android:textColor="?attr/colorPrimary"
+        android:textSize="14sp"
         android:padding="8dp"
-        android:layout_margin="8dp"
-        android:layout_gravity="center" />
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="8dp" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml
index 5365af31f..50f06687b 100644
--- a/app/src/main/res/layout/dialog_login.xml
+++ b/app/src/main/res/layout/dialog_login.xml
@@ -21,8 +21,8 @@
         android:layout_height="wrap_content"
         app:hintEnabled="false"
         android:layout_marginTop="16dp"
-        android:layout_marginLeft="7dp"
-        android:layout_marginRight="7dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:layout_marginBottom="4dp"
 
         app:boxCornerRadiusBottomStart="15dp"
@@ -45,9 +45,9 @@
         android:layout_height="wrap_content"
         app:hintEnabled="false"
         android:layout_marginTop="16dp"
-        android:layout_marginLeft="7dp"
-        android:layout_marginRight="7dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="10dp"
 
         app:boxCornerRadiusBottomStart="15dp"
         app:boxCornerRadiusBottomEnd="15dp"
@@ -70,25 +70,32 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="center">
+        android:gravity="right">
 
         <Button
             android:id="@+id/register"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/register"
-            android:textColor="@color/white"
+            android:layout_gravity="right"
+            android:backgroundTint="@android:color/transparent"
+            android:textColor="?attr/colorPrimary"
+            android:textSize="14sp"
             android:padding="8dp"
-            android:layout_margin="8dp" />
+            android:layout_marginBottom="8dp" />
 
         <Button
             android:id="@+id/login"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/login"
-            android:textColor="@color/white"
+            android:layout_gravity="right"
+            android:backgroundTint="@android:color/transparent"
+            android:textColor="?attr/colorPrimary"
+            android:textSize="14sp"
             android:padding="8dp"
-            android:layout_margin="8dp" />
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_logout.xml b/app/src/main/res/layout/dialog_logout.xml
index 4d207e589..82a4b2b6a 100644
--- a/app/src/main/res/layout/dialog_logout.xml
+++ b/app/src/main/res/layout/dialog_logout.xml
@@ -26,9 +26,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/logout"
-        android:textColor="@color/white"
+        android:layout_gravity="right"
+        android:backgroundTint="@android:color/transparent"
+        android:textColor="?attr/colorPrimary"
+        android:textSize="14sp"
         android:padding="8dp"
-        android:layout_margin="8dp"
-        android:layout_gravity="center" />
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="8dp" />
 
 </LinearLayout>