diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_airplane_on.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_airplane_on.png
new file mode 100644
index 0000000000000..be65c74f0798c
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_airplane_on.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back.png
new file mode 100644
index 0000000000000..345aef6b7edc5
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_ime.png
new file mode 100644
index 0000000000000..4b8f2635849cf
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_ime.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_land.png
new file mode 100644
index 0000000000000..f5ab80d6cd340
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_brightness.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_brightness.png
new file mode 100644
index 0000000000000..316f0e1a342c2
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_brightness.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight.png
new file mode 100644
index 0000000000000..f2de78e6d0dc0
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight_land.png
new file mode 100644
index 0000000000000..4da3f7aa07adc
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home.png
new file mode 100644
index 0000000000000..8713c06c461cd
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home_land.png
new file mode 100644
index 0000000000000..05efe0f35d4ca
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_default.png
new file mode 100644
index 0000000000000..2263d5cc0f50b
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_ime_default.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png
new file mode 100644
index 0000000000000..a97440ea675dc
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png
new file mode 100644
index 0000000000000..7d45617299ddb
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu.png
new file mode 100644
index 0000000000000..d7b9670f16b53
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu_land.png
new file mode 100644
index 0000000000000..5c1e7cc891609
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_quicksettings.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_quicksettings.png
new file mode 100644
index 0000000000000..dd88daef814c4
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_quicksettings.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000000000..da766c5581641
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent_land.png
new file mode 100644
index 0000000000000..c247d2855ccc5
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_rotate_on.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_rotate_on.png
new file mode 100644
index 0000000000000..4c0e80caa4433
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_rotate_on.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_wifi_on.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_wifi_on.png
new file mode 100644
index 0000000000000..0d833b89b4868
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_wifi_on.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_airplane_on.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_airplane_on.png
new file mode 100644
index 0000000000000..ecc822f39bca4
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_airplane_on.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back.png
new file mode 100644
index 0000000000000..ac5841e8f810b
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_ime.png
new file mode 100644
index 0000000000000..a479cc5e88b91
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_ime.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_land.png
new file mode 100644
index 0000000000000..4038951f9e115
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_brightness.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_brightness.png
new file mode 100644
index 0000000000000..52f21ccfa2108
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_brightness.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight.png
new file mode 100644
index 0000000000000..6214f08dd5d8f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight_land.png
new file mode 100644
index 0000000000000..bac44eb37dad2
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home.png
new file mode 100644
index 0000000000000..dfecfc9314e06
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home_land.png
new file mode 100644
index 0000000000000..71f8a367ab292
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_default.png
new file mode 100644
index 0000000000000..1e79859d5daeb
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_ime_default.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png
new file mode 100644
index 0000000000000..0ee70861b9dcc
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png
new file mode 100644
index 0000000000000..f35c36bb955f8
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu.png
new file mode 100644
index 0000000000000..7083de019a436
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu_land.png
new file mode 100644
index 0000000000000..68c10c0d8a2a0
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_quicksettings.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_quicksettings.png
new file mode 100644
index 0000000000000..65e761d19b7fd
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_quicksettings.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000000000..67d6796ad7baf
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent_land.png
new file mode 100644
index 0000000000000..def3808b17367
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_rotate_on.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_rotate_on.png
new file mode 100644
index 0000000000000..6efef06ecced3
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_rotate_on.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_wifi_on.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_wifi_on.png
new file mode 100644
index 0000000000000..7efc161634f97
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_wifi_on.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_airplane_on.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_airplane_on.png
new file mode 100644
index 0000000000000..8e5791f08743e
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_airplane_on.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back.png
new file mode 100644
index 0000000000000..477df5f4c8606
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_ime.png
new file mode 100644
index 0000000000000..5839fd05d3afb
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_ime.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_land.png
new file mode 100644
index 0000000000000..27b7ace952e47
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_brightness.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_brightness.png
new file mode 100644
index 0000000000000..f3dfb4fcf96ec
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_brightness.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight.png
new file mode 100644
index 0000000000000..376e48cf8f9f2
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight_land.png
new file mode 100644
index 0000000000000..9a364b6976372
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home.png
new file mode 100644
index 0000000000000..f7533839cd114
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home_land.png
new file mode 100644
index 0000000000000..b6e898e684388
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_ime_default.png
new file mode 100644
index 0000000000000..fb34efccbace1
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_ime_default.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png
new file mode 100644
index 0000000000000..f079b85b19f32
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png
new file mode 100644
index 0000000000000..fa5f00129b5fd
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu.png
new file mode 100644
index 0000000000000..7690b47d9553f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu_land.png
new file mode 100644
index 0000000000000..8c5062110d9b3
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_quicksettings.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_quicksettings.png
new file mode 100644
index 0000000000000..d6afed1391252
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_quicksettings.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000000000..f2db32668fdd6
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent_land.png
new file mode 100644
index 0000000000000..93c737bdb99af
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_rotate_on.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_rotate_on.png
new file mode 100644
index 0000000000000..61bcf6ea5e245
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_rotate_on.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_wifi_on.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_wifi_on.png
new file mode 100644
index 0000000000000..a00a9b859e9db
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_wifi_on.png differ
diff --git a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
index 1faebe83507ce..662c18681a875 100644
--- a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
+++ b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
@@ -53,7 +53,7 @@
                 android:visibility="invisible"
                 />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
