diff --git a/core/res/res/drawable/ic_emergency.png b/core/res/res/drawable/ic_emergency.png
index d99abf83e7254..45d0f21736c3d 100755
Binary files a/core/res/res/drawable/ic_emergency.png and b/core/res/res/drawable/ic_emergency.png differ
diff --git a/core/res/res/layout/keyguard_screen_glogin_unlock.xml b/core/res/res/layout/keyguard_screen_glogin_unlock.xml
index 4834b28a945fa..74ff3b029cca2 100644
--- a/core/res/res/layout/keyguard_screen_glogin_unlock.xml
+++ b/core/res/res/layout/keyguard_screen_glogin_unlock.xml
@@ -120,7 +120,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:drawableLeft="@drawable/ic_emergency"
-        android:drawablePadding="3dip"
+        android:drawablePadding="8dip"
         android:text="@android:string/lockscreen_emergency_call"
         />
 
diff --git a/core/res/res/layout/keyguard_screen_lock.xml b/core/res/res/layout/keyguard_screen_lock.xml
index 952fc5d9dc60b..b5fbace148614 100644
--- a/core/res/res/layout/keyguard_screen_lock.xml
+++ b/core/res/res/layout/keyguard_screen_lock.xml
@@ -211,7 +211,7 @@
             android:layout_marginTop="5dip"
             android:layout_gravity="center_horizontal"
             android:drawableLeft="@drawable/ic_emergency"
-            android:drawablePadding="3dip"
+            android:drawablePadding="8dip"
             android:text="@android:string/lockscreen_emergency_call"
            />
 
diff --git a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml
index 881652ba6cbb9..4c583d84eeb28 100644
--- a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml
+++ b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml
@@ -87,12 +87,7 @@
             android:layout_weight="1.0"
             android:layout_marginBottom="8dip"
             android:layout_marginRight="8dip"
-            android:paddingLeft="4dip"
-            android:paddingRight="4dip"
-            android:paddingTop="8dip"
-            android:paddingBottom="8dip"
             android:textSize="18sp"
-            android:drawablePadding="3dip"
             />
 
         <Button android:id="@+id/emergencyCall"
@@ -104,13 +99,9 @@
             android:layout_weight="1.0"
             android:layout_marginBottom="8dip"
             android:layout_marginLeft="8dip"
-            android:paddingLeft="4dip"
-            android:paddingRight="4dip"
-            android:paddingTop="8dip"
-            android:paddingBottom="8dip"
             android:textSize="18sp"
             android:drawableLeft="@drawable/ic_emergency"
-            android:drawablePadding="3dip"
+            android:drawablePadding="8dip"
         />
     </LinearLayout>
 
diff --git a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
index fc82e3f9e7178..ac404f26649b1 100644
--- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
@@ -76,6 +76,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/topDisplayGroup"
+        android:layout_marginTop="10dip"
         android:orientation="vertical"
         >
 
@@ -249,7 +250,7 @@
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
         android:drawableLeft="@android:drawable/ic_emergency"
-        android:drawablePadding="3dip"
+        android:drawablePadding="8dip"
         android:text="@android:string/lockscreen_emergency_call"
         />
 
diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml
index d0388a6663fb4..929d0a22c61f5 100644
--- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml
+++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml
@@ -85,7 +85,7 @@
                     android:text="@android:string/lockscreen_emergency_call"
                     android:textSize="14sp"
                     android:drawableLeft="@drawable/ic_emergency"
-                    android:drawablePadding="3dip"
+                    android:drawablePadding="8dip"
                     />
             </RelativeLayout>
 
@@ -108,7 +108,7 @@
                     android:text="@android:string/lockscreen_emergency_call"
                     android:textSize="14sp"
                     android:drawableLeft="@drawable/ic_emergency"
-                    android:drawablePadding="3dip"
+                    android:drawablePadding="8dip"
                     />
             </LinearLayout>
         </FrameLayout>
diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
index 59cd7a36dd93a..a6c31b6c47255 100644
--- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
@@ -85,7 +85,7 @@
                 android:text="@android:string/lockscreen_emergency_call"
                 android:textSize="14sp"
                 android:drawableLeft="@drawable/ic_emergency"
-                android:drawablePadding="3dip"
+                android:drawablePadding="8dip"
                 />
 
         </RelativeLayout>
@@ -108,7 +108,7 @@
                 android:text="@android:string/lockscreen_emergency_call"
                 android:textSize="14sp"
                 android:drawableLeft="@drawable/ic_emergency"
-                android:drawablePadding="3dip"
+                android:drawablePadding="8dip"
                 />
             <Button android:id="@+id/forgotPattern"
                 android:layout_width="0dip"