diff --git a/Habitica/res/layout/button_list_item.xml b/Habitica/res/layout/button_list_item.xml
deleted file mode 100644
index ad972d7e1..000000000
--- a/Habitica/res/layout/button_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/textView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="@dimen/card_padding"/>
diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml
index 681b68884..0452194ff 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -7,6 +7,7 @@
     android:layout_height="wrap_content"
     android:layout_margin="5dp"
     android:clickable="true"
+    android:foreground="?selectableItemBackground"
     android:orientation="horizontal"
     android:baselineAligned="false"
     android:paddingEnd="16dp">
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index b8d778de6..d659efd1d 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -28,6 +28,7 @@
                     android:layout_height="match_parent"
                     tools:background="@color/red_10"
                     android:focusable="true"
+                    android:foreground="?selectableItemBackground"
                     android:contentDescription="@string/daily_item_checkbox">
                     <View
                         android:id="@+id/checkBoxBackground"
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index ebae45ff3..6b14d2b7c 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -19,7 +19,8 @@
         <FrameLayout
             android:id="@+id/btnPlusWrapper"
             android:layout_width="@dimen/button_width"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:foreground="?selectableItemBackground">
             <View
                 android:id="@+id/button_plus_circle_view"
                 android:layout_width="24dp"
@@ -38,7 +39,7 @@
                 style="@style/HabitButton"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/selection_highlight"
+                android:background="?selectableItemBackground"
                 android:contentDescription="@string/positive_habit_form" />
         </FrameLayout>
         <include layout="@layout/task_main_content" />
@@ -62,7 +63,8 @@
         <FrameLayout
             android:id="@+id/btnMinusWrapper"
             android:layout_width="@dimen/button_width"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:foreground="?selectableItemBackground">
             <View
                 android:id="@+id/button_minus_circle_view"
                 android:layout_width="24dp"
@@ -80,7 +82,6 @@
                 style="@style/HabitButton"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/selection_highlight"
                 android:contentDescription="@string/negative_habit_form" />
         </FrameLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/item_image_row.xml b/Habitica/res/layout/item_image_row.xml
index 365f66234..56b668d58 100644
--- a/Habitica/res/layout/item_image_row.xml
+++ b/Habitica/res/layout/item_image_row.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="@style/RowWrapper"
+    android:foreground="?selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
     tools:parentTag="android.widget.LinearLayout">
diff --git a/Habitica/res/layout/item_public_guild.xml b/Habitica/res/layout/item_public_guild.xml
index f132dec3b..a0de039e1 100644
--- a/Habitica/res/layout/item_public_guild.xml
+++ b/Habitica/res/layout/item_public_guild.xml
@@ -7,6 +7,7 @@
     android:layout_marginHorizontal="10dp"
     android:layout_marginVertical="4dp"
     android:background="@drawable/layout_rounded_bg_window"
+    android:foreground="?selectableItemBackground"
     android:padding="12dp">
 
     <TextView
diff --git a/Habitica/res/layout/item_user_guild.xml b/Habitica/res/layout/item_user_guild.xml
index 78bd2bf72..06422362f 100644
--- a/Habitica/res/layout/item_user_guild.xml
+++ b/Habitica/res/layout/item_user_guild.xml
@@ -6,6 +6,7 @@
     android:layout_marginHorizontal="10dp"
     android:layout_marginVertical="4dp"
     android:background="@drawable/layout_rounded_bg_window"
+    android:foreground="?selectableItemBackground"
     android:padding="12dp"
     android:gravity="center">
     <ImageView
diff --git a/Habitica/res/layout/main_navigation_view.xml b/Habitica/res/layout/main_navigation_view.xml
index ae3ab5cae..7a8ba0836 100644
--- a/Habitica/res/layout/main_navigation_view.xml
+++ b/Habitica/res/layout/main_navigation_view.xml
@@ -57,6 +57,7 @@
             app:title="@string/habits"
             app:iconDrawable="@drawable/icon_habits"
             app:selectedIconDrawable="@drawable/icon_habits_selected"
+            android:foreground="?selectableItemBackground"
             android:paddingTop="@dimen/spacing_small"
             android:paddingBottom="@dimen/spacing_small"/>
         <com.habitrpg.android.habitica.ui.views.navigation.BottomNavigationItem
@@ -67,6 +68,7 @@
             app:title="@string/dailies"
             app:iconDrawable="@drawable/icon_dailies"
             app:selectedIconDrawable="@drawable/icon_dailies_selected"
+            android:foreground="?selectableItemBackground"
             android:paddingTop="@dimen/spacing_small"
             android:paddingBottom="@dimen/spacing_small"/>
         <androidx.legacy.widget.Space
@@ -81,6 +83,7 @@
             app:title="@string/todos"
             app:iconDrawable="@drawable/icon_todos"
             app:selectedIconDrawable="@drawable/icon_todos_selected"
+            android:foreground="?selectableItemBackground"
             android:paddingTop="@dimen/spacing_small"
             android:paddingBottom="@dimen/spacing_small"/>
         <com.habitrpg.android.habitica.ui.views.navigation.BottomNavigationItem
@@ -91,6 +94,7 @@
             app:title="@string/rewards"
             app:iconDrawable="@drawable/icon_rewards"
             app:selectedIconDrawable="@drawable/icon_rewards_selected"
+            android:foreground="?selectableItemBackground"
             android:paddingTop="@dimen/spacing_small"
             android:paddingBottom="@dimen/spacing_small"/>
     </LinearLayout>
