diff --git a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
index 7abb917f..62a5e276 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
@@ -73,7 +73,6 @@ object Preferences {
     private const val CONTINUOUS_PLAY = "continuous_play"
     private const val LAST_INSTANT_MIX = "last_instant_mix"
     private const val ALLOW_PLAYLIST_DUPLICATES = "allow_playlist_duplicates"
-
     private const val EQUALIZER_ENABLED = "equalizer_enabled"
     private const val EQUALIZER_BAND_LEVELS = "equalizer_band_levels"
     private const val MINI_SHUFFLE_BUTTON_VISIBILITY = "mini_shuffle_button_visibility"
@@ -611,6 +610,9 @@ object Preferences {
     @JvmStatic
     fun allowPlaylistDuplicates(): Boolean {
         return App.getInstance().preferences.getBoolean(ALLOW_PLAYLIST_DUPLICATES, false)
+    }
+
+    @JvmStatic
     fun setEqualizerEnabled(enabled: Boolean) {
         App.getInstance().preferences.edit().putBoolean(EQUALIZER_ENABLED, enabled).apply()
     }
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 759a0106..1dc81873 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -304,8 +304,8 @@
     <string name="settings_delete_download_storage_summary">Zatwierdzenie nieodwracalnie usunie wszystkie zapisane elementy</string>
     <string name="settings_delete_download_storage_title">Usuń zapisane elementy</string>
     <string name="settings_download_storage_title">Pamięć do pobierania</string>
-    <string name="settings_equalizer_summary">Zmień ustawienia audio</string>
-    <string name="settings_equalizer_title">Korektor systemowy</string>
+    <string name="settings_system_equalizer_summary">Zmień ustawienia audio</string>
+    <string name="settings_system_equalizer_title">Korektor systemowy</string>
     <string name="settings_github_link">https://github.com/eddyizm/tempo</string>
     <string name="settings_github_summary">Śledź tworzenie aplikacji</string>
     <string name="settings_github_title">GitHub</string>
diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml
index 6f27bcdd..29cb7b85 100644
--- a/app/src/main/res/xml/global_preferences.xml
+++ b/app/src/main/res/xml/global_preferences.xml
@@ -1,15 +1,11 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory app:title="@string/settings_title_general">
-       <Preference
-            android:key="system_equalizer"
-            android:title="@string/settings_system_equalizer_title"
-            android:summary="@string/settings_system_equalizer_summary" />
-
         <Preference
-            android:key="app_equalizer"
-            android:title="@string/settings_app_equalizer"
-            android:summary="@string/settings_app_equalizer_summary" />
+            android:layout_height="match_parent"
+            android:key="equalizer"
+            android:summary="@string/settings_system_equalizer_summary"
+            android:title="@string/settings_system_equalizer_title" />
 
         <Preference
             android:key="scan_library"
@@ -101,16 +97,9 @@
             android:defaultValue="true"
             android:summary="@string/settings_music_directory_summary"
             android:key="music_directory_section_visibility" />
-
-        <SwitchPreference
-            android:title="@string/settings_show_mini_shuffle_button"
-            android:defaultValue="false"
-            android:summary="@string/settings_show_mini_shuffle_button_summary"
-            android:key="mini_shuffle_button_visibility" />
-
     </PreferenceCategory>
 
-    <PreferenceCategory app:title="@string/settings_title_playlist">
+     <PreferenceCategory app:title="@string/settings_title_playlist">
         <SwitchPreference
             android:title="@string/settings_allow_playlist_duplicates"
             android:defaultValue="false"
@@ -118,6 +107,7 @@
             android:key="allow_playlist_duplicates" />
     </PreferenceCategory>
 
+    
     <PreferenceCategory app:title="@string/settings_title_data">
         <ListPreference
             app:defaultValue="256"