diff --git a/app/src/main/res/drawable/bg_custom_toast.xml b/app/src/main/res/drawable/bg_custom_toast.xml
index ad25896..2005ee5 100644
--- a/app/src/main/res/drawable/bg_custom_toast.xml
+++ b/app/src/main/res/drawable/bg_custom_toast.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 배경색: 다크모드에서도 잘 보이도록 surface 색상 사용 -->
-    <solid android:color="#CC333333" />
+    <solid android:color="@color/surface_variant" />
     <corners android:radius="16dp" />
     <stroke
         android:width="1dp"
diff --git a/app/src/main/res/drawable/bg_opaque_glass_dialog.xml b/app/src/main/res/drawable/bg_opaque_glass_dialog.xml
index 9c1537d..1d6948b 100644
--- a/app/src/main/res/drawable/bg_opaque_glass_dialog.xml
+++ b/app/src/main/res/drawable/bg_opaque_glass_dialog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FFFFFFFF"/> <!-- Fully Opaque to hide everything behind -->
+    <solid android:color="@color/surface"/> <!-- Theme-aware surface color -->
     <corners android:radius="32dp"/>
     <stroke android:width="1.2dp" android:color="#1A000000"/>
 </shape>
diff --git a/app/src/main/res/layout/custom_toast.xml b/app/src/main/res/layout/custom_toast.xml
index 4c337bc..7ee244d 100644
--- a/app/src/main/res/layout/custom_toast.xml
+++ b/app/src/main/res/layout/custom_toast.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="14sp"
-        android:textColor="@android:color/white"
+        android:textColor="@color/text_primary"
         android:maxLines="2"
         android:ellipsize="end" />