diff --git a/core/res/res/drawable/autofill_bottomsheet_background.xml b/core/res/res/drawable/autofill_bottomsheet_background.xml
new file mode 100644
index 0000000000000..0bbc009bd3c17
--- /dev/null
+++ b/core/res/res/drawable/autofill_bottomsheet_background.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+     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 android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+  <corners
+      android:topLeftRadius="@dimen/autofill_dialog_corner_radius"
+      android:topRightRadius="@dimen/autofill_dialog_corner_radius"/>
+  <solid android:color="?attr/colorSurface" />
+</shape>
diff --git a/core/res/res/drawable/bottomsheet_background.xml b/core/res/res/drawable/bottomsheet_background.xml
index 9469e0a672076..00d53004c9dca 100644
--- a/core/res/res/drawable/bottomsheet_background.xml
+++ b/core/res/res/drawable/bottomsheet_background.xml
@@ -16,7 +16,7 @@
 
 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
     <corners
-        android:topLeftRadius="@dimen/autofill_dialog_corner_radius"
-        android:topRightRadius="@dimen/autofill_dialog_corner_radius"/>
-    <solid android:color="?attr/colorSurface" />
+        android:topLeftRadius="@dimen/config_bottomDialogCornerRadius"
+        android:topRightRadius="@dimen/config_bottomDialogCornerRadius"/>
+    <solid android:color="?attr/colorBackground" />
 </shape>
diff --git a/core/res/res/layout/autofill_fill_dialog.xml b/core/res/res/layout/autofill_fill_dialog.xml
index e638764840738..e2ef1942e4bd2 100644
--- a/core/res/res/layout/autofill_fill_dialog.xml
+++ b/core/res/res/layout/autofill_fill_dialog.xml
@@ -20,7 +20,7 @@
     android:id="@+id/autofill_dialog_picker"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bottomsheet_background"
+    android:background="@drawable/autofill_bottomsheet_background"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/core/res/res/layout/autofill_save.xml b/core/res/res/layout/autofill_save.xml
index 8a1a9c7a90832..60da314d4500d 100644
--- a/core/res/res/layout/autofill_save.xml
+++ b/core/res/res/layout/autofill_save.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bottomsheet_background"
+    android:background="@drawable/autofill_bottomsheet_background"
     android:orientation="vertical">
 
     <LinearLayout