diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index 40f7aa88495..51914c9cdd5 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -23,7 +23,7 @@
               android:layout_height="wrap_content"
               android:layout_width="0dp"
               android:layout_weight="1"
-              android:paddingStart="32dp"
+              android:paddingStart="@dimen/switchbar_padding_start"
               android:layout_gravity="center_vertical"
               android:textAppearance="@style/TextAppearance.Switch"
               android:textAlignment="viewStart" />
@@ -32,6 +32,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:paddingEnd="32dp" />
+            android:paddingEnd="@dimen/switchbar_padding_end" />
 </merge>
 
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 154b34f0fee..0cef851b6dd 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -42,4 +42,7 @@
     <!-- Dashboard padding between each tiles within the layout -->
     <dimen name="dashboard_cell_gap">8dp</dimen>
 
+    <!-- SwitchBar padding start -->
+    <dimen name="switchbar_padding_start">80dp</dimen>
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fdd8ed084cf..93d98339125 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -88,6 +88,12 @@
     <!-- Dashboard padding between each tiles within the layout -->
     <dimen name="dashboard_cell_gap">4dp</dimen>
 
+    <!-- Dashboard category title layout height -->
     <dimen name="dashboard_category_title_height">48dp</dimen>
 
+    <!-- SwitchBar padding start -->
+    <dimen name="switchbar_padding_start">72dp</dimen>
+    <!-- SwitchBar padding emd -->
+    <dimen name="switchbar_padding_end">@*android:dimen/preference_fragment_padding_side</dimen>
+
 </resources>