diff --git a/android-app/src/main/res/layout/history_fragment.xml b/android-app/src/main/res/layout/history_fragment.xml
index 3079b69d..e2f83f45 100644
--- a/android-app/src/main/res/layout/history_fragment.xml
+++ b/android-app/src/main/res/layout/history_fragment.xml
@@ -50,7 +50,8 @@
 			a:layout_gravity="bottom|right"
 			a:layout_margin="16dp"
 			a:src="@drawable/ic_delete_white_36dp"
-			fab:fab_colorNormal="#393939"
-			fab:fab_colorRipple="#40000000" />
+			fab:fab_colorNormal="@color/cpp_metro_button_background"
+			fab:fab_colorPressed="@color/cpp_metro_button_background"
+			fab:fab_colorRipple="?attr/colorControlHighlight" />
 	</FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_metro_blue.xml b/android-app/src/main/res/values/theme_metro_blue.xml
index 5cfe24c5..0f5d301b 100644
--- a/android-app/src/main/res/values/theme_metro_blue.xml
+++ b/android-app/src/main/res/values/theme_metro_blue.xml
@@ -49,8 +49,6 @@
 	</style>
 
 	<style name="cpp_metro_blue_theme" parent="cpp_gray_theme">
-		<item name="android:colorAccent">@color/cpp_metro_blue</item>
-
 		<item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
 		<item name="cpp_control_button_style">@style/metro_control_button_style</item>
 		<item name="cpp_control_image_button_style">@style/metro_control_image_button_style</item>
@@ -58,8 +56,6 @@
 	</style>
 
 	<style name="cpp_metro_blue_dialog_theme" parent="cpp_gray_dialog_theme">
-		<item name="android:colorAccent">@color/cpp_metro_blue</item>
-
 		<item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
 		<item name="cpp_control_button_style">@style/metro_control_button_style</item>
 		<item name="cpp_control_image_button_style">@style/metro_control_image_button_style</item>
diff --git a/android-app/src/main/res/values/theme_metro_green.xml b/android-app/src/main/res/values/theme_metro_green.xml
index b718842f..86479cbb 100644
--- a/android-app/src/main/res/values/theme_metro_green.xml
+++ b/android-app/src/main/res/values/theme_metro_green.xml
@@ -32,8 +32,6 @@
 	</style>
 
 	<style name="cpp_metro_green_theme" parent="cpp_metro_blue_theme">
-      <item name="android:colorAccent">@color/cpp_metro_green_color</item>
-
 		<item name="cpp_operation_button_style">@style/metro_green_operation_button_style</item>
 		<item name="cpp_fragment_list_view_item_style">@style/metro_green_fragment_list_view_item_style</item>
 	</style>
diff --git a/android-app/src/main/res/values/theme_metro_purple.xml b/android-app/src/main/res/values/theme_metro_purple.xml
index 735c9cc1..a84d13b1 100644
--- a/android-app/src/main/res/values/theme_metro_purple.xml
+++ b/android-app/src/main/res/values/theme_metro_purple.xml
@@ -33,8 +33,6 @@
 	</style>
 
 	<style name="cpp_metro_purple_theme" parent="cpp_metro_blue_theme">
-		<item name="android:colorAccent">@color/cpp_metro_purple_color</item>
-
 		<item name="cpp_operation_button_style">@style/metro_purple_operation_button_style</item>
 		<item name="cpp_fragment_list_view_item_style">@style/metro_purple_fragment_list_view_item_style</item>
 	</style>