diff --git a/app/src/main/assets/fonts/Roboto-Regular.ttf b/app/src/main/assets/fonts/Roboto-Regular.ttf
index cae96938..301c81cc 100644
Binary files a/app/src/main/assets/fonts/Roboto-Regular.ttf and b/app/src/main/assets/fonts/Roboto-Regular.ttf differ
diff --git a/app/src/main/java/org/solovyev/android/calculator/buttons/CppSpecialButton.java b/app/src/main/java/org/solovyev/android/calculator/buttons/CppSpecialButton.java
index ca43934a..cf8e3e99 100644
--- a/app/src/main/java/org/solovyev/android/calculator/buttons/CppSpecialButton.java
+++ b/app/src/main/java/org/solovyev/android/calculator/buttons/CppSpecialButton.java
@@ -36,9 +36,9 @@ public enum CppSpecialButton {
     history_undo("↶", '\ue007'),
     history_redo("↷", '\ue008'),
     cursor_right("▷", '\ue003'),
-    cursor_to_end(">>"),
+    cursor_to_end(">>", '\ue00b'),
     cursor_left("◁", '\ue002'),
-    cursor_to_start("<<"),
+    cursor_to_start("<<", '\ue00a'),
     settings("settings"),
     settings_widget("settings_widget"),
     like("like", '\ue006'),
@@ -116,7 +116,7 @@ public enum CppSpecialButton {
             return;
         }
         for (CppSpecialButton button : values()) {
-            if(button.glyph == 0) {
+            if (button.glyph == 0) {
                 continue;
             }
             final int position = glyphToPosition(button.glyph);
diff --git a/app/src/main/res/layout/cpp_app_button_left.xml b/app/src/main/res/layout/cpp_app_button_left.xml
index e0565d79..21447121 100644
--- a/app/src/main/res/layout/cpp_app_button_left.xml
+++ b/app/src/main/res/layout/cpp_app_button_left.xml
@@ -28,6 +28,6 @@
     xmlns:c="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     a:text="@string/cpp_glyph_left"
-    c:directionTextUp="&lt;&lt;"
+    c:directionTextUp="@string/cpp_glyph_fast_back"
     c:directionTextDown="@string/cpp_glyph_copy"
     tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_app_button_right.xml b/app/src/main/res/layout/cpp_app_button_right.xml
index 36d755b0..6ddeff76 100644
--- a/app/src/main/res/layout/cpp_app_button_right.xml
+++ b/app/src/main/res/layout/cpp_app_button_right.xml
@@ -28,6 +28,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:text="@string/cpp_glyph_right"
-    app:directionTextUp="&gt;&gt;"
+    app:directionTextUp="@string/cpp_glyph_fast_forward"
     app:directionTextDown="@string/cpp_glyph_paste"
     tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_glyphs.xml b/app/src/main/res/values/strings_glyphs.xml
index 93c71380..2e695f62 100644
--- a/app/src/main/res/values/strings_glyphs.xml
+++ b/app/src/main/res/values/strings_glyphs.xml
@@ -10,4 +10,6 @@
     <string name="cpp_glyph_undo" translatable="false">"\ue007"</string>
     <string name="cpp_glyph_redo" translatable="false">"\ue008"</string>
     <string name="cpp_glyph_graph" translatable="false">"\ue009"</string>
+    <string name="cpp_glyph_fast_back" translatable="false">"\ue00a"</string>
+    <string name="cpp_glyph_fast_forward" translatable="false">"\ue00b"</string>
 </resources>
\ No newline at end of file