diff --git a/android-app-core/res/layout/cpp_simple_button_left.xml b/android-app-core/res/layout/cpp_simple_button_left.xml
index f043845f..322a9d1d 100644
--- a/android-app-core/res/layout/cpp_simple_button_left.xml
+++ b/android-app-core/res/layout/cpp_simple_button_left.xml
@@ -24,5 +24,5 @@
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
 		a:id="@id/cpp_button_left"
-		a:text="◀"
+		a:text="◁"
 		style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_right.xml b/android-app-core/res/layout/cpp_simple_button_right.xml
index 174adcae..24bc3b56 100644
--- a/android-app-core/res/layout/cpp_simple_button_right.xml
+++ b/android-app-core/res/layout/cpp_simple_button_right.xml
@@ -24,5 +24,5 @@
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
 		a:id="@id/cpp_button_right"
-		a:text="▶"
+		a:text="▷"
 		style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app/assets/fonts/Roboto-Regular.ttf b/android-app/assets/fonts/Roboto-Regular.ttf
index 7d9a6c4c..73b23abb 100644
Binary files a/android-app/assets/fonts/Roboto-Regular.ttf and b/android-app/assets/fonts/Roboto-Regular.ttf differ
diff --git a/android-app/res/layout/cpp_drag_button_left.xml b/android-app/res/layout/cpp_drag_button_left.xml
index bfc36433..dbf4f5a3 100644
--- a/android-app/res/layout/cpp_drag_button_left.xml
+++ b/android-app/res/layout/cpp_drag_button_left.xml
@@ -25,8 +25,8 @@
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													a:id="@id/cpp_button_left"
-													c:textUp="◀◀"
-													a:text="◀"
+													c:textUp="◁◁"
+													a:text="◁"
 													c:directionTextScale="0.5"
 													style="?cpp_control_button_style"
 													a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_drag_button_right.xml b/android-app/res/layout/cpp_drag_button_right.xml
index 5813e98f..17659d63 100644
--- a/android-app/res/layout/cpp_drag_button_right.xml
+++ b/android-app/res/layout/cpp_drag_button_right.xml
@@ -25,8 +25,8 @@
 <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													a:id="@id/cpp_button_right"
-													c:textUp="▶▶"
-													a:text="▶"
+													c:textUp="▷▷"
+													a:text="▷"
 													c:directionTextScale="0.5"
 													style="?cpp_control_button_style"
 													a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java b/android-app/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
index 65a3320b..a34fa768 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
@@ -23,15 +23,14 @@
 package org.solovyev.android.calculator;
 
 import android.view.MotionEvent;
-
-import javax.annotation.Nonnull;
-
 import org.solovyev.android.view.drag.DirectionDragButton;
 import org.solovyev.android.view.drag.DragButton;
 import org.solovyev.android.view.drag.DragDirection;
 import org.solovyev.android.view.drag.SimpleOnDragListener;
 import org.solovyev.common.math.Point2d;
 
+import javax.annotation.Nonnull;
+
 /**
  * User: serso
  * Date: 9/16/11
@@ -48,10 +47,10 @@ public class CursorDragProcessor implements SimpleOnDragListener.DragProcessor {
 
 		if (dragButton instanceof DirectionDragButton) {
 			String text = ((DirectionDragButton) dragButton).getText(dragDirection);
-			if ("◀◀".equals(text)) {
+			if ("◁◁".equals(text)) {
 				Locator.getInstance().getEditor().setCursorOnStart();
 				result = true;
-			} else if ("▶▶".equals(text)) {
+			} else if ("▷▷".equals(text)) {
 				Locator.getInstance().getEditor().setCursorOnEnd();
 				result = true;
 			}
diff --git a/core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
index f0a430a3..e9e5fb8a 100644
--- a/core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
+++ b/core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
@@ -47,13 +47,13 @@ public enum CalculatorSpecialButton {
 			Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_history_detached, null);
 		}
 	},
-	cursor_right("▶") {
+	cursor_right("▷") {
 		@Override
 		public void onClick(@Nonnull CalculatorKeyboard keyboard) {
 			keyboard.moveCursorRight();
 		}
 	},
-	cursor_left("◀") {
+	cursor_left("◁") {
 		@Override
 		public void onClick(@Nonnull CalculatorKeyboard keyboard) {
 			keyboard.moveCursorLeft();