diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
index 55da5bc4be15e..8e491dc4728a3 100644
--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -23,6 +23,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/status_bar_header_height_keyguard"
     android:baselineAligned="false"
+    android:gravity="center_vertical"
     >
 
     <LinearLayout
@@ -33,7 +34,7 @@
         android:gravity="center_vertical|end" >
         <FrameLayout android:id="@+id/system_icons_container"
             android:layout_width="0dp"
-            android:layout_height="@dimen/status_bar_height"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:layout_marginStart="@dimen/system_icons_super_container_margin_start"
             android:gravity="center_vertical|end"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
index 9787d73f2ee02..58d3b9a2bf330 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -128,13 +128,7 @@ public class KeyguardStatusBarView extends RelativeLayout
         mMultiUserSwitch.setLayoutParams(lp);
 
         // System icons
-        lp = (MarginLayoutParams) mStatusIconArea.getLayoutParams();
-        lp.height = getResources().getDimensionPixelSize(
-                com.android.internal.R.dimen.status_bar_height);
-
         lp = (MarginLayoutParams) mSystemIconsContainer.getLayoutParams();
-        lp.height = getResources().getDimensionPixelSize(
-                R.dimen.status_bar_height);
         lp.setMarginStart(getResources().getDimensionPixelSize(
                 R.dimen.system_icons_super_container_margin_start));
         mSystemIconsContainer.setLayoutParams(lp);