diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java
index c4fa836d..edb43654 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java
@@ -29,9 +29,12 @@ public class ConnectionAlertDialog extends DialogFragment {
         builder.setView(bind.getRoot())
                 .setTitle(R.string.connection_alert_dialog_title)
                 .setPositiveButton(R.string.connection_alert_dialog_positive_button, (dialog, id) -> dialog.cancel())
-                .setNeutralButton(R.string.connection_alert_dialog_neutral_button, (dialog, id) -> { })
                 .setNegativeButton(R.string.connection_alert_dialog_negative_button, (dialog, id) -> dialog.cancel());
 
+        if(!PreferenceUtil.getInstance(requireContext()).isDataSavingMode()) {
+            builder.setNeutralButton(R.string.connection_alert_dialog_neutral_button, (dialog, id) -> { });
+        }
+
         return builder.create();
     }
 
diff --git a/app/src/main/res/layout/dialog_connection_alert.xml b/app/src/main/res/layout/dialog_connection_alert.xml
index cedc920c..3911385a 100644
--- a/app/src/main/res/layout/dialog_connection_alert.xml
+++ b/app/src/main/res/layout/dialog_connection_alert.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="12dp"
         android:layout_marginBottom="4dp"
         android:layout_marginEnd="24dp"
         android:text="@string/connection_alert_dialog_summary" />
diff --git a/app/src/main/res/layout/dialog_rating.xml b/app/src/main/res/layout/dialog_rating.xml
index f6f92416..a19b3ff7 100644
--- a/app/src/main/res/layout/dialog_rating.xml
+++ b/app/src/main/res/layout/dialog_rating.xml
@@ -8,7 +8,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="12dp"
         android:stepSize="1"
diff --git a/app/src/main/res/layout/dialog_server_unreachable.xml b/app/src/main/res/layout/dialog_server_unreachable.xml
index 813cf2f2..94445b96 100644
--- a/app/src/main/res/layout/dialog_server_unreachable.xml
+++ b/app/src/main/res/layout/dialog_server_unreachable.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="12dp"
         android:layout_marginBottom="4dp"
         android:layout_marginEnd="24dp"
         android:text="@string/server_unreachable_dialog_summary" />
diff --git a/app/src/main/res/layout/dialog_starred_sync.xml b/app/src/main/res/layout/dialog_starred_sync.xml
index c2c89fa3..73db2427 100644
--- a/app/src/main/res/layout/dialog_starred_sync.xml
+++ b/app/src/main/res/layout/dialog_starred_sync.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="12dp"
         android:layout_marginBottom="4dp"
         android:layout_marginEnd="24dp"
         android:text="@string/starred_sync_dialog_summary" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cedf2046..fbb93c89 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,7 +44,7 @@
     <string name="artist_page_title_most_streamed_song_see_all_button">See all</string>
     <string name="connection_alert_dialog_negative_button">Cancel</string>
     <string name="connection_alert_dialog_neutral_button">Enable data saver</string>
-    <string name="connection_alert_dialog_positive_button">Continue anyway</string>
+    <string name="connection_alert_dialog_positive_button">Ok</string>
     <string name="connection_alert_dialog_title">Wi-Fi not connected</string>
     <string name="connection_alert_dialog_summary">Access to the Subsonic server on connections other than Wi-Fi has been restricted. To prevent this alert dialod from reappearing, disable the connection check in the app settings.</string>
     <string name="download_info_empty_subtitle">Once you download a song, you\'ll find it here</string>