diff --git a/OsmAnd/res/drawable/bg_coordinate_input_keyboard_dark.xml b/OsmAnd/res/drawable/bg_coordinate_input_keyboard_dark.xml
new file mode 100644
index 0000000000..71921e0b1c
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_coordinate_input_keyboard_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<nine-patch android:src="@drawable/bg_contextmenu_shadow_top_light" />
+	</item>
+	<item>
+		<shape>
+			<solid android:color="@color/ctx_menu_buttons_divider_dark" />
+		</shape>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 934e54d43c..c173a6bf44 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -280,17 +280,17 @@
 
 	<color name="keyboard_item_divider_control_color_light">#727272</color>
 	<color name="keyboard_item_divider_control_color_light_pressed">#ffffff</color>
-	<color name="keyboard_item_divider_control_color_dark">#8899a6</color>
+	<color name="keyboard_item_divider_control_color_dark">#727272</color>
 	<color name="keyboard_item_text_color_light">#333333</color>
 	<color name="keyboard_item_text_color_light_pressed">#ffffff</color>
-	<color name="keyboard_item_text_color_dark">#ffffff</color>
+	<color name="keyboard_item_text_color_dark">#cccccc</color>
 	<color name="keyboard_item_light_bg">#fff</color>
 	<color name="keyboard_item_light_bg_pressed">#536dfe</color>
-	<color name="keyboard_item_dark_bg">#1f2326</color>
+	<color name="keyboard_item_dark_bg">#17191a</color>
 	<color name="keyboard_item_dark_bg_pressed">#536dfe</color>
 	<color name="keyboard_item_control_light_bg">#f2f2f2</color>
 	<color name="keyboard_item_control_light_bg_pressed">#536dfe</color>
-	<color name="keyboard_item_control_dark_bg">#191c1e</color>
+	<color name="keyboard_item_control_dark_bg">#222526</color>
 	<color name="keyboard_item_control_dark_bg_pressed">#536dfe</color>
 	<color name="keyboard_item_add_button_light_bg">#536dfe</color>
 	<color name="keyboard_item_add_button_light_bg_pressed">#4b62e3</color>
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index 814364a89e..6c6f6b8afe 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -291,7 +291,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 			}
 		});
 
-		mainView.findViewById(R.id.keyboard_layout).setBackgroundResource(lightTheme ? R.drawable.bg_bottom_menu_light : R.drawable.bg_bottom_menu_dark);
+		mainView.findViewById(R.id.keyboard_layout).setBackgroundResource(lightTheme ? R.drawable.bg_bottom_menu_light : R.drawable.bg_coordinate_input_keyboard_dark);
 
 		Object[] keyboardItems = new Object[]{
 				"1", "2", "3", R.drawable.ic_keyboard_next_field,