diff --git a/res/layout/pointer_icon_fill_style_layout.xml b/res/layout/pointer_icon_fill_style_layout.xml
index 2be750f6147..fcfb3c85f43 100644
--- a/res/layout/pointer_icon_fill_style_layout.xml
+++ b/res/layout/pointer_icon_fill_style_layout.xml
@@ -38,22 +38,14 @@
 
     <LinearLayout
         android:id="@+id/button_holder"
-        android:layout_width="@dimen/pointer_fill_container_max_width"
+        android:layout_width="wrap_content"
         android:layout_height="@dimen/pointer_fill_container_height"
         android:layout_marginBottom="@dimen/pointer_fill_style_circle_padding"
         android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"
-        android:gravity="center"
+        android:gravity="left|center_vertical"
         android:paddingTop="@dimen/pointer_fill_style_container_padding"
         android:paddingBottom="@dimen/pointer_fill_style_container_padding">
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:focusable="false"
-            android:clickable="false"
-            android:importantForAccessibility="no"
-            android:layout_weight="1" />
-
         <ImageView
             android:id="@+id/button_black"
             android:layout_width="@dimen/pointer_fill_style_circle_background_outer_diameter"
@@ -66,12 +58,11 @@
             android:src="@drawable/pointer_icon_fill_color_background" />
 
         <View
-            android:layout_width="0dp"
+            android:layout_width="@dimen/pointer_fill_style_circle_spacer"
             android:layout_height="match_parent"
             android:focusable="false"
             android:clickable="false"
-            android:importantForAccessibility="no"
-            android:layout_weight="1" />
+            android:importantForAccessibility="no"/>
 
         <ImageView
             android:id="@+id/button_green"
@@ -85,12 +76,11 @@
             android:src="@drawable/pointer_icon_fill_color_background" />
 
         <View
-            android:layout_width="0dp"
+            android:layout_width="@dimen/pointer_fill_style_circle_spacer"
             android:layout_height="match_parent"
             android:focusable="false"
             android:clickable="false"
-            android:importantForAccessibility="no"
-            android:layout_weight="1" />
+            android:importantForAccessibility="no"/>
 
         <ImageView
             android:id="@+id/button_red"
@@ -104,12 +94,11 @@
             android:src="@drawable/pointer_icon_fill_color_background" />
 
         <View
-            android:layout_width="0dp"
+            android:layout_width="@dimen/pointer_fill_style_circle_spacer"
             android:layout_height="match_parent"
             android:focusable="false"
             android:clickable="false"
-            android:importantForAccessibility="no"
-            android:layout_weight="1" />
+            android:importantForAccessibility="no"/>
 
         <ImageView
             android:id="@+id/button_pink"
@@ -123,12 +112,11 @@
             android:src="@drawable/pointer_icon_fill_color_background" />
 
         <View
-            android:layout_width="0dp"
+            android:layout_width="@dimen/pointer_fill_style_circle_spacer"
             android:layout_height="match_parent"
             android:focusable="false"
             android:clickable="false"
-            android:importantForAccessibility="no"
-            android:layout_weight="1" />
+            android:importantForAccessibility="no"/>
 
         <ImageView
             android:id="@+id/button_blue"
@@ -142,12 +130,11 @@
             android:src="@drawable/pointer_icon_fill_color_background" />
 
         <View
-            android:layout_width="0dp"
+            android:layout_width="@dimen/pointer_fill_style_circle_spacer"
             android:layout_height="match_parent"
             android:focusable="false"
             android:clickable="false"
-            android:importantForAccessibility="no"
-            android:layout_weight="1" />
+            android:importantForAccessibility="no"/>
 
         <ImageView
             android:id="@+id/button_purple"
@@ -160,13 +147,6 @@
             android:scaleType="center"
             android:src="@drawable/pointer_icon_fill_color_background" />
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:focusable="false"
-            android:clickable="false"
-            android:importantForAccessibility="no"
-            android:layout_weight="1" />
     </LinearLayout>
 
 </LinearLayout>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 55735e66322..f5615bfbe67 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -33,4 +33,5 @@
     <dimen name="pointer_fill_container_height">104dp</dimen>
     <dimen name="pointer_fill_container_max_width">448dp</dimen>
     <dimen name="pointer_fill_style_container_padding">32dp</dimen>
+    <dimen name="pointer_fill_style_circle_spacer">12dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 43b07640f07..dd0988338a1 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -188,25 +188,26 @@
 
     <!-- Pointer -->
     <dimen name="pointer_fill_container_height">80dp</dimen>
-    <dimen name="pointer_fill_container_max_width">468dp</dimen>
-    <dimen name="pointer_fill_style_container_padding">32dp</dimen>
-    <dimen name="pointer_fill_style_target_width">64dp</dimen>
-    <dimen name="pointer_fill_style_circle_diameter">39dp</dimen>
-    <dimen name="pointer_fill_style_circle_outline_diameter">39.5dp</dimen>
+    <dimen name="pointer_fill_container_max_width">344dp</dimen>
+    <dimen name="pointer_fill_style_container_padding">22dp</dimen>
+    <dimen name="pointer_fill_style_target_width">54dp</dimen>
+    <dimen name="pointer_fill_style_circle_diameter">34dp</dimen>
+    <dimen name="pointer_fill_style_circle_outline_diameter">34.5dp</dimen>
     <dimen name="pointer_fill_style_circle_background_corner_radius">20dp</dimen>
     <dimen name="pointer_fill_style_circle_background_corner_inner_radius">16dp</dimen>
-    <dimen name="pointer_fill_style_circle_background_outer_diameter">64dp</dimen>
-    <dimen name="pointer_fill_style_circle_background_outer_diameter_less_stroke">62dp</dimen>
-    <dimen name="pointer_fill_style_circle_background_outer_diameter_selected">52dp</dimen>
+    <dimen name="pointer_fill_style_circle_background_outer_diameter">54dp</dimen>
+    <dimen name="pointer_fill_style_circle_background_outer_diameter_less_stroke">52dp</dimen>
+    <dimen name="pointer_fill_style_circle_background_outer_diameter_selected">42dp</dimen>
     <dimen name="pointer_fill_style_circle_background_outline_offset">1dp</dimen>
-    <dimen name="pointer_fill_style_circle_offset">12.5dp</dimen>
-    <dimen name="pointer_fill_style_circle_offset_selected">13.25dp</dimen>
-    <dimen name="pointer_fill_style_circle_outline_offset">12.25dp</dimen>
-    <dimen name="pointer_fill_style_circle_outline_offset_selected">13dp</dimen>
+    <dimen name="pointer_fill_style_circle_offset">8.5dp</dimen>
+    <dimen name="pointer_fill_style_circle_offset_selected">9.25dp</dimen>
+    <dimen name="pointer_fill_style_circle_outline_offset">8.25dp</dimen>
+    <dimen name="pointer_fill_style_circle_outline_offset_selected">9dp</dimen>
     <dimen name="pointer_fill_style_circle_background_offset">7dp</dimen>
     <dimen name="pointer_fill_style_circle_outline_stroke">1dp</dimen>
     <dimen name="pointer_fill_style_circle_background_selected_outline_stroke">2dp</dimen>
     <dimen name="pointer_fill_style_circle_padding">16dp</dimen>
+    <dimen name="pointer_fill_style_circle_spacer">6dp</dimen>
     <dimen name="pointer_fill_style_checkmark_selected_padding">16dp</dimen>
     <dimen name="pointer_fill_style_checkmark_size">24dp</dimen>
     <dimen name="pointer_stroke_style_padding">8dp</dimen>