diff --git a/app/src/main/res/drawable/ic_check_md2.xml b/app/src/main/res/drawable/ic_check_md2.xml
new file mode 100644
index 000000000..ff6645704
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_md2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?colorOnSurface"
+        android:pathData="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z"
+        tools:fillColor="#000" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_up_md2.xml b/app/src/main/res/drawable/ic_up_md2.xml
index cb26da310..607a43c89 100644
--- a/app/src/main/res/drawable/ic_up_md2.xml
+++ b/app/src/main/res/drawable/ic_up_md2.xml
@@ -1,4 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="512"
@@ -8,7 +9,8 @@
         android:pivotY="256"
         android:rotation="180">
         <path
-            android:fillColor="#FF000000"
+            android:fillColor="?colorOnSurface"
+            tools:fillColor="#000"
             android:pathData="m256.238,430.145 l-89.77,-94.898 29.059,-27.488 60.633,64.098 60.273,-64.059 29.133,27.41zM422,392v-272c0,-66.168 -53.832,-120 -120,-120h-92c-66.168,0 -120,53.832 -120,120v272c0,66.168 53.832,120 120,120h92c66.168,0 120,-53.832 120,-120zM302,40c44.113,0 80,35.887 80,80v272c0,44.113 -35.887,80 -80,80h-92c-44.113,0 -80,-35.887 -80,-80v-272c0,-44.113 35.887,-80 80,-80zM256,81c-11.047,0 -20,8.953 -20,20s8.953,20 20,20 20,-8.953 20,-20 -8.953,-20 -20,-20zM256,161c-11.047,0 -20,8.953 -20,20s8.953,20 20,20 20,-8.953 20,-20 -8.953,-20 -20,-20zM256,241c-11.047,0 -20,8.953 -20,20s8.953,20 20,20 20,-8.953 20,-20 -8.953,-20 -20,-20zM256,241" />
     </group>
 </vector>
diff --git a/app/src/main/res/layout/fragment_hide_md2.xml b/app/src/main/res/layout/fragment_hide_md2.xml
index 81582b8d2..a8fb28860 100644
--- a/app/src/main/res/layout/fragment_hide_md2.xml
+++ b/app/src/main/res/layout/fragment_hide_md2.xml
@@ -71,7 +71,10 @@
                                 android:layout_height="wrap_content"
                                 android:checked="@={viewModel.showSystem}"
                                 android:text="@string/show_system_app"
-                                android:textAppearance="?appearanceTextCaptionNormal" />
+                                android:textAppearance="?appearanceTextCaptionNormal"
+                                app:checkedIcon="@drawable/ic_check_md2"
+                                app:chipBackgroundColor="?colorSurfaceVariant"
+                                tools:checked="true" />
 
                             <com.google.android.material.chip.Chip
                                 style="@style/Widget.MaterialComponents.Chip.Entry"
@@ -81,7 +84,8 @@
                                 android:layout_height="wrap_content"
                                 android:checkable="false"
                                 android:text="@{viewModel.query}"
-                                android:textAppearance="?appearanceTextCaptionNormal" />
+                                android:textAppearance="?appearanceTextCaptionNormal"
+                                app:chipBackgroundColor="?colorSurfaceVariant" />
 
                         </com.google.android.material.chip.ChipGroup>
 
@@ -122,7 +126,9 @@
                                 android:paddingEnd="@dimen/l1"
                                 android:singleLine="true"
                                 android:text="@={viewModel.query}"
-                                android:textAppearance="?appearanceTextBodyNormal" />
+                                android:textAppearance="?appearanceTextBodyNormal"
+                                android:textColor="?colorTextTransient"
+                                android:textColorHint="?colorOnSurfaceVariant" />
 
                         </com.google.android.material.card.MaterialCardView>