diff --git a/app/src/main/res/drawable-v21/button_no_bg.xml b/app/src/main/res/drawable-v21/button_no_bg.xml
index 619bb60a..2f43878c 100644
--- a/app/src/main/res/drawable-v21/button_no_bg.xml
+++ b/app/src/main/res/drawable-v21/button_no_bg.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="?attr/colorControlHighlight">
-    <item>
-        <shape>
-            <solid a:color="?attr/cpp_editor_bg" />
-        </shape>
-    </item>
+    <item a:drawable="?attr/cpp_editor_bg"/>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/material_blue_button.xml b/app/src/main/res/drawable-v21/material_blue_button.xml
index 771214b2..6f41bfd6 100644
--- a/app/src/main/res/drawable-v21/material_blue_button.xml
+++ b/app/src/main/res/drawable-v21/material_blue_button.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/blue_900" />
-        </shape>
-    </item>
+    <item a:drawable="@color/blue_900"/>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/material_blue_button_lighter.xml b/app/src/main/res/drawable-v21/material_blue_button_lighter.xml
index f1589cf5..f3251db0 100644
--- a/app/src/main/res/drawable-v21/material_blue_button_lighter.xml
+++ b/app/src/main/res/drawable-v21/material_blue_button_lighter.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/blue_850" />
-        </shape>
-    </item>
+    <item a:drawable="@color/blue_850"/>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/material_button_black.xml b/app/src/main/res/drawable-v21/material_button_black.xml
index 360413b6..8e356adc 100644
--- a/app/src/main/res/drawable-v21/material_button_black.xml
+++ b/app/src/main/res/drawable-v21/material_button_black.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/grey_950" />
-        </shape>
-    </item>
+    <item a:drawable="@color/grey_950"/>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_button_black_lighter.xml b/app/src/main/res/drawable-v21/material_button_black_lighter.xml
index d7fc0204..00a5d097 100644
--- a/app/src/main/res/drawable-v21/material_button_black_lighter.xml
+++ b/app/src/main/res/drawable-v21/material_button_black_lighter.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/grey_900" />
-        </shape>
-    </item>
+    <item a:drawable="@color/grey_900"/>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_button_dark.xml b/app/src/main/res/drawable-v21/material_button_dark.xml
index d7fc0204..00a5d097 100644
--- a/app/src/main/res/drawable-v21/material_button_dark.xml
+++ b/app/src/main/res/drawable-v21/material_button_dark.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/grey_900" />
-        </shape>
-    </item>
+    <item a:drawable="@color/grey_900"/>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_button_dark_lighter.xml b/app/src/main/res/drawable-v21/material_button_dark_lighter.xml
index ae40f300..2c820789 100644
--- a/app/src/main/res/drawable-v21/material_button_dark_lighter.xml
+++ b/app/src/main/res/drawable-v21/material_button_dark_lighter.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/grey_850" />
-        </shape>
-    </item>
+    <item a:drawable="@color/grey_850"/>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_button_deep_blue.xml b/app/src/main/res/drawable-v21/material_button_deep_blue.xml
index 68efa4b2..9725d015 100644
--- a/app/src/main/res/drawable-v21/material_button_deep_blue.xml
+++ b/app/src/main/res/drawable-v21/material_button_deep_blue.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/deep_blue_900" />
-        </shape>
-    </item>
+    <item a:drawable="@color/deep_blue_900"/>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/material_button_deep_blue_lighter.xml b/app/src/main/res/drawable-v21/material_button_deep_blue_lighter.xml
index e4679c5b..d4702044 100644
--- a/app/src/main/res/drawable-v21/material_button_deep_blue_lighter.xml
+++ b/app/src/main/res/drawable-v21/material_button_deep_blue_lighter.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/deep_blue_850" />
-        </shape>
-    </item>
+    <item a:drawable="@color/deep_blue_850"/>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/material_button_light.xml b/app/src/main/res/drawable-v21/material_button_light.xml
index 7e7c4fae..f4941ddb 100644
--- a/app/src/main/res/drawable-v21/material_button_light.xml
+++ b/app/src/main/res/drawable-v21/material_button_light.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/grey_800" />
-        </shape>
-    </item>
+    <item a:drawable="@color/grey_800"/>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_button_light_darker.xml b/app/src/main/res/drawable-v21/material_button_light_darker.xml
index ae40f300..2c820789 100644
--- a/app/src/main/res/drawable-v21/material_button_light_darker.xml
+++ b/app/src/main/res/drawable-v21/material_button_light_darker.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/grey_850" />
-        </shape>
-    </item>
+    <item a:drawable="@color/grey_850"/>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_button_light_primary.xml b/app/src/main/res/drawable-v21/material_button_light_primary.xml
index 7521016d..0d2ff8c4 100644
--- a/app/src/main/res/drawable-v21/material_button_light_primary.xml
+++ b/app/src/main/res/drawable-v21/material_button_light_primary.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/teal_400" />
-        </shape>
-    </item>
+    <item a:drawable="@color/teal_400"/>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/material_button_light_primary_darker.xml b/app/src/main/res/drawable-v21/material_button_light_primary_darker.xml
index 204fb0e0..a9831441 100644
--- a/app/src/main/res/drawable-v21/material_button_light_primary_darker.xml
+++ b/app/src/main/res/drawable-v21/material_button_light_primary_darker.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/teal_500" />
-        </shape>
-    </item>
+    <item a:drawable="@color/teal_500"/>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/widget_button_no_bg.xml b/app/src/main/res/drawable-v21/widget_button_no_bg.xml
index 196ff9d7..25fea48a 100644
--- a/app/src/main/res/drawable-v21/widget_button_no_bg.xml
+++ b/app/src/main/res/drawable-v21/widget_button_no_bg.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_dark">
-    <item>
-        <shape>
-            <solid a:color="@color/cpp_editor_bg" />
-        </shape>
-    </item>
+    <item a:drawable="@color/cpp_editor_bg"/>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/widget_button_no_bg_light.xml b/app/src/main/res/drawable-v21/widget_button_no_bg_light.xml
index bb31c32c..75158fa4 100644
--- a/app/src/main/res/drawable-v21/widget_button_no_bg_light.xml
+++ b/app/src/main/res/drawable-v21/widget_button_no_bg_light.xml
@@ -24,9 +24,5 @@
 
 <ripple xmlns:a="http://schemas.android.com/apk/res/android"
     a:color="@color/cpp_ripple_material_light">
-    <item>
-        <shape>
-            <solid a:color="@color/cpp_bg_light" />
-        </shape>
-    </item>
+    <item a:drawable="@color/cpp_bg_light"/>
 </ripple>