diff --git a/app/src/main/res/layout/cpp_simple_button_history.xml b/app/src/main/res/layout/cpp_simple_button_history.xml
index 6b256cac..e6972f5a 100644
--- a/app/src/main/res/layout/cpp_simple_button_history.xml
+++ b/app/src/main/res/layout/cpp_simple_button_history.xml
@@ -21,9 +21,8 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<Button
+<ImageButton
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_history"
-    style="@style/CppKeyboardButton.Metro.Simple.Control"
-    a:text="@string/c_history_button"
-    a:textStyle="bold" />
\ No newline at end of file
+    style="@style/CppKeyboardButton.Metro.Simple.Control.Image"
+    a:src="@drawable/ic_history_white_48dp"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_simple_button_history_material.xml b/app/src/main/res/layout/cpp_simple_button_history_material.xml
index 86fd47ef..ed2fed4e 100644
--- a/app/src/main/res/layout/cpp_simple_button_history_material.xml
+++ b/app/src/main/res/layout/cpp_simple_button_history_material.xml
@@ -21,9 +21,8 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<Button
+<ImageButton
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_history"
-    style="@style/CppKeyboardButton.Material.Simple.Control"
-    a:text="@string/c_history_button"
-    a:textStyle="bold" />
\ No newline at end of file
+    style="@style/CppKeyboardButton.Material.Simple.Control.Image"
+    a:src="@drawable/ic_history_white_48dp"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_simple_button_history_material_light.xml b/app/src/main/res/layout/cpp_simple_button_history_material_light.xml
index 34ddea0c..9a6b9ca2 100644
--- a/app/src/main/res/layout/cpp_simple_button_history_material_light.xml
+++ b/app/src/main/res/layout/cpp_simple_button_history_material_light.xml
@@ -21,9 +21,8 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<Button
+<ImageButton
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_history"
-    style="@style/CppKeyboardButton.Material.Light.Simple.Control"
-    a:text="@string/c_history_button"
-    a:textStyle="bold" />
\ No newline at end of file
+    style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image"
+    a:src="@drawable/ic_history_white_48dp"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_simple_button_left.xml b/app/src/main/res/layout/cpp_simple_button_left.xml
index ad894744..3ee34402 100644
--- a/app/src/main/res/layout/cpp_simple_button_left.xml
+++ b/app/src/main/res/layout/cpp_simple_button_left.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button
+<ImageButton
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_left"
-    style="@style/CppKeyboardButton.Metro.Simple.Control"
-    a:text="◁" />
\ No newline at end of file
+    style="@style/CppKeyboardButton.Metro.Simple.Control.Image"
+    a:src="@drawable/ic_keyboard_arrow_left_white_48dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_simple_button_left_material.xml b/app/src/main/res/layout/cpp_simple_button_left_material.xml
index 4aa36ee7..1f3e265c 100644
--- a/app/src/main/res/layout/cpp_simple_button_left_material.xml
+++ b/app/src/main/res/layout/cpp_simple_button_left_material.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button
+<ImageButton
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_left"
-    style="@style/CppKeyboardButton.Material.Simple.Control"
-    a:text="◁" />
\ No newline at end of file
+    style="@style/CppKeyboardButton.Material.Simple.Control.Image"
+    a:src="@drawable/ic_keyboard_arrow_left_white_48dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_simple_button_left_material_light.xml b/app/src/main/res/layout/cpp_simple_button_left_material_light.xml
index 17e606a2..1f92980b 100644
--- a/app/src/main/res/layout/cpp_simple_button_left_material_light.xml
+++ b/app/src/main/res/layout/cpp_simple_button_left_material_light.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button
+<ImageButton
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_left"
-    style="@style/CppKeyboardButton.Material.Light.Simple.Control"
-    a:text="◁" />
\ No newline at end of file
+    style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image"
+    a:src="@drawable/ic_keyboard_arrow_left_white_48dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_simple_button_right.xml b/app/src/main/res/layout/cpp_simple_button_right.xml
index 694b7659..89a03b1a 100644
--- a/app/src/main/res/layout/cpp_simple_button_right.xml
+++ b/app/src/main/res/layout/cpp_simple_button_right.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button
+<ImageButton
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_right"
-    style="@style/CppKeyboardButton.Metro.Simple.Control"
-    a:text="▷" />
\ No newline at end of file
+    style="@style/CppKeyboardButton.Metro.Simple.Control.Image"
+    a:src="@drawable/ic_keyboard_arrow_right_white_48dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_simple_button_right_material.xml b/app/src/main/res/layout/cpp_simple_button_right_material.xml
index de05d4ce..55919bc1 100644
--- a/app/src/main/res/layout/cpp_simple_button_right_material.xml
+++ b/app/src/main/res/layout/cpp_simple_button_right_material.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button
+<ImageButton
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_right"
-    style="@style/CppKeyboardButton.Material.Simple.Control"
-    a:text="▷" />
\ No newline at end of file
+    style="@style/CppKeyboardButton.Material.Simple.Control.Image"
+    a:src="@drawable/ic_keyboard_arrow_right_white_48dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_simple_button_right_material_light.xml b/app/src/main/res/layout/cpp_simple_button_right_material_light.xml
index a306bc17..8001d63e 100644
--- a/app/src/main/res/layout/cpp_simple_button_right_material_light.xml
+++ b/app/src/main/res/layout/cpp_simple_button_right_material_light.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button
+<ImageButton
     xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@id/cpp_button_right"
-    style="@style/CppKeyboardButton.Material.Light.Simple.Control"
-    a:text="▷" />
\ No newline at end of file
+    style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image"
+    a:src="@drawable/ic_keyboard_arrow_right_white_48dp" />
\ No newline at end of file