diff --git a/android-app/src/main/res/drawable-v21/metro_blue_button.xml b/android-app/src/main/res/drawable-v21/metro_blue_button.xml
new file mode 100644
index 00000000..b5813a69
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/metro_blue_button.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ripple xmlns:a="http://schemas.android.com/apk/res/android"
+	a:color="?attr/colorControlHighlight">
+	<item a:drawable="@drawable/metro_blue_button_shape" />
+</ripple>
diff --git a/android-app/src/main/res/drawable-v21/metro_button_dark.xml b/android-app/src/main/res/drawable-v21/metro_button_dark.xml
new file mode 100644
index 00000000..77abe94b
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/metro_button_dark.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ripple xmlns:a="http://schemas.android.com/apk/res/android"
+	a:color="?attr/colorControlHighlight">
+	<item a:drawable="@drawable/metro_button_dark_shape" />
+</ripple>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable-v21/metro_button_green.xml b/android-app/src/main/res/drawable-v21/metro_button_green.xml
new file mode 100644
index 00000000..bfa30618
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/metro_button_green.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ripple xmlns:a="http://schemas.android.com/apk/res/android"
+	a:color="?attr/colorControlHighlight">
+	<item a:drawable="@drawable/metro_button_green_shape" />
+
+</ripple>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable-v21/metro_button_light.xml b/android-app/src/main/res/drawable-v21/metro_button_light.xml
new file mode 100644
index 00000000..5619f6ea
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/metro_button_light.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ripple xmlns:a="http://schemas.android.com/apk/res/android"
+	a:color="?attr/colorControlHighlight">
+	<item a:drawable="@drawable/metro_button_light_shape" />
+</ripple>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable-v21/metro_button_purple.xml b/android-app/src/main/res/drawable-v21/metro_button_purple.xml
new file mode 100644
index 00000000..74f7b440
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/metro_button_purple.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ripple xmlns:a="http://schemas.android.com/apk/res/android"
+	a:color="?attr/colorControlHighlight">
+	<item a:drawable="@drawable/metro_button_purple_shape" />
+</ripple>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable-v21/metro_widget_button.xml b/android-app/src/main/res/drawable-v21/metro_widget_button.xml
new file mode 100644
index 00000000..e6e03f07
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/metro_widget_button.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ripple xmlns:a="http://schemas.android.com/apk/res/android"
+	a:color="@color/cpp_widget_ripple">
+	<item a:drawable="@drawable/metro_blue_button_shape" />
+</ripple>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable-v21/metro_widget_button_dark.xml b/android-app/src/main/res/drawable-v21/metro_widget_button_dark.xml
new file mode 100644
index 00000000..acecb624
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/metro_widget_button_dark.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ripple xmlns:a="http://schemas.android.com/apk/res/android"
+	a:color="@color/cpp_widget_ripple">
+	<item a:drawable="@drawable/metro_button_dark_shape" />
+</ripple>
diff --git a/android-app/src/main/res/drawable-v21/metro_widget_button_light.xml b/android-app/src/main/res/drawable-v21/metro_widget_button_light.xml
new file mode 100644
index 00000000..09406149
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/metro_widget_button_light.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ripple xmlns:a="http://schemas.android.com/apk/res/android"
+	a:color="@color/cpp_widget_ripple">
+	<item a:drawable="@drawable/metro_button_light_shape" />
+</ripple>
diff --git a/android-app/src/main/res/drawable/metro_blue_button_shape.xml b/android-app/src/main/res/drawable/metro_blue_button_shape.xml
index d888ae92..5e2a4a99 100644
--- a/android-app/src/main/res/drawable/metro_blue_button_shape.xml
+++ b/android-app/src/main/res/drawable/metro_blue_button_shape.xml
@@ -21,6 +21,6 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/cpp_metro_blue_color"/>
+	<solid android:color="@color/cpp_metro_blue"/>
 	<corners android:radius="1dp"/>
 </shape>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_button_pressed.xml b/android-app/src/main/res/drawable/metro_button_pressed.xml
index 72931a8f..c2951a77 100644
--- a/android-app/src/main/res/drawable/metro_button_pressed.xml
+++ b/android-app/src/main/res/drawable/metro_button_pressed.xml
@@ -21,6 +21,6 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="#C9C9C9"/>
+	<solid android:color="#ff4d4d4d"/>
 	<corners android:radius="1dp"/>
 </shape>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_widget_button.xml b/android-app/src/main/res/drawable/metro_widget_button.xml
new file mode 100644
index 00000000..0101d679
--- /dev/null
+++ b/android-app/src/main/res/drawable/metro_widget_button.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<selector xmlns:a="http://schemas.android.com/apk/res/android">
+
+	<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed"/>
+
+	<item a:drawable="@drawable/metro_blue_button_shape"/>
+
+</selector>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_widget_button_dark.xml b/android-app/src/main/res/drawable/metro_widget_button_dark.xml
new file mode 100644
index 00000000..cbaae7b8
--- /dev/null
+++ b/android-app/src/main/res/drawable/metro_widget_button_dark.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<selector xmlns:a="http://schemas.android.com/apk/res/android">
+
+	<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed"/>
+
+	<item a:drawable="@drawable/metro_button_dark_shape"/>
+</selector>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_widget_button_light.xml b/android-app/src/main/res/drawable/metro_widget_button_light.xml
new file mode 100644
index 00000000..a4c0a22c
--- /dev/null
+++ b/android-app/src/main/res/drawable/metro_widget_button_light.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<selector xmlns:a="http://schemas.android.com/apk/res/android">
+
+	<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed"/>
+
+	<item a:drawable="@drawable/metro_button_light_shape"/>
+</selector>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_dot.xml b/android-app/src/main/res/layout/cpp_simple_button_dot.xml
index e933cd52..09abf5e5 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_dot.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_dot.xml
@@ -25,4 +25,4 @@
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
 		a:id="@id/cpp_button_period"
 		a:text="."
-		style="@style/metro_digit_button_style"/>
\ No newline at end of file
+		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/colors.xml b/android-app/src/main/res/values/colors.xml
index 61f1e3e4..04b048dc 100644
--- a/android-app/src/main/res/values/colors.xml
+++ b/android-app/src/main/res/values/colors.xml
@@ -32,11 +32,13 @@
 	<color name="cpp_main_bg">#ff000000</color>
 	<color name="cpp_pane_background">#ff1f1f1f</color>
 	<color name="cpp_metro_button_background">#ff1f1f1f</color>
-	<color name="cpp_metro_blue_color">#10648c</color>
+	<color name="cpp_metro_blue">#10648c</color>
+	<color name="cpp_metro_blue_dark">#ff092c39</color>
 	<color name="cpp_metro_green_color">#088e3a</color>
 	<color name="cpp_metro_purple_color">#651456</color>
 	<color name="cpp_metro_light_button_background">#393939</color>
     <color name="cpp_widget_cursor_color">#ff707070</color>
     <color name="cpp_text_primary">#ddffffff</color>
     <color name="cpp_text_secondary">#89ffffff</color>
+    <color name="cpp_widget_ripple">#40ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/styles.xml b/android-app/src/main/res/values/styles.xml
index 4a46c993..f9720b94 100644
--- a/android-app/src/main/res/values/styles.xml
+++ b/android-app/src/main/res/values/styles.xml
@@ -109,17 +109,21 @@
 
 	<style name="cpp_simple_metro_digit_button_style" parent="metro_digit_button_style">
 		<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
+		<item name="android:background">@drawable/metro_widget_button_dark</item>
 	</style>
 
 	<style name="cpp_simple_metro_control_button_style" parent="metro_control_button_style">
 		<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
+		<item name="android:background">@drawable/metro_widget_button_light</item>
 	</style>
 
 	<style name="cpp_simple_metro_blue_operation_button_style" parent="metro_blue_operation_button_style">
 		<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
+		<item name="android:background">@drawable/metro_widget_button</item>
 	</style>
 
 	<style name="cpp_simple_metro_control_image_button_style" parent="metro_control_image_button_style">
+		<item name="android:background">@drawable/metro_widget_button_light</item>
 	</style>
 
 	<style name="cpp_widget_main_layout_style" parent="cpp_default_main_layout_style">
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 ca0536ac..5cfe24c5 100644
--- a/android-app/src/main/res/values/theme_metro_blue.xml
+++ b/android-app/src/main/res/values/theme_metro_blue.xml
@@ -36,6 +36,7 @@
 		<item name="android:layout_weight">0</item>
 		<item name="android:padding">0dp</item>
 		<item name="android:textSize">@dimen/cpp_onscreen_header_button_text_size</item>
+		<item name="android:background">@drawable/metro_widget_button_light</item>
 	</style>
 
 
@@ -48,7 +49,7 @@
 	</style>
 
 	<style name="cpp_metro_blue_theme" parent="cpp_gray_theme">
-		<item name="android:colorAccent">@color/cpp_metro_blue_color</item>
+		<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>
@@ -57,7 +58,7 @@
 	</style>
 
 	<style name="cpp_metro_blue_dialog_theme" parent="cpp_gray_dialog_theme">
-		<item name="android:colorAccent">@color/cpp_metro_blue_color</item>
+		<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>