diff --git a/android/res/drawable-v21/button_start.xml b/android/res/drawable-v21/button_start.xml
new file mode 100644
index 0000000000..cce279d055
--- /dev/null
+++ b/android/res/drawable-v21/button_start.xml
@@ -0,0 +1,29 @@
+
+
+ -
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
diff --git a/android/res/drawable-v21/button_start_night.xml b/android/res/drawable-v21/button_start_night.xml
new file mode 100644
index 0000000000..2e1feab4f7
--- /dev/null
+++ b/android/res/drawable-v21/button_start_night.xml
@@ -0,0 +1,29 @@
+
+
+ -
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
diff --git a/android/res/drawable/button_start.xml b/android/res/drawable/button_start.xml
index f7a53d581a..24ea19bbf6 100644
--- a/android/res/drawable/button_start.xml
+++ b/android/res/drawable/button_start.xml
@@ -1,10 +1,23 @@
-
+ -
+
+
+
+
+
-
+ -
+
+
+
+
+
-
-
\ No newline at end of file
+ -
+
+
+
+
+
+
diff --git a/android/res/drawable/button_start_disabled.xml b/android/res/drawable/button_start_disabled.xml
deleted file mode 100644
index 8e27ac5c6f..0000000000
--- a/android/res/drawable/button_start_disabled.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/android/res/drawable/button_start_disabled_night.xml b/android/res/drawable/button_start_disabled_night.xml
deleted file mode 100644
index 1d52157550..0000000000
--- a/android/res/drawable/button_start_disabled_night.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/android/res/drawable/button_start_night.xml b/android/res/drawable/button_start_night.xml
index 76f9b62e20..9db85b51b5 100644
--- a/android/res/drawable/button_start_night.xml
+++ b/android/res/drawable/button_start_night.xml
@@ -1,10 +1,23 @@
-
+ -
+
+
+
+
+
-
+ -
+
+
+
+
+
-
-
\ No newline at end of file
+ -
+
+
+
+
+
+
diff --git a/android/res/drawable/button_start_normal.xml b/android/res/drawable/button_start_normal.xml
deleted file mode 100644
index de67f2c6e7..0000000000
--- a/android/res/drawable/button_start_normal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/android/res/drawable/button_start_normal_night.xml b/android/res/drawable/button_start_normal_night.xml
deleted file mode 100644
index a1775564a6..0000000000
--- a/android/res/drawable/button_start_normal_night.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/android/res/drawable/button_start_pressed.xml b/android/res/drawable/button_start_pressed.xml
deleted file mode 100644
index 1668e16c51..0000000000
--- a/android/res/drawable/button_start_pressed.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/android/res/drawable/button_start_pressed_night.xml b/android/res/drawable/button_start_pressed_night.xml
deleted file mode 100644
index e26582b4ed..0000000000
--- a/android/res/drawable/button_start_pressed_night.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/android/res/layout/menu_route_plan_line.xml b/android/res/layout/menu_route_plan_line.xml
index dd96059228..e82e9e80d7 100644
--- a/android/res/layout/menu_route_plan_line.xml
+++ b/android/res/layout/menu_route_plan_line.xml
@@ -11,7 +11,13 @@
-
+
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 8421cef0f5..6e82474074 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -66,6 +66,7 @@
10dp
58dp
40dp
+ 20dp
48dp
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 834d6345b3..057f0a5c08 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -70,6 +70,8 @@