diff --git a/OsmAnd/res/drawable/keyboard_item_dark_bg.xml b/OsmAnd/res/drawable/keyboard_item_dark_bg.xml
new file mode 100644
index 0000000000..b4a642e69e
--- /dev/null
+++ b/OsmAnd/res/drawable/keyboard_item_dark_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="@color/map_widget_blue" android:state_pressed="true"/>
+    <item android:color="@color/bg_color_dark"/>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/keyboard_item_light_bg.xml b/OsmAnd/res/drawable/keyboard_item_light_bg.xml
new file mode 100644
index 0000000000..6c0b9d69b2
--- /dev/null
+++ b/OsmAnd/res/drawable/keyboard_item_light_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/map_widget_blue" android:state_pressed="true"/>
+    <item android:drawable="@color/bg_color_light"/>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/input_coordinate_keyboard_item.xml b/OsmAnd/res/layout/input_coordinate_keyboard_item.xml
index 67497a6c0f..6c467df338 100644
--- a/OsmAnd/res/layout/input_coordinate_keyboard_item.xml
+++ b/OsmAnd/res/layout/input_coordinate_keyboard_item.xml
@@ -4,7 +4,6 @@
               xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="56dp"
-              android:background="?attr/bg_color"
               android:orientation="vertical">
 
     <net.osmand.plus.widgets.TextViewEx
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index 1c9c990f18..630c34b234 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -249,13 +249,14 @@ public class CoordinateInputDialogFragment extends DialogFragment {
 			if (convertView == null) {
 				convertView = LayoutInflater.from(getContext()).inflate(R.layout.input_coordinate_keyboard_item, parent, false);
 			}
+			convertView.setBackgroundResource(lightTheme ? R.drawable.keyboard_item_light_bg : R.drawable.keyboard_item_dark_bg);
 
 			TextViewEx keyboardItem = (TextViewEx) convertView.findViewById(R.id.keyboard_item);
-			if (position == DELETE_BUTTON_POSITION || position == CLEAR_BUTTON_POSITION) {
-				keyboardItem.setTextSize(getResources().getDimension(R.dimen.default_list_text_size));
-			} else {
-				keyboardItem.setTextSize(getResources().getDimension(R.dimen.map_button_text_size));
-			}
+//			if (position == DELETE_BUTTON_POSITION || position == CLEAR_BUTTON_POSITION) {
+//				keyboardItem.setTextSize(getResources().getDimension(R.dimen.default_list_text_size));
+//			} else {
+//				keyboardItem.setTextSize(getResources().getDimension(R.dimen.map_button_text_size));
+//			}
 
 			keyboardItem.setText(getItem(position));