diff --git a/res/layout/dashboard_container_header.xml b/res/layout/dashboard_container_header.xml
index 59e7eb18100..a9d78edbb46 100644
--- a/res/layout/dashboard_container_header.xml
+++ b/res/layout/dashboard_container_header.xml
@@ -20,6 +20,6 @@
     android:id="@+id/sliding_tabs"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/dashboard_header_margin_left"
-    android:layout_marginRight="@dimen/dashboard_header_margin_right"
+    android:layout_marginStart="@dimen/dashboard_header_margin_start"
+    android:layout_marginEnd="@dimen/dashboard_header_margin_end"
     android:background="?android:attr/colorPrimary"/>
diff --git a/res/layout/support_fragment.xml b/res/layout/support_fragment.xml
index 10b941817c5..913e6071baa 100644
--- a/res/layout/support_fragment.xml
+++ b/res/layout/support_fragment.xml
@@ -20,4 +20,8 @@
     android:id="@+id/support_items"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:focusable="false"  />
\ No newline at end of file
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:focusable="false"
+    android:paddingStart="@dimen/dashboard_padding_start"
+    android:paddingEnd="@dimen/dashboard_padding_end"/>
\ No newline at end of file
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index d924344be29..70faa0f456b 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -22,8 +22,8 @@
     <dimen name="dashboard_padding_end">160dp</dimen>
 
     <!-- Dashboard Header margin in its container -->
-    <dimen name="dashboard_header_margin_right">304dp</dimen>
-    <dimen name="dashboard_header_margin_left">304dp</dimen>
+    <dimen name="dashboard_header_margin_start">304dp</dimen>
+    <dimen name="dashboard_header_margin_end">304dp</dimen>
 
     <!-- ActionBar contentInsetStart -->
     <dimen name="actionbar_contentInsetStart">128dp</dimen>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 0a2a1ce928b..a0be467b31c 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -43,8 +43,8 @@
     <dimen name="dashboard_padding_end">80dp</dimen>
 
     <!-- Dashboard Header margin in its container -->
-    <dimen name="dashboard_header_margin_right">176dp</dimen>
-    <dimen name="dashboard_header_margin_left">176dp</dimen>
+    <dimen name="dashboard_header_margin_start">176dp</dimen>
+    <dimen name="dashboard_header_margin_end">176dp</dimen>
 
     <!-- Dashboard category padding start / end -->
     <dimen name="dashboard_category_padding_start">24dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 74441c20448..28bed779dfd 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -97,8 +97,8 @@
     <dimen name="dashboard_padding_bottom">0dp</dimen>
 
     <!-- Dashboard Header margin in its container -->
-    <dimen name="dashboard_header_margin_right">0dp</dimen>
-    <dimen name="dashboard_header_margin_left">0dp</dimen>
+    <dimen name="dashboard_header_margin_start">0dp</dimen>
+    <dimen name="dashboard_header_margin_end">0dp</dimen>
 
     <!-- Dashboard category padding start / end -->
     <dimen name="dashboard_category_padding_start">0dp</dimen>