diff --git a/app_pojavlauncher/src/main/res/drawable/background_control_editor.xml b/app_pojavlauncher/src/main/res/drawable/background_control_editor.xml
index 90c07e23d..5e350dd5b 100644
--- a/app_pojavlauncher/src/main/res/drawable/background_control_editor.xml
+++ b/app_pojavlauncher/src/main/res/drawable/background_control_editor.xml
@@ -3,9 +3,9 @@
     android:shape="rectangle">
     <corners android:radius="@dimen/_8sdp" />
     <padding
-        android:bottom="@dimen/_2sdp"
-        android:left="@dimen/_2sdp"
-        android:right="@dimen/_2sdp"
-        android:top="@dimen/_2sdp" />
+        android:bottom="@dimen/padding_small"
+        android:left="@dimen/padding_small"
+        android:right="@dimen/padding_small"
+        android:top="@dimen/padding_small" />
     <solid android:color="@color/background_app" />
 </shape>
diff --git a/app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml b/app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml
index ffa57362c..a3c69156a 100644
--- a/app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml
+++ b/app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml
@@ -5,11 +5,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/_280sdp"
     android:layout_height="match_parent"
-    android:background="@color/background_app"
-    android:paddingHorizontal="@dimen/_5sdp"
-    android:paddingVertical="@dimen/_5sdp"
+    android:background="@drawable/background_control_editor"
+    android:paddingHorizontal="@dimen/padding_moderate"
+    android:paddingVertical="@dimen/padding_moderate"
     android:id="@+id/color_picker_layout"
-    android:layout_marginVertical="@dimen/_14sdp">
+    android:layout_marginVertical="@dimen/padding_heavy">
 
     <net.kdt.pojavlaunch.colorselector.SVRectangleView
         android:id="@+id/color_selector_rectangle_view"
diff --git a/app_pojavlauncher/src/main/res/layout/dialog_control_button_setting.xml b/app_pojavlauncher/src/main/res/layout/dialog_control_button_setting.xml
index bf2dfc9b9..a5a8b7b2c 100644
--- a/app_pojavlauncher/src/main/res/layout/dialog_control_button_setting.xml
+++ b/app_pojavlauncher/src/main/res/layout/dialog_control_button_setting.xml
@@ -4,15 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/_280sdp"
     android:layout_height="match_parent"
-    android:layout_marginVertical="@dimen/_14sdp"
+    android:layout_marginVertical="@dimen/padding_heavy"
     android:background="@drawable/background_control_editor">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/edit_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/_5sdp"
-        android:paddingVertical="@dimen/_5sdp"
+        android:paddingHorizontal="@dimen/padding_moderate"
+        android:paddingVertical="@dimen/padding_moderate"
         app:layout_optimizationLevel="standard|dimensions|chains">
 
 
@@ -102,11 +102,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/editSize_editTextX" />
 
+        <!--
+            Spinners are hidden to handle to workaround the horizontal offset.
+            The horizontal offset was needed to display the spinner list at the same place.
+            Sadly it is broken since Android Jelly Bean and never scheduled to be fixed
+        -->
         <Spinner
             android:id="@+id/editMapping_spinner_1"
             android:layout_width="1px"
             android:layout_height="30dp"
-            android:layout_marginTop="@dimen/_2sdp"
+            android:layout_marginTop="@dimen/padding_small"
             android:background="@android:color/transparent"
             android:dropDownWidth="@dimen/_267sdp"
             android:dropDownVerticalOffset="30dp"
@@ -266,12 +271,12 @@
             android:text="@string/customctrl_orientation"
 
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/editMapping_spinner_3" />
+            app:layout_constraintTop_toBottomOf="@+id/mapping_3_textview" />
 
         <Spinner
             android:id="@+id/editOrientation_spinner"
             android:layout_width="0dp"
-            android:layout_height="30dp"
+            android:layout_height="@dimen/_30sdp"
             android:background="@android:color/transparent"
 
 
@@ -316,7 +321,7 @@
         <fr.spse.extended_view.ExtendedTextView
             android:id="@+id/editBackgroundColor_textView"
             android:layout_width="0dp"
-            android:layout_height="35dp"
+            android:layout_height="@dimen/_35sdp"
             android:background="?attr/selectableItemBackground"
             android:drawableEnd="@drawable/spinner_arrow_right"
             android:gravity="center_vertical"
@@ -370,7 +375,7 @@
         <fr.spse.extended_view.ExtendedTextView
             android:id="@+id/editStrokeColor_textView"
             android:layout_width="0dp"
-            android:layout_height="35dp"
+            android:layout_height="@dimen/_35sdp"
             android:background="?attr/selectableItemBackground"
             android:drawableEnd="@drawable/spinner_arrow_right"
             android:gravity="center_vertical"
diff --git a/app_pojavlauncher/src/main/res/values/dimens.xml b/app_pojavlauncher/src/main/res/values/dimens.xml
index 465a3132a..c4dfec7d0 100644
--- a/app_pojavlauncher/src/main/res/values/dimens.xml
+++ b/app_pojavlauncher/src/main/res/values/dimens.xml
@@ -5,11 +5,12 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-    
+
     <!-- Padding -->
     <dimen name="padding_tiny">@dimen/_1sdp</dimen>
     <dimen name="padding_small">@dimen/_2sdp</dimen>
     <dimen name="padding_medium">@dimen/_4sdp</dimen>
+    <dimen name="padding_moderate">@dimen/_6sdp</dimen>
     <dimen name="padding_heavy">@dimen/_12sdp</dimen>
     <dimen name="padding_large">@dimen/_16sdp</dimen>
     <dimen name="padding_extra_large">@dimen/_24sdp</dimen>