-                android:layout_width="78dp"
+                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_back"
                 systemui:keyCode="4"
@@ -61,12 +61,8 @@
                 systemui:glowBackground="@drawable/ic_sysbar_highlight"
                 android:contentDescription="@string/accessibility_back"
                 />
-            <Space 
-                android:layout_width="50dp"
-                android:layout_height="match_parent"
-                />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"
-                android:layout_width="78dp"
+                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_home"
                 systemui:keyCode="3"
@@ -75,12 +71,8 @@
                 systemui:glowBackground="@drawable/ic_sysbar_highlight"
                 android:contentDescription="@string/accessibility_home"
                 />
-            <Space 
-                android:layout_width="50dp"
-                android:layout_height="match_parent"
-                />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"
-                android:layout_width="78dp"
+                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_recent"
                 android:layout_weight="0"
@@ -118,30 +110,22 @@
                 android:layout_weight="1"
                 />
             <ImageView
-                android:layout_width="78dp"
+                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="40dp"
                 android:src="@drawable/ic_sysbar_lights_out_dot_small"
                 android:scaleType="center"
                 android:layout_weight="0"
                 />
-            <Space 
-                android:layout_width="50dp"
-                android:layout_height="match_parent"
-                />
             <ImageView
-                android:layout_width="78dp"
+                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_lights_out_dot_large"
                 android:scaleType="center"
                 android:layout_weight="0"
                 />
-            <Space 
-                android:layout_width="50dp"
-                android:layout_height="match_parent"
-                />
             <ImageView
-                android:layout_width="78dp"
+                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
                 android:layout_marginRight="40dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_lights_out_dot_small"
@@ -193,7 +177,7 @@
                 android:visibility="invisible"
                 />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
-                android:layout_width="78dp"
+                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_back"
                 systemui:keyCode="4"
@@ -201,12 +185,8 @@
                 systemui:glowBackground="@drawable/ic_sysbar_highlight"
                 android:contentDescription="@string/accessibility_back"
                 />
-            <Space 
-                android:layout_width="84dp"
-                android:layout_height="match_parent"
-                />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"
-                android:layout_width="78dp"
+                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_home"
                 systemui:keyCode="3"
@@ -215,12 +195,8 @@
                 systemui:glowBackground="@drawable/ic_sysbar_highlight"
                 android:contentDescription="@string/accessibility_home"
                 />
-            <Space 
-                android:layout_width="84dp"
-                android:layout_height="match_parent"
-                />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"
-                android:layout_width="78dp"
+                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_recent"
                 android:layout_weight="0"
@@ -258,30 +234,22 @@
                 android:layout_weight="1"
                 />
             <ImageView
-                android:layout_width="78dp"
+                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="40dp"
                 android:src="@drawable/ic_sysbar_lights_out_dot_small"
                 android:scaleType="center"
                 android:layout_weight="0"
                 />
-            <Space 
-                android:layout_width="84dp"
-                android:layout_height="match_parent"
-                />
             <ImageView
-                android:layout_width="78dp"
+                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_lights_out_dot_large"
                 android:scaleType="center"
                 android:layout_weight="0"
                 />
-            <Space 
-                android:layout_width="84dp"
-                android:layout_height="match_parent"
-                />
             <ImageView
-                android:layout_width="78dp"
+                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
                 android:layout_marginRight="40dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_lights_out_dot_small"