diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_halo_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_halo_normal.png
index 1d9afe25040d..81e469f02702 100755
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_notify_halo_normal.png and b/packages/SystemUI/res/drawable-hdpi/ic_notify_halo_normal.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_halo_pressed.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_halo_pressed.png
index 7a53331a1bd2..2eaca4cede9f 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_notify_halo_pressed.png and b/packages/SystemUI/res/drawable-hdpi/ic_notify_halo_pressed.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_halo_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_halo_normal.png
index 49310317f811..f3e59cdceee4 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_notify_halo_normal.png and b/packages/SystemUI/res/drawable-mdpi/ic_notify_halo_normal.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_halo_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_halo_pressed.png
index 35bc3b9e2f6d..4892fab39046 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_notify_halo_pressed.png and b/packages/SystemUI/res/drawable-mdpi/ic_notify_halo_pressed.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_normal.png
index 97764713fd22..dcc72357f45b 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_normal.png and b/packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_normal.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_pressed.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_pressed.png
index 44a5f750fa3c..1f93b6ad6a61 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_pressed.png and b/packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_pressed.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_halo_normal.png b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_halo_normal.png
index 186bff14eb1f..cc7d0c339563 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_halo_normal.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_halo_normal.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_halo_pressed.png b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_halo_pressed.png
index 72863ecc7b40..304fbf2c6109 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_halo_pressed.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_halo_pressed.png differ
diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_notify_halo_normal.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_notify_halo_normal.png
new file mode 100644
index 000000000000..523e9aa8fccd
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxxhdpi/ic_notify_halo_normal.png differ
diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_notify_halo_pressed.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_notify_halo_pressed.png
new file mode 100644
index 000000000000..8b12e8686882
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxxhdpi/ic_notify_halo_pressed.png differ
diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
index a487a647e724..790ff1d0c75f 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
@@ -79,9 +79,20 @@
 
     </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
 
+    <ImageButton
+        android:id="@+id/halo_button"
+        android:src="@drawable/ic_notify_halo"
+        android:contentDescription="@string/accessibility_halo"
+        android:layout_width="40dp"
+        android:layout_height="@dimen/status_bar_header_height"
+        android:layout_toStartOf="@id/settings_button_container"
+        style="@android:style/Widget.Material.Button.Borderless"
+        android:layout_marginStart="7dp"
+        android:background="@drawable/ripple_drawable" />
+
     <com.android.keyguard.AlphaOptimizedImageButton android:id="@+id/task_manager_button"
         style="@android:style/Widget.Material.Button.Borderless"
-        android:layout_toStartOf="@id/settings_button_container"
+        android:layout_toStartOf="@id/halo_button"
         android:layout_width="48dp"
         android:layout_marginStart="8dp"
         android:layout_height="@dimen/status_bar_header_height"
@@ -89,15 +100,6 @@
         android:src="@drawable/ic_tasklist_switch_normal"
         android:visibility="gone"/>
 
-    <ImageButton
-        android:id="@+id/halo_button"
-        android:src="@drawable/ic_notify_halo"
-        android:contentDescription="@string/accessibility_halo"
-        android:layout_width="50dp"
-        android:layout_height="@dimen/status_bar_header_height"
-        android:layout_toStartOf="@id/task_manager_button"
-        style="@android:style/Widget.Material.Button.Borderless"
-        android:background="@drawable/ripple_drawable" />
 
     <LinearLayout android:id="@+id/system_icons_super_container"
         android:layout_width="wrap_content"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
index 1d3fe7ccc280..a72e107a6253 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
@@ -894,11 +894,13 @@ private void captureLayoutValues(LayoutValues target) {
                 ? 0
                 : mMultiUserSwitch.getLeft() - mSettingsContainer.getLeft();
         target.haloButtonAlpha = getAlphaForVisibility(mHaloButton);
-        target.haloButtonTranslation = mExpanded ? 0 : mSettingsContainer.getLeft() - mHaloButton.getLeft();
+        target.haloButtonTranslation = mExpanded
+                ? 0
+                : mSettingsContainer.getLeft() - mHaloButton.getLeft();
         target.taskManagerAlpha = getAlphaForVisibility(mTaskManagerButton);
         target.taskManagerTranslation = mExpanded
                 ? 0
-                : mSettingsContainer.getLeft() - mTaskManagerButton.getLeft();
+                : mHaloButton.getLeft() - mTaskManagerButton.getLeft();
         target.signalClusterAlpha = mSignalClusterDetached ? 0f : 1f;
         target.settingsRotation = !mExpanded ? 90f : 0f;
     }
@@ -959,7 +961,9 @@ private void applyLayoutValues(LayoutValues values) {
         mTaskManagerButton.setTranslationY(mSystemIconsSuperContainer.getTranslationY());
         mTaskManagerButton.setTranslationX(values.taskManagerTranslation);
         mTaskManagerButton.setRotation(values.settingsRotation);
+        mHaloButton.setTranslationY(mSystemIconsSuperContainer.getTranslationY());
         mHaloButton.setTranslationX(values.haloButtonTranslation);
+        mHaloButton.setRotation(values.settingsRotation);
         applyAlpha(mEmergencyCallsOnly, values.emergencyCallsOnlyAlpha);
         if (!mShowingDetail && !mDetailTransitioning) {
             // Otherwise it needs to stay invisible
@@ -1071,7 +1075,7 @@ public void interpoloate(LayoutValues v1, LayoutValues v2, float t) {
                     v1.taskManagerTranslation * (1 - t) + v2.taskManagerTranslation * t;
             settingsTranslation = v1.settingsTranslation * (1 - t) + v2.settingsTranslation * t;
             weatherY = v1.weatherY * (1 - t) + v2.weatherY * t;
-            haloButtonTranslation = v1.haloButtonTranslation * (1 -t) + v2.haloButtonTranslation * t;
+            haloButtonTranslation = v1.haloButtonTranslation * (1 - t) + v2.haloButtonTranslation * t;
 
             float t1 = Math.max(0, t - 0.5f) * 2;
             settingsRotation = v1.settingsRotation * (1 - t1) + v2.settingsRotation * t1;
@@ -1220,7 +1224,7 @@ private boolean toggleHalo() {
         return Settings.Secure.putInt(mContext.getContentResolver(),
                     Settings.Secure.HALO_ACTIVE, 1);
     }
-    
+
     class SettingsObserver extends UserContentObserver {
         SettingsObserver(Handler handler) {
             super(handler);