diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewCustomGridSizeFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewCustomGridSizeFragment.java
index 9d6157ed..ba25f13d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewCustomGridSizeFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewCustomGridSizeFragment.java
@@ -88,6 +88,16 @@ public abstract class AbsMainActivityRecyclerViewCustomGridSizeFragment<A extend
         return R.layout.item_list;
     }
 
+    protected void applyRecyclerViewPaddingForLayoutRes(@LayoutRes int res) {
+        int padding;
+        if (res == R.layout.item_grid) {
+            padding = (int) (getResources().getDisplayMetrics().density * 2);
+        } else {
+            padding = 0;
+        }
+        getRecyclerView().setPadding(padding, padding, padding, padding);
+    }
+
     protected abstract int loadGridSize();
 
     protected abstract void saveGridSize(int gridColumns);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AlbumsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AlbumsFragment.java
index 00ad7631..deae8d84 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AlbumsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AlbumsFragment.java
@@ -22,10 +22,12 @@ public class AlbumsFragment extends AbsMainActivityRecyclerViewCustomGridSizeFra
     @NonNull
     @Override
     protected AlbumAdapter createAdapter() {
+        int itemLayoutRes = getItemLayoutRes();
+        applyRecyclerViewPaddingForLayoutRes(itemLayoutRes);
         return new AlbumAdapter(
                 getMainActivity(),
                 AlbumLoader.getAllAlbums(getActivity()),
-                getItemLayoutRes(),
+                itemLayoutRes,
                 loadUsePalette(),
                 getMainActivity());
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/ArtistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/ArtistsFragment.java
index 29d75f97..d7621931 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/ArtistsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/ArtistsFragment.java
@@ -24,10 +24,12 @@ public class ArtistsFragment extends AbsMainActivityRecyclerViewCustomGridSizeFr
     @NonNull
     @Override
     protected ArtistAdapter createAdapter() {
+        int itemLayoutRes = getItemLayoutRes();
+        applyRecyclerViewPaddingForLayoutRes(itemLayoutRes);
         return new ArtistAdapter(
                 getMainActivity(),
                 ArtistLoader.getAllArtists(getActivity()),
-                getItemLayoutRes(),
+                itemLayoutRes,
                 loadUsePalette(),
                 getMainActivity());
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongsFragment.java
index 1e13be79..9b7097d2 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongsFragment.java
@@ -32,6 +32,7 @@ public class SongsFragment extends AbsMainActivityRecyclerViewCustomGridSizeFrag
         MainActivity mainActivity = getMainActivity();
         ArrayList<Song> songs = SongLoader.getAllSongs(getActivity());
         int itemLayoutRes = getItemLayoutRes();
+        applyRecyclerViewPaddingForLayoutRes(itemLayoutRes);
         boolean usePalette = loadUsePalette();
 
         if (getGridSize() <= getMaxGridSizeForList()) {
diff --git a/app/src/main/res/layout/dialog_color_chooser.xml b/app/src/main/res/layout/dialog_color_chooser.xml
deleted file mode 100644
index ada91033..00000000
--- a/app/src/main/res/layout/dialog_color_chooser.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gridview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:columnWidth="56dp"
-          android:numColumns="7"
-    android:verticalSpacing="4dp"
-    android:horizontalSpacing="4dp"
-    android:padding="16dp"
-    android:clipToPadding="false"
-    android:stretchMode="columnWidth"
-    android:gravity="center" />
\ No newline at end of file