diff --git a/res/layout-land/preference_color_picker.xml b/res/layout-land/preference_color_picker.xml
index 98d5d12..fe7d55e 100644
--- a/res/layout-land/preference_color_picker.xml
+++ b/res/layout-land/preference_color_picker.xml
@@ -21,7 +21,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="36dp"
     android:layout_marginEnd="36dp"
-    android:padding="@dimen/alert_dialog_padding_material"
+    android:padding="20dp"
     android:orientation="horizontal">
 
     <com.havoc.support.colorpicker.ColorPickerView
diff --git a/res/layout/preference_color_picker.xml b/res/layout/preference_color_picker.xml
index 12b2c06..68ee2db 100644
--- a/res/layout/preference_color_picker.xml
+++ b/res/layout/preference_color_picker.xml
@@ -21,15 +21,9 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="36dp"
     android:layout_marginEnd="36dp"
-    android:padding="@dimen/alert_dialog_padding_material"
+    android:padding="20dp"
     android:orientation="vertical">
 
-    <com.dirtyunicorns.support.colorpicker.ColorPickerView
-        android:id="@+id/color_picker_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:tag="portrait" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -62,6 +56,12 @@
 
     </LinearLayout>
 
+    <com.havoc.support.colorpicker.ColorPickerView
+        android:id="@+id/color_picker_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:tag="portrait" />
+
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"