diff --git a/packages/SystemUI/res/drawable/keyguard_affordance_background.xml b/packages/SystemUI/res/drawable/keyguard_affordance_background.xml
new file mode 100644
index 000000000000..d0197023597d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/keyguard_affordance_background.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2019 ExtendedUI
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="@color/keyguard_affordance_background_color" />
+    <corners
+        android:bottomLeftRadius="40dp"
+        android:topLeftRadius="40dp"
+        android:bottomRightRadius="40dp"
+        android:topRightRadius="40dp"
+        />
+</shape> 
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index da03a34ffd5e..c22bdad19358 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -62,21 +62,27 @@
         android:id="@+id/camera_button"
         android:layout_height="@dimen/keyguard_affordance_height"
         android:layout_width="@dimen/keyguard_affordance_width"
+        android:layout_margin="@dimen/keyguard_affordance_margin"
         android:layout_gravity="bottom|end"
+        android:padding="@dimen/keyguard_affordance_padding"
+        android:background="@drawable/keyguard_affordance_background"
         android:src="@drawable/ic_camera_alt_24dp"
         android:scaleType="center"
         android:contentDescription="@string/accessibility_camera_button"
-        android:tint="?attr/wallpaperTextColor" />
+        android:tint="?android:attr/colorAccent" />
 
     <com.android.systemui.statusbar.KeyguardAffordanceView
         android:id="@+id/left_button"
         android:layout_height="@dimen/keyguard_affordance_height"
         android:layout_width="@dimen/keyguard_affordance_width"
+        android:layout_margin="@dimen/keyguard_affordance_margin"
         android:layout_gravity="bottom|start"
+        android:padding="@dimen/keyguard_affordance_padding"
+        android:background="@drawable/keyguard_affordance_background"
         android:src="@*android:drawable/ic_phone"
         android:scaleType="center"
         android:contentDescription="@string/accessibility_phone_button"
-        android:tint="?attr/wallpaperTextColor" />
+        android:tint="?android:attr/colorAccent" />
 
     <ImageView
         android:id="@+id/wallet_button"
diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml
index fcb369876cf2..c3ae37799b28 100644
--- a/packages/SystemUI/res/values-night/colors.xml
+++ b/packages/SystemUI/res/values-night/colors.xml
@@ -99,4 +99,5 @@
     <color name="accessibility_floating_menu_background">#B3000000</color> <!-- 70% -->
 
     <color name="people_tile_background">@android:color/system_accent2_800</color>
+   <color name="keyguard_affordance_background_color">@android:color/system_neutral1_800</color>
 </resources>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index e8851245ffb1..5251717d26e0 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -215,4 +215,6 @@
     <color name="settingslib_track_off_color">@color/settingslib_track_off</color>
     <color name="connected_network_primary_color">#191C18</color>
     <color name="connected_network_secondary_color">#41493D</color>
+    
+   <color name="keyguard_affordance_background_color">@android:color/system_neutral1_0</color>
 </resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 7d54769e111d..5dd6f7503c5f 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -681,6 +681,8 @@
     <!-- The width/height of the keyguard bottom area icon view on keyguard. -->
     <dimen name="keyguard_affordance_height">48dp</dimen>
     <dimen name="keyguard_affordance_width">48dp</dimen>
+    <dimen name="keyguard_affordance_padding">10dp</dimen>
+    <dimen name="keyguard_affordance_margin">15dp</dimen>
 
     <dimen name="keyguard_affordance_fixed_height">48dp</dimen>
     <dimen name="keyguard_affordance_fixed_width">48dp</dimen>