diff --git a/app/src/main/res/drawable/qr_bottom_sheet_dialog_background.xml b/app/src/main/res/drawable/qr_bottom_sheet_dialog_background.xml
deleted file mode 100644
index c48f464..0000000
--- a/app/src/main/res/drawable/qr_bottom_sheet_dialog_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/gray_70" />
-    <corners
-        android:topLeftRadius="28dp"
-        android:topRightRadius="28dp" />
-</shape>
diff --git a/app/src/main/res/layout/qr_bottom_sheet_action_button.xml b/app/src/main/res/layout/qr_bottom_sheet_action_button.xml
index 24f9b5f..98e1e86 100644
--- a/app/src/main/res/layout/qr_bottom_sheet_action_button.xml
+++ b/app/src/main/res/layout/qr_bottom_sheet_action_button.xml
@@ -11,10 +11,10 @@
     android:letterSpacing="0.0"
     android:textAlignment="center"
     android:textAllCaps="false"
-    android:textColor="@color/gray_30"
+    android:textColor="?attr/colorOnSurface"
     android:textSize="15sp"
     android:textStyle="normal"
     android:typeface="normal"
     app:cornerRadius="8dp"
-    app:strokeColor="@color/gray_40"
+    app:strokeColor="?attr/colorOnSurfaceVariant"
     app:strokeWidth="1dp" />
diff --git a/app/src/main/res/layout/qr_bottom_sheet_dialog.xml b/app/src/main/res/layout/qr_bottom_sheet_dialog.xml
index 397c551..f23a72e 100644
--- a/app/src/main/res/layout/qr_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/qr_bottom_sheet_dialog.xml
@@ -8,7 +8,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/qr_bottom_sheet_dialog_background"
     android:paddingHorizontal="16dp">
 
     <ImageView
@@ -22,7 +21,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/gray_50"
+        app:tint="?attr/colorOnSurface"
         tools:ignore="ContentDescription" />
 
     <androidx.cardview.widget.CardView
@@ -32,7 +31,7 @@
         android:layout_marginTop="12dp"
         android:clickable="true"
         android:foreground="?attr/selectableItemBackground"
-        app:cardBackgroundColor="@color/gray_60"
+        app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
         app:cardCornerRadius="12dp"
         app:cardElevation="0dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -73,6 +72,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:singleLine="true"
+                    android:textColor="?attr/colorOnSurface"
                     android:textStyle="bold"
                     android:typeface="normal"
                     app:layout_constraintBottom_toTopOf="@+id/data"
@@ -87,6 +87,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:singleLine="true"
+                    android:textColor="?attr/colorOnSurfaceVariant"
                     android:textStyle="normal"
                     android:typeface="normal"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -111,7 +112,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/copy"
                 app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/gray_30" />
+                app:tint="?attr/colorOnSurface" />
 
             <ImageButton
                 android:id="@+id/copy"
@@ -127,7 +128,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/gray_30" />
+                app:tint="?attr/colorOnSurface" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 30ec130..256a5e2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,9 +5,6 @@
 -->
 <resources>
     <color name="gray_10">#FFF6FAFA</color>
-    <color name="gray_30">#FFBFC8C9</color>
-    <color name="gray_40">#FF808D8D</color>
-    <color name="gray_50">#FF495454</color>
     <color name="gray_60">#FF2A3232</color>
     <color name="gray_70">#FF202626</color>
     <color name="dark_grey">#FF444444</color>