diff --git a/app/src/main/res/layout/cpp_app_button_clear.xml b/app/src/main/res/layout/cpp_app_button_clear.xml
index 179b4f44..6f81a659 100644
--- a/app/src/main/res/layout/cpp_app_button_clear.xml
+++ b/app/src/main/res/layout/cpp_app_button_clear.xml
@@ -24,7 +24,7 @@
 
 <org.solovyev.android.views.dragbutton.DirectionDragButton
     a:id="@id/cpp_button_clear"
-    style="?attr/cpp_button_style_control_image"
+    style="?attr/cpp_button_style_control"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:background="@color/grey_850"
diff --git a/app/src/main/res/layout/cpp_app_button_copy.xml b/app/src/main/res/layout/cpp_app_button_copy.xml
index c428c99a..7651e0ec 100644
--- a/app/src/main/res/layout/cpp_app_button_copy.xml
+++ b/app/src/main/res/layout/cpp_app_button_copy.xml
@@ -24,7 +24,7 @@
 
 <org.solovyev.android.calculator.view.NumeralBasesButton
     android:id="@id/cpp_button_copy"
-    style="?attr/cpp_button_style_control_image"
+    style="?attr/cpp_button_style_control"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:src="@drawable/ic_content_copy_white_48dp"
diff --git a/app/src/main/res/layout/cpp_app_button_donate.xml b/app/src/main/res/layout/cpp_app_button_donate.xml
index ad6764f7..a0374533 100644
--- a/app/src/main/res/layout/cpp_app_button_donate.xml
+++ b/app/src/main/res/layout/cpp_app_button_donate.xml
@@ -25,5 +25,5 @@
 <ImageButton
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_like"
-    style="?attr/cpp_button_style_control_image"
+    style="?attr/cpp_button_style_control"
     a:src="@drawable/ic_share_white_48dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_app_button_erase.xml b/app/src/main/res/layout/cpp_app_button_erase.xml
index b3ed7b80..a6623598 100644
--- a/app/src/main/res/layout/cpp_app_button_erase.xml
+++ b/app/src/main/res/layout/cpp_app_button_erase.xml
@@ -26,5 +26,5 @@
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_erase"
     a:background="@color/cpp_material_light_darker"
-    style="?attr/cpp_button_style_control_image"
+    style="?attr/cpp_button_style_control"
     a:src="@drawable/ic_backspace_white_48dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_app_button_paste.xml b/app/src/main/res/layout/cpp_app_button_paste.xml
index ab4e4e1b..7e13d9a9 100644
--- a/app/src/main/res/layout/cpp_app_button_paste.xml
+++ b/app/src/main/res/layout/cpp_app_button_paste.xml
@@ -24,7 +24,7 @@
 
 <org.solovyev.android.calculator.view.AngleUnitsButton
     android:id="@id/cpp_button_paste"
-    style="?attr/cpp_button_style_control_image"
+    style="?attr/cpp_button_style_control"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     app:directionTextScale="@dimen/cpp_direction_text_scale_units"
diff --git a/app/src/main/res/values/attributes.xml b/app/src/main/res/values/attributes.xml
index c85fefb3..99bffa91 100644
--- a/app/src/main/res/values/attributes.xml
+++ b/app/src/main/res/values/attributes.xml
@@ -24,7 +24,6 @@
 
     <attr name="cpp_button_style_digit" format="reference" />
     <attr name="cpp_button_style_control" format="reference" />
-    <attr name="cpp_button_style_control_image" format="reference" />
     <attr name="cpp_button_style_operation" format="reference" />
     <attr name="cpp_main_bg" format="reference" />
     <attr name="cpp_pane_bg" format="reference" />
diff --git a/app/src/main/res/values/theme_material.xml b/app/src/main/res/values/theme_material.xml
index 28fbf239..a2ec39c8 100644
--- a/app/src/main/res/values/theme_material.xml
+++ b/app/src/main/res/values/theme_material.xml
@@ -32,8 +32,6 @@
         <item name="android:background">@drawable/material_blue_button</item>
     </style>
 
-    <style name="CppKeyboardButton.Material.Control.Image" parent="CppKeyboardButton.Material.Digit"/>
-
     <style name="CppHeaderButton.Material" parent="CppKeyboardButton.Material.Control">
         <item name="android:layout_width">30dp</item>
         <item name="android:layout_height">30dp</item>
@@ -50,7 +48,7 @@
         <item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
     </style>
 
-    <style name="CppKeyboardButton.Material.Simple.Control.Image" parent="CppKeyboardButton.Material.Control.Image">
+    <style name="CppKeyboardButton.Material.Simple.Control.Image" parent="CppKeyboardButton.Material.Control">
         <item name="android:padding">@dimen/cpp_keyboard_simple_image_button_padding</item>
     </style>
 
@@ -61,21 +59,18 @@
     <style name="Cpp.Theme.Material" parent="Cpp.Theme">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
     </style>
 
     <style name="Cpp.Theme.Material.Dialog" parent="Cpp.Theme.Dialog">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
     </style>
 
     <style name="Cpp.Theme.Material.Dialog.Alert" parent="Cpp.Theme.Dialog.Alert">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
     </style>
 
diff --git a/app/src/main/res/values/theme_material_light.xml b/app/src/main/res/values/theme_material_light.xml
index 6a4dd8f7..3eae45b3 100644
--- a/app/src/main/res/values/theme_material_light.xml
+++ b/app/src/main/res/values/theme_material_light.xml
@@ -31,8 +31,6 @@
         <item name="directionTextAlpha">0.7</item>
     </style>
 
-    <style name="CppKeyboardButton.Material.Light.Control.Image" parent="CppKeyboardButton.Material.Light.Digit"/>
-
     <style name="CppKeyboardButton.Material.Light.Control" parent="CppKeyboardButton.Material.Light.Digit" />
 
     <style name="CppHeaderButton.Material.Light" parent="CppKeyboardButton.Material.Light.Control">
@@ -51,7 +49,7 @@
         <item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
     </style>
 
-    <style name="CppKeyboardButton.Material.Light.Simple.Control.Image" parent="CppKeyboardButton.Material.Light.Control.Image">
+    <style name="CppKeyboardButton.Material.Light.Simple.Control.Image" parent="CppKeyboardButton.Material.Light.Control">
         <item name="android:padding">@dimen/cpp_keyboard_simple_image_button_padding</item>
     </style>
 
@@ -62,14 +60,12 @@
     <style name="Cpp.Theme.Material.Light" parent="Cpp.Theme.Light">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Light.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation</item>
     </style>
 
     <style name="Cpp.Theme.Material.Light.Dialog" parent="Cpp.Theme.Light.Dialog">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Light.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation
         </item>
     </style>
@@ -77,7 +73,6 @@
     <style name="Cpp.Theme.Material.Light.Dialog.Alert" parent="Cpp.Theme.Light.Dialog.Alert">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Light.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation
         </item>
     </style>
diff --git a/app/src/main/res/values/theme_metro_blue.xml b/app/src/main/res/values/theme_metro_blue.xml
index 41a07536..92c1a488 100644
--- a/app/src/main/res/values/theme_metro_blue.xml
+++ b/app/src/main/res/values/theme_metro_blue.xml
@@ -43,8 +43,6 @@
         <item name="android:background">@drawable/metro_blue_button</item>
     </style>
 
-    <style name="CppKeyboardButton.Metro.Blue.Control.Image" parent="CppKeyboardButton.Metro.Blue.Control"/>
-
     <style name="CppKeyboardButton.Metro.Simple.Digit" parent="CppKeyboardButton.Metro.Blue.Digit">
         <item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
         <item name="android:background">@drawable/metro_widget_button_dark</item>
@@ -60,7 +58,7 @@
         <item name="android:background">@drawable/metro_widget_button</item>
     </style>
 
-    <style name="CppKeyboardButton.Metro.Simple.Control.Image" parent="CppKeyboardButton.Metro.Blue.Control.Image">
+    <style name="CppKeyboardButton.Metro.Simple.Control.Image" parent="CppKeyboardButton.Metro.Blue.Control">
         <item name="android:background">@drawable/metro_widget_button_light</item>
         <item name="android:padding">@dimen/cpp_keyboard_simple_image_button_padding</item>
     </style>
@@ -68,7 +66,6 @@
     <style name="Cpp.Theme.Metro.Blue" parent="Cpp.Theme">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Metro.Blue.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Metro.Blue.Control</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Metro.Blue.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Metro.Blue.Operation</item>
     </style>
 
diff --git a/app/src/main/res/values/theme_old_blue.xml b/app/src/main/res/values/theme_old_blue.xml
index 4e300c62..15ae81c3 100644
--- a/app/src/main/res/values/theme_old_blue.xml
+++ b/app/src/main/res/values/theme_old_blue.xml
@@ -34,12 +34,9 @@
         <item name="android:textColor">@color/cpp_button_text_operator</item>
     </style>
 
-    <style name="CppKeyboardButton.Blue.Control.Image" parent="CppKeyboardButton.Blue.Control"/>
-
     <style name="Cpp.Theme.Blue" parent="Cpp.Theme">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Blue.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Blue.Control</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Blue.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Blue.Operation</item>
     </style>
 
diff --git a/app/src/main/res/values/theme_old_gray.xml b/app/src/main/res/values/theme_old_gray.xml
index b26b9a6f..c1b0a3a8 100644
--- a/app/src/main/res/values/theme_old_gray.xml
+++ b/app/src/main/res/values/theme_old_gray.xml
@@ -34,19 +34,15 @@
         <item name="android:textColor">@color/cpp_button_text_operator</item>
     </style>
 
-    <style name="CppKeyboardButton.Gray.Control.Image" parent="CppKeyboardButton.Gray.Control"/>
-
     <style name="Cpp.Theme.Gray" parent="Cpp.Theme">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Gray.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Gray.Control</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Gray.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Gray.Operation</item>
     </style>
 
     <style name="Cpp.Theme.Dialog.Gray" parent="Cpp.Theme.Dialog">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Gray.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Gray.Control</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Gray.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Gray.Operation</item>
     </style>
 
diff --git a/app/src/main/res/values/theme_old_violet.xml b/app/src/main/res/values/theme_old_violet.xml
index 2c185bb1..bcc0a042 100644
--- a/app/src/main/res/values/theme_old_violet.xml
+++ b/app/src/main/res/values/theme_old_violet.xml
@@ -34,12 +34,9 @@
         <item name="android:background">@drawable/violet_button_dark</item>
     </style>
 
-    <style name="CppKeyboardButton.Violet.Control.Image" parent="CppKeyboardButton.Violet.Control"/>
-
     <style name="Cpp.Theme.Violet" parent="Cpp.Theme">
         <item name="cpp_button_style_digit">@style/CppKeyboardButton.Violet.Digit</item>
         <item name="cpp_button_style_control">@style/CppKeyboardButton.Violet.Control</item>
-        <item name="cpp_button_style_control_image">@style/CppKeyboardButton.Violet.Control.Image</item>
         <item name="cpp_button_style_operation">@style/CppKeyboardButton.Violet.Operation</item>
     </style>
 </resources>
\ No newline at end of file