diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
index 86119426a3e71..87f46828f796f 100644
--- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
+++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
@@ -141,17 +141,13 @@
                 android:gravity="top"
                 systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />
 
-            <com.android.systemui.statusbar.AlphaOptimizedButton
+            <com.android.systemui.statusbar.AlphaOptimizedImageView
                 android:id="@+id/alarm_status_collapsed"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawablePadding="6dp"
-                android:drawableStart="@drawable/ic_access_alarms_small"
-                android:textColor="#64ffffff"
-                android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
+                android:layout_height="match_parent"
+                android:src="@drawable/ic_access_alarms_small"
                 android:paddingStart="6dp"
-                android:gravity="top"
-                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center"
                 android:visibility="gone" />
         </LinearLayout>
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
index e32d51a234aff..d6deba06d4dae 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
@@ -57,7 +57,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
     protected View mSettingsContainer;
 
     private TextView mAlarmStatus;
-    private TextView mAlarmStatusCollapsed;
+    private View mAlarmStatusCollapsed;
 
     private QSPanel mQsPanel;
 
@@ -117,7 +117,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
         mSettingsContainer = findViewById(R.id.settings_button_container);
         mSettingsButton.setOnClickListener(this);
 
-        mAlarmStatusCollapsed = (TextView) findViewById(R.id.alarm_status_collapsed);
+        mAlarmStatusCollapsed = findViewById(R.id.alarm_status_collapsed);
         mAlarmStatus = (TextView) findViewById(R.id.alarm_status);
         mAlarmStatus.setOnClickListener(this);