diff --git a/Habitica/res/layout/menu_bottom_sheet.xml b/Habitica/res/layout/menu_bottom_sheet.xml
index e115233a4..dda533fb1 100644
--- a/Habitica/res/layout/menu_bottom_sheet.xml
+++ b/Habitica/res/layout/menu_bottom_sheet.xml
@@ -4,7 +4,6 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    style="@style/BottomMenu"
     android:clickable="false">
     <TextView
         android:id="@+id/title_view"
diff --git a/Habitica/res/layout/task_form_habit_scoring.xml b/Habitica/res/layout/task_form_habit_scoring.xml
index ade704ff5..8d1827b9f 100644
--- a/Habitica/res/layout/task_form_habit_scoring.xml
+++ b/Habitica/res/layout/task_form_habit_scoring.xml
@@ -13,6 +13,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:gravity="center"
+        android:foreground="?selectableItemBackground"
         android:layout_margin="@dimen/spacing_large">
         <ImageView
             android:id="@+id/positive_image_view"
@@ -33,6 +34,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:gravity="center"
+        android:foreground="?selectableItemBackground"
         android:layout_margin="@dimen/spacing_large">
         <ImageView
             android:id="@+id/negative_image_view"
diff --git a/Habitica/res/layout/task_form_task_difficulty.xml b/Habitica/res/layout/task_form_task_difficulty.xml
index fea15bd67..f18c3390f 100644
--- a/Habitica/res/layout/task_form_task_difficulty.xml
+++ b/Habitica/res/layout/task_form_task_difficulty.xml
@@ -3,7 +3,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:gravity="center">
+        android:gravity="center"
+    android:foreground="?selectableItemBackground">
         <ImageView
             android:id="@+id/image_view"
             android:layout_width="57dp"
diff --git a/Habitica/res/layout/task_main_content.xml b/Habitica/res/layout/task_main_content.xml
index 95c8a1c53..bf2e2f2ba 100644
--- a/Habitica/res/layout/task_main_content.xml
+++ b/Habitica/res/layout/task_main_content.xml
@@ -7,6 +7,7 @@
     android:layout_height="wrap_content"
     android:layout_weight="1"
     android:layout_gravity="center_vertical"
+    android:foreground="?selectableItemBackground"
     android:paddingTop="@dimen/task_top_bottom_padding"
     android:paddingBottom="@dimen/task_top_bottom_padding"
     android:layout_marginEnd="@dimen/task_text_padding"
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index 0eabe1418..b132b9cda 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -28,6 +28,7 @@
                     android:layout_width="@dimen/button_width"
                     android:layout_height="match_parent"
                     tools:background="@color/red_10"
+                    android:foreground="?selectableItemBackground"
                     android:focusable="true"
                     android:contentDescription="@string/todo_item_checkbox">
                     <View
diff --git a/Habitica/res/layout/widget_dailies_list_row.xml b/Habitica/res/layout/widget_dailies_list_row.xml
index 0c8b69088..ed5907624 100644
--- a/Habitica/res/layout/widget_dailies_list_row.xml
+++ b/Habitica/res/layout/widget_dailies_list_row.xml
@@ -36,5 +36,5 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/selection_highlight_brand" />
+        android:background="?selectableItemBackground" />
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/widget_habit_button.xml b/Habitica/res/layout/widget_habit_button.xml
index 5aab64f3d..163f3ebcf 100644
--- a/Habitica/res/layout/widget_habit_button.xml
+++ b/Habitica/res/layout/widget_habit_button.xml
@@ -25,11 +25,11 @@
                 android:scaleType="center"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/selection_highlight_brand" />
+                android:background="?selectableItemBackground" />
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/selection_highlight_brand"
+                android:background="?selectableItemBackground"
                 android:textSize="24sp"
                 />
         </FrameLayout>
@@ -44,11 +44,11 @@
                 android:scaleType="center"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/selection_highlight_brand" />
+                android:background="?selectableItemBackground" />
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/selection_highlight_brand"
+                android:background="?selectableItemBackground"
                 android:textSize="24sp"
                 />
         </FrameLayout>
diff --git a/Habitica/res/layout/widget_todo_list_row.xml b/Habitica/res/layout/widget_todo_list_row.xml
index a6d5a961c..4f46072a5 100644
--- a/Habitica/res/layout/widget_todo_list_row.xml
+++ b/Habitica/res/layout/widget_todo_list_row.xml
@@ -37,5 +37,5 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/selection_highlight_brand" />
+        android:background="?selectableItemBackground" />
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index d68cf30e4..0ddb379dd 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -305,7 +305,7 @@
 
     <style name="RowWrapper">
         <item name="android:padding">@dimen/row_padding</item>
-        <item name="android:background">@drawable/selection_highlight</item>
+        <item name="android:background">?selectableItemBackground</item>
     </style>
 
     <style name="RowText">
@@ -430,20 +430,6 @@
         <item name="android:letterSpacing">0.15</item>
     </style>
 
-    <style name="BottomMenu">
-        <item name="android:divider">?android:listDivider</item>
-        <item name="android:showDividers">middle</item>
-        <item name="android:paddingBottom">@dimen/spacing_medium</item>
-    </style>
-    
-    <style name="BottomMenuItem">
-        <item name="android:paddingStart">@dimen/bottom_menu_padding</item>
-        <item name="android:paddingEnd">@dimen/bottom_menu_padding</item>
-        <item name="android:paddingTop">@dimen/spacing_large</item>
-        <item name="android:paddingBottom">@dimen/spacing_large</item>
-        <item name="android:background">@drawable/selection_highlight</item>
-    </style>
-
     <style name="BottomMenuItemText">
         <item name="android:textColor">@color/white</item>
         <item name="android:textSize">16sp</item>