diff --git a/OsmAnd/res/drawable/ic_keyboard_backspace.xml b/OsmAnd/res/drawable/ic_keyboard_backspace.xml
new file mode 100644
index 0000000000..1e64206e16
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_keyboard_backspace.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/ic_action_backspace_fill" android:state_pressed="true"/>
+	<item android:drawable="@drawable/ic_action_backspace_stroke"/>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/ic_keyboard_next_field.xml b/OsmAnd/res/drawable/ic_keyboard_next_field.xml
new file mode 100644
index 0000000000..1157ffc90f
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_keyboard_next_field.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/ic_action_next_field_fill" android:state_pressed="true"/>
+	<item android:drawable="@drawable/ic_action_next_field_stroke"/>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/input_coordinate_keyboard_backspace.xml b/OsmAnd/res/drawable/input_coordinate_keyboard_backspace.xml
deleted file mode 100644
index 7b57832bf4..0000000000
--- a/OsmAnd/res/drawable/input_coordinate_keyboard_backspace.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/ic_action_add_photos" android:state_pressed="true"/>
-	<item android:drawable="@drawable/ic_action_aircraft"/>
-</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/input_coordinate_keyboard_item.xml b/OsmAnd/res/layout-land/input_coordinate_keyboard_item.xml
index 1849a20cbf..af8ed59c6c 100644
--- a/OsmAnd/res/layout-land/input_coordinate_keyboard_item.xml
+++ b/OsmAnd/res/layout-land/input_coordinate_keyboard_item.xml
@@ -18,6 +18,7 @@
 		tools:text="3"/>
 
 	<ImageView
+		android:tint="?attr/keyboard_item_text_color"
 		android:id="@+id/keyboard_item_image"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
diff --git a/OsmAnd/res/layout/input_coordinate_keyboard_item.xml b/OsmAnd/res/layout/input_coordinate_keyboard_item.xml
index 5be00ffab8..264c73be5f 100644
--- a/OsmAnd/res/layout/input_coordinate_keyboard_item.xml
+++ b/OsmAnd/res/layout/input_coordinate_keyboard_item.xml
@@ -16,6 +16,7 @@
 		tools:text="3"/>
 
 	<ImageView
+		android:tint="?attr/keyboard_item_text_color"
 		android:id="@+id/keyboard_item_image"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index 9d00e8c91f..ebc70e20ea 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -250,8 +250,8 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 
 		Object[] keyboardItems = new Object[] { "1", "2", "3", getString(R.string.shared_string_clear),
 				"4", "5", "6", "-",
-				"7", "8", "9", "\u21e6",
-				".", "0", ":", R.drawable.input_coordinate_keyboard_backspace };
+				"7", "8", "9", R.drawable.ic_keyboard_backspace,
+				".", "0", ":", R.drawable.ic_keyboard_next_field};
 		final GridView keyboardGrid = (GridView) mainView.findViewById(R.id.keyboard_grid_view);
 		final KeyboardAdapter keyboardAdapter = new KeyboardAdapter(mapActivity, keyboardItems);
 		keyboardGrid.setAdapter(keyboardAdapter);