diff --git a/OsmAnd/res/layout/preference_select_icon_button.xml b/OsmAnd/res/layout/preference_select_icon_button.xml
index ac80040512..dde4fb5d64 100644
--- a/OsmAnd/res/layout/preference_select_icon_button.xml
+++ b/OsmAnd/res/layout/preference_select_icon_button.xml
@@ -5,29 +5,34 @@
 	android:layout_height="wrap_content"
 	android:padding="6dp">
 
-	<ImageView
-		android:id="@+id/outlineRect"
+	<FrameLayout
 		android:layout_width="164dp"
-		android:layout_height="128dp"
-		app:srcCompat="@drawable/bg_select_icon_button_outline" />
+		android:layout_height="128dp">
 
-	<ImageView
-		android:id="@+id/backgroundRect"
-		android:layout_width="156dp"
-		android:layout_height="120dp"
-		android:layout_margin="4dp"
-		android:background="@drawable/bg_select_icon_button" />
+		<ImageView
+			android:id="@+id/outlineRect"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			app:srcCompat="@drawable/bg_select_icon_button_outline" />
 
-	<ImageView
-		android:id="@+id/headingIcon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal|center_vertical" />
+		<ImageView
+			android:id="@+id/backgroundRect"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_margin="4dp"
+			android:background="@drawable/bg_select_icon_button" />
 
-	<ImageView
-		android:id="@+id/icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal|center_vertical" />
+		<ImageView
+			android:id="@+id/headingIcon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal|center_vertical" />
+
+		<ImageView
+			android:id="@+id/icon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal|center_vertical" />
+	</FrameLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index c3e1eeb4d4..cea274876b 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -564,7 +564,7 @@
         <item name="android:textColor">@color/active_color_primary_dark</item>
     </style>
 
-    <style name="OsmandPreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
+    <style name="OsmandPreferenceTheme" parent="@style/PreferenceThemeOverlay">
         <item name="android:layout">@layout/preferences_screen</item>
         <item name="iconSpaceReserved">true</item>
     </style>
@@ -768,4 +768,8 @@
         <item name="android:textColor">?attr/app_bar_primary_item_color</item>
         <item name="android:textSize">@dimen/dialog_header_text_size</item>
     </style>
+
+    <style name="ThemeOverlay.AppCompat.ActionBar">
+        <item name="android:padding">0dp</item>
+    </style>
 </resources>