diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java
index a539dc0f..3183963d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java
@@ -115,7 +115,9 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
-            forceSquareAlbumCover(PreferenceUtil.getInstance(getContext()).forceSquareAlbumCover());
+            forceSquareAlbumCover(false);
+            // TODO
+//            forceSquareAlbumCover(PreferenceUtil.getInstance(getContext()).forceSquareAlbumCover());
             PreferenceUtil.getInstance(getActivity()).registerOnSharedPreferenceChangedListener(this);
             loadAlbumCover();
         }
@@ -147,7 +149,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
                     new SimpleImageLoadingListener() {
                         @Override
                         public void onLoadingFailed(String imageUri, View view, @Nullable FailReason failReason) {
-                            if(getActivity() != null) {
+                            if (getActivity() != null) {
                                 setColor(ColorUtil.resolveColor(getActivity(), R.attr.default_bar_color));
                             }
                         }
@@ -168,7 +170,8 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
             switch (key) {
                 case PreferenceUtil.FORCE_SQUARE_ALBUM_COVER:
-                    forceSquareAlbumCover(PreferenceUtil.getInstance(getActivity()).forceSquareAlbumCover());
+                    // TODO
+//                    forceSquareAlbumCover(PreferenceUtil.getInstance(getActivity()).forceSquareAlbumCover());
                     break;
             }
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ba5a816..afce7a63 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -206,4 +206,5 @@
     <string name="website">Website</string>
     <string name="loading_products">Loading products…</string>
     <string name="up_next">Up next</string>
+    <string name="pref_title_now_playing_layout">Now playing layout</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_now_playing_screen.xml b/app/src/main/res/xml/pref_now_playing_screen.xml
index 8ba9f734..0dd91500 100644
--- a/app/src/main/res/xml/pref_now_playing_screen.xml
+++ b/app/src/main/res/xml/pref_now_playing_screen.xml
@@ -3,62 +3,14 @@
 
     <com.kabouzeid.gramophone.prefs.DynamicPreferenceCategory android:title="@string/pref_header_now_playing_screen">
 
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="opaque_statusbar_now_playing"
+        <com.afollestad.materialdialogs.prefs.MaterialListPreference
+            android:enabled="false"
+            android:key="now_playing_layout"
             android:layout="@layout/preference_custom"
-            android:summary="@string/pref_summary_opaque_statusbar_now_playing"
-            android:title="@string/pref_title_opaque_statusbar_now_playing"
-            android:widgetLayout="@layout/preference_dynamic_checkbox" />
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:dependency="opaque_statusbar_now_playing"
-            android:key="opaque_toolbar_now_playing"
-            android:layout="@layout/preference_custom"
-            android:summary="@string/pref_summary_opaque_toolbar_now_playing"
-            android:title="@string/pref_title_opaque_toolbar_now_playing"
-            android:widgetLayout="@layout/preference_dynamic_checkbox" />
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="force_square_album_art"
-            android:layout="@layout/preference_custom"
-            android:summary="@string/pref_summary_force_square_album_art"
-            android:title="@string/pref_title_force_square_album_art"
-            android:widgetLayout="@layout/preference_dynamic_checkbox" />
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="larger_title_box_now_playing"
-            android:layout="@layout/preference_custom"
-            android:summary="@string/pref_summary_larger_title_box_now_playing"
-            android:title="@string/pref_title_larger_title_box_now_playing"
-            android:widgetLayout="@layout/preference_dynamic_checkbox" />
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="alternative_progress_slider_now_playing"
-            android:layout="@layout/preference_custom"
-            android:summary="@string/pref_summary_alternative_progress_slider_now_playing"
-            android:title="@string/pref_title_alternative_progress_slider_now_playing"
-            android:widgetLayout="@layout/preference_dynamic_checkbox" />
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="playback_controller_card_now_playing"
-            android:layout="@layout/preference_custom"
-            android:summary="@string/pref_summary_playback_controller_card_now_playing"
-            android:title="@string/pref_title_playback_controller_card_now_playing"
-            android:widgetLayout="@layout/preference_dynamic_checkbox" />
-
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="color_playback_controls_now_playing"
-            android:layout="@layout/preference_custom"
-            android:summary="@string/pref_summary_colored_playback_controls_now_playing"
-            android:title="@string/pref_title_colored_playback_controls_now_playing"
-            android:widgetLayout="@layout/preference_dynamic_checkbox" />
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:summary="Coming soon"
+            android:title="@string/pref_title_now_playing_layout" />
 
     </com.kabouzeid.gramophone.prefs.DynamicPreferenceCategory>