diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapDataObject.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapDataObject.java
index 4a3c465699..8966256ea5 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapDataObject.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapDataObject.java
@@ -109,7 +109,7 @@ public class BinaryMapDataObject {
 	}
 	
 	public boolean containsAdditionalType(int cachedType) {
-		if (cachedType != -1) {
+		if (cachedType != -1 && additionalTypes != null) {
 			for (int i = 0; i < additionalTypes.length; i++) {
 				if (additionalTypes[i] == cachedType) {
 					return true;
diff --git a/OsmAnd-telegram/build.gradle b/OsmAnd-telegram/build.gradle
index 78df6e3f08..64c9f23668 100644
--- a/OsmAnd-telegram/build.gradle
+++ b/OsmAnd-telegram/build.gradle
@@ -145,11 +145,11 @@ dependencies {
 	implementation 'androidx.appcompat:appcompat:1.0.0'
 	implementation 'com.google.android.material:material:1.0.0'
 	implementation 'androidx.browser:browser:1.0.0'
-	implementation 'androidx.annotation:annotation:1.0.0'
+	implementation 'androidx.annotation:annotation:1.1.0'
 	implementation 'commons-logging:commons-logging-api:1.1'
-	implementation 'androidx.recyclerview:recyclerview:1.0.0'
+	implementation 'androidx.recyclerview:recyclerview:1.1.0'
 	implementation 'com.vividsolutions:jts-core:1.14.0'
-	implementation("com.github.HITGIF:TextFieldBoxes:1.4.4") {
+	implementation("com.github.HITGIF:TextFieldBoxes:1.4.5") {
 		exclude group: 'com.android.support'
 	}
 	implementation 'org.jetbrains:annotations-java5:15.0'
diff --git a/OsmAnd/res/drawable-xxxhdpi/img_empty_state_terrain.webp b/OsmAnd/res/drawable-xxxhdpi/img_empty_state_terrain.webp
new file mode 100644
index 0000000000..860d358e33
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/img_empty_state_terrain.webp differ
diff --git a/OsmAnd/res/drawable/img_settings_customize_configure_map_day.xml b/OsmAnd/res/drawable/img_settings_customize_configure_map_day.xml
new file mode 100644
index 0000000000..d784c2cf8a
--- /dev/null
+++ b/OsmAnd/res/drawable/img_settings_customize_configure_map_day.xml
@@ -0,0 +1,21 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#EEE7E6" android:pathData="M16,39h216v83h-216z"/>
+    <path android:fillColor="#ffffff" android:pathData="M16,124h216v76h-216z"/>
+    <path android:fillColor="#E2DBDB" android:pathData="M16,124l216,-0l0,-2l-216,-0z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M34,154C39.523,154 44,149.523 44,144C44,138.477 39.523,134 34,134C28.477,134 24,138.477 24,144C24,149.523 28.477,154 34,154Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M58,139C58,137.343 59.343,136 61,136H139C140.657,136 142,137.343 142,139C142,140.657 140.657,142 139,142H61C59.343,142 58,140.657 58,139Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M58,182C58,180.343 59.343,179 61,179H139C140.657,179 142,180.343 142,182C142,183.657 140.657,185 139,185H61C59.343,185 58,183.657 58,182Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M58,149.5C58,148.672 58.672,148 59.5,148H104.5C105.328,148 106,148.672 106,149.5C106,150.328 105.328,151 104.5,151H59.5C58.672,151 58,150.328 58,149.5Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M58,192.5C58,191.672 58.672,191 59.5,191H104.5C105.328,191 106,191.672 106,192.5C106,193.328 105.328,194 104.5,194H59.5C58.672,194 58,193.328 58,192.5Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M34,197C39.523,197 44,192.523 44,187C44,181.477 39.523,177 34,177C28.477,177 24,181.477 24,187C24,192.523 28.477,197 34,197Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M194,143C194,140.239 196.239,138 199,138H215C217.761,138 220,140.239 220,143C220,145.761 217.761,148 215,148H199C196.239,148 194,145.761 194,143Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M194,186C194,183.239 196.239,181 199,181H215C217.761,181 220,183.239 220,186C220,188.761 217.761,191 215,191H199C196.239,191 194,188.761 194,186Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M213,150C216.866,150 220,146.866 220,143C220,139.134 216.866,136 213,136C209.134,136 206,139.134 206,143C206,146.866 209.134,150 213,150Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M213,193C216.866,193 220,189.866 220,186C220,182.134 216.866,179 213,179C209.134,179 206,182.134 206,186C206,189.866 209.134,193 213,193Z"/>
+    <path android:fillColor="#8F8B8A" android:pathData="M16,24.025h216v15h-216z"/>
+    <path android:fillColor="#ffffff" android:pathData="M203,29H198V34H203V29Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M209,31.5C209,30.119 210.119,29 211.5,29C212.881,29 214,30.119 214,31.5C214,32.881 212.881,34 211.5,34C210.119,34 209,32.881 209,31.5Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M222.5,34L225,29H220L222.5,34Z"/>
+</vector>
diff --git a/OsmAnd/res/drawable/img_settings_customize_configure_map_night.xml b/OsmAnd/res/drawable/img_settings_customize_configure_map_night.xml
new file mode 100644
index 0000000000..f4811557b2
--- /dev/null
+++ b/OsmAnd/res/drawable/img_settings_customize_configure_map_night.xml
@@ -0,0 +1,20 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#060A0D" android:pathData="M16,39h216v85h-216z"/>
+    <path android:fillColor="#323334" android:pathData="M16,124h216v76h-216z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M34,154C39.523,154 44,149.523 44,144C44,138.477 39.523,134 34,134C28.477,134 24,138.477 24,144C24,149.523 28.477,154 34,154Z"/>
+    <path android:fillColor="#727272" android:pathData="M58,139C58,137.343 59.343,136 61,136H139C140.657,136 142,137.343 142,139C142,140.657 140.657,142 139,142H61C59.343,142 58,140.657 58,139Z"/>
+    <path android:fillColor="#727272" android:pathData="M58,182C58,180.343 59.343,179 61,179H139C140.657,179 142,180.343 142,182C142,183.657 140.657,185 139,185H61C59.343,185 58,183.657 58,182Z"/>
+    <path android:fillColor="#59595A" android:pathData="M58,149.5C58,148.672 58.672,148 59.5,148H104.5C105.328,148 106,148.672 106,149.5C106,150.328 105.328,151 104.5,151H59.5C58.672,151 58,150.328 58,149.5Z"/>
+    <path android:fillColor="#59595A" android:pathData="M58,192.5C58,191.672 58.672,191 59.5,191H104.5C105.328,191 106,191.672 106,192.5C106,193.328 105.328,194 104.5,194H59.5C58.672,194 58,193.328 58,192.5Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M34,197C39.523,197 44,192.523 44,187C44,181.477 39.523,177 34,177C28.477,177 24,181.477 24,187C24,192.523 28.477,197 34,197Z"/>
+    <path android:fillColor="#59595A" android:pathData="M194,143C194,140.239 196.239,138 199,138H215C217.761,138 220,140.239 220,143C220,145.761 217.761,148 215,148H199C196.239,148 194,145.761 194,143Z"/>
+    <path android:fillColor="#59595A" android:pathData="M194,186C194,183.239 196.239,181 199,181H215C217.761,181 220,183.239 220,186C220,188.761 217.761,191 215,191H199C196.239,191 194,188.761 194,186Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M213,150C216.866,150 220,146.866 220,143C220,139.134 216.866,136 213,136C209.134,136 206,139.134 206,143C206,146.866 209.134,150 213,150Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M213,193C216.866,193 220,189.866 220,186C220,182.134 216.866,179 213,179C209.134,179 206,182.134 206,186C206,189.866 209.134,193 213,193Z"/>
+    <path android:fillColor="#2D2F2F" android:pathData="M16,24.025h216v15h-216z"/>
+    <path android:fillColor="#727272" android:pathData="M203,29H198V34H203V29Z"/>
+    <path android:fillColor="#727272" android:pathData="M209,31.5C209,30.119 210.119,29 211.5,29C212.881,29 214,30.119 214,31.5C214,32.881 212.881,34 211.5,34C210.119,34 209,32.881 209,31.5Z"/>
+    <path android:fillColor="#727272" android:pathData="M222.5,34L225,29H220L222.5,34Z"/>
+</vector>
diff --git a/OsmAnd/res/drawable/img_settings_customize_context_menu_day.xml b/OsmAnd/res/drawable/img_settings_customize_context_menu_day.xml
new file mode 100644
index 0000000000..1e5c46781b
--- /dev/null
+++ b/OsmAnd/res/drawable/img_settings_customize_context_menu_day.xml
@@ -0,0 +1,30 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#EEE7E6" android:pathData="M16,0h216v42h-216z"/>
+    <path android:fillColor="#E2DBDB" android:pathData="M16,44l216,-0l0,-2l-216,-0z"/>
+    <path android:fillColor="#ffffff" android:pathData="M16,44h216v59h-216z"/>
+    <path android:fillColor="#F0F0F0" android:pathData="M16,103H232V173C232,174.657 230.657,176 229,176H19C17.343,176 16,174.657 16,173V103Z"/>
+    <path android:fillColor="#E6E6E6" android:pathData="M16,152h216v1h-216z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M31,143.5C31,142.672 31.672,142 32.5,142H53.5C54.328,142 55,142.672 55,143.5C55,144.328 54.328,145 53.5,145H32.5C31.672,145 31,144.328 31,143.5Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M85,143.5C85,142.672 85.672,142 86.5,142H107.5C108.328,142 109,142.672 109,143.5C109,144.328 108.328,145 107.5,145H86.5C85.672,145 85,144.328 85,143.5Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M139,143.5C139,142.672 139.672,142 140.5,142H161.5C162.328,142 163,142.672 163,143.5C163,144.328 162.328,145 161.5,145H140.5C139.672,145 139,144.328 139,143.5Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M193,143.5C193,142.672 193.672,142 194.5,142H215.5C216.328,142 217,142.672 217,143.5C217,144.328 216.328,145 215.5,145H194.5C193.672,145 193,144.328 193,143.5Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M43,131C48.523,131 53,126.523 53,121C53,115.477 48.523,111 43,111C37.477,111 33,115.477 33,121C33,126.523 37.477,131 43,131Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M97,131C102.523,131 107,126.523 107,121C107,115.477 102.523,111 97,111C91.477,111 87,115.477 87,121C87,126.523 91.477,131 97,131Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M151,131C156.523,131 161,126.523 161,121C161,115.477 156.523,111 151,111C145.477,111 141,115.477 141,121C141,126.523 145.477,131 151,131Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M200,128C200,129.105 199.105,130 198,130C196.895,130 196,129.105 196,128C196,126.895 196.895,126 198,126C199.105,126 200,126.895 200,128Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M207,128C207,129.105 206.105,130 205,130C203.895,130 203,129.105 203,128C203,126.895 203.895,126 205,126C206.105,126 207,126.895 207,128Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M212,130C213.105,130 214,129.105 214,128C214,126.895 213.105,126 212,126C210.895,126 210,126.895 210,128C210,129.105 210.895,130 212,130Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M200,121C200,122.105 199.105,123 198,123C196.895,123 196,122.105 196,121C196,119.895 196.895,119 198,119C199.105,119 200,119.895 200,121Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M207,121C207,122.105 206.105,123 205,123C203.895,123 203,122.105 203,121C203,119.895 203.895,119 205,119C206.105,119 207,119.895 207,121Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M212,123C213.105,123 214,122.105 214,121C214,119.895 213.105,119 212,119C210.895,119 210,119.895 210,121C210,122.105 210.895,123 212,123Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M200,114C200,115.105 199.105,116 198,116C196.895,116 196,115.105 196,114C196,112.895 196.895,112 198,112C199.105,112 200,112.895 200,114Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M207,114C207,115.105 206.105,116 205,116C203.895,116 203,115.105 203,114C203,112.895 203.895,112 205,112C206.105,112 207,112.895 207,114Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M212,116C213.105,116 214,115.105 214,114C214,112.895 213.105,112 212,112C210.895,112 210,112.895 210,114C210,115.105 210.895,116 212,116Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M30,70L84,70A3,3 0,0 1,87 73L87,73A3,3 0,0 1,84 76L30,76A3,3 0,0 1,27 73L27,73A3,3 0,0 1,30 70z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M30,56L108,56A3,3 0,0 1,111 59L111,59A3,3 0,0 1,108 62L30,62A3,3 0,0 1,27 59L27,59A3,3 0,0 1,30 56z"/>
+    <path android:fillColor="#FF8800" android:fillType="evenOdd" android:pathData="M214,72C219.523,72 224,67.523 224,62C224,56.477 219.523,52 214,52C208.477,52 204,56.477 204,62C204,67.523 208.477,72 214,72Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M26.5,163C25.672,163 25,163.672 25,164.5C25,165.328 25.672,166 26.5,166H59.5C60.328,166 61,165.328 61,164.5C61,163.672 60.328,163 59.5,163H26.5Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M189.5,163C188.672,163 188,163.672 188,164.5C188,165.328 188.672,166 189.5,166H221.5C222.328,166 223,165.328 223,164.5C223,163.672 222.328,163 221.5,163H189.5Z"/>
+</vector>
diff --git a/OsmAnd/res/drawable/img_settings_customize_context_menu_night.xml b/OsmAnd/res/drawable/img_settings_customize_context_menu_night.xml
new file mode 100644
index 0000000000..dee2ae1aaa
--- /dev/null
+++ b/OsmAnd/res/drawable/img_settings_customize_context_menu_night.xml
@@ -0,0 +1,29 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#060A0D" android:pathData="M16,0h216v44h-216z"/>
+    <path android:fillColor="#1C1C1C" android:pathData="M16,44h216v59h-216z"/>
+    <path android:fillColor="#28292A" android:pathData="M16,103H232V173C232,174.657 230.657,176 229,176H19C17.343,176 16,174.657 16,173V103Z"/>
+    <path android:fillColor="#2C3033" android:pathData="M16,152h216v1h-216z"/>
+    <path android:fillColor="#59595A" android:pathData="M31,143.5C31,142.672 31.672,142 32.5,142H53.5C54.328,142 55,142.672 55,143.5C55,144.328 54.328,145 53.5,145H32.5C31.672,145 31,144.328 31,143.5Z"/>
+    <path android:fillColor="#59595A" android:pathData="M85,143.5C85,142.672 85.672,142 86.5,142H107.5C108.328,142 109,142.672 109,143.5C109,144.328 108.328,145 107.5,145H86.5C85.672,145 85,144.328 85,143.5Z"/>
+    <path android:fillColor="#59595A" android:pathData="M139,143.5C139,142.672 139.672,142 140.5,142H161.5C162.328,142 163,142.672 163,143.5C163,144.328 162.328,145 161.5,145H140.5C139.672,145 139,144.328 139,143.5Z"/>
+    <path android:fillColor="#59595A" android:pathData="M193,143.5C193,142.672 193.672,142 194.5,142H215.5C216.328,142 217,142.672 217,143.5C217,144.328 216.328,145 215.5,145H194.5C193.672,145 193,144.328 193,143.5Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M43,131C48.523,131 53,126.523 53,121C53,115.477 48.523,111 43,111C37.477,111 33,115.477 33,121C33,126.523 37.477,131 43,131Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M97,131C102.523,131 107,126.523 107,121C107,115.477 102.523,111 97,111C91.477,111 87,115.477 87,121C87,126.523 91.477,131 97,131Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M151,131C156.523,131 161,126.523 161,121C161,115.477 156.523,111 151,111C145.477,111 141,115.477 141,121C141,126.523 145.477,131 151,131Z"/>
+    <path android:fillColor="#727272" android:pathData="M200,128C200,129.105 199.105,130 198,130C196.895,130 196,129.105 196,128C196,126.895 196.895,126 198,126C199.105,126 200,126.895 200,128Z"/>
+    <path android:fillColor="#727272" android:pathData="M207,128C207,129.105 206.105,130 205,130C203.895,130 203,129.105 203,128C203,126.895 203.895,126 205,126C206.105,126 207,126.895 207,128Z"/>
+    <path android:fillColor="#727272" android:pathData="M212,130C213.105,130 214,129.105 214,128C214,126.895 213.105,126 212,126C210.895,126 210,126.895 210,128C210,129.105 210.895,130 212,130Z"/>
+    <path android:fillColor="#727272" android:pathData="M200,121C200,122.105 199.105,123 198,123C196.895,123 196,122.105 196,121C196,119.895 196.895,119 198,119C199.105,119 200,119.895 200,121Z"/>
+    <path android:fillColor="#727272" android:pathData="M207,121C207,122.105 206.105,123 205,123C203.895,123 203,122.105 203,121C203,119.895 203.895,119 205,119C206.105,119 207,119.895 207,121Z"/>
+    <path android:fillColor="#727272" android:pathData="M212,123C213.105,123 214,122.105 214,121C214,119.895 213.105,119 212,119C210.895,119 210,119.895 210,121C210,122.105 210.895,123 212,123Z"/>
+    <path android:fillColor="#727272" android:pathData="M200,114C200,115.105 199.105,116 198,116C196.895,116 196,115.105 196,114C196,112.895 196.895,112 198,112C199.105,112 200,112.895 200,114Z"/>
+    <path android:fillColor="#727272" android:pathData="M207,114C207,115.105 206.105,116 205,116C203.895,116 203,115.105 203,114C203,112.895 203.895,112 205,112C206.105,112 207,112.895 207,114Z"/>
+    <path android:fillColor="#727272" android:pathData="M212,116C213.105,116 214,115.105 214,114C214,112.895 213.105,112 212,112C210.895,112 210,112.895 210,114C210,115.105 210.895,116 212,116Z"/>
+    <path android:fillColor="#59595A" android:pathData="M30,70L84,70A3,3 0,0 1,87 73L87,73A3,3 0,0 1,84 76L30,76A3,3 0,0 1,27 73L27,73A3,3 0,0 1,30 70z"/>
+    <path android:fillColor="#727272" android:pathData="M30,56L108,56A3,3 0,0 1,111 59L111,59A3,3 0,0 1,108 62L30,62A3,3 0,0 1,27 59L27,59A3,3 0,0 1,30 56z"/>
+    <path android:fillColor="#E69122" android:fillType="evenOdd" android:pathData="M214,72C219.523,72 224,67.523 224,62C224,56.477 219.523,52 214,52C208.477,52 204,56.477 204,62C204,67.523 208.477,72 214,72Z"/>
+    <path android:fillColor="#59595A" android:pathData="M26.5,163C25.672,163 25,163.672 25,164.5C25,165.328 25.672,166 26.5,166H59.5C60.328,166 61,165.328 61,164.5C61,163.672 60.328,163 59.5,163H26.5Z"/>
+    <path android:fillColor="#59595A" android:pathData="M189.5,163C188.672,163 188,163.672 188,164.5C188,165.328 188.672,166 189.5,166H221.5C222.328,166 223,165.328 223,164.5C223,163.672 222.328,163 221.5,163H189.5Z"/>
+</vector>
diff --git a/OsmAnd/res/drawable/img_settings_customize_drawer_day.xml b/OsmAnd/res/drawable/img_settings_customize_drawer_day.xml
new file mode 100644
index 0000000000..396a5363bf
--- /dev/null
+++ b/OsmAnd/res/drawable/img_settings_customize_drawer_day.xml
@@ -0,0 +1,30 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0h248v200h-248z"/>
+        <path android:fillColor="#EEE7E6" android:pathData="M166,24h66v177h-66z"/>
+        <path android:fillColor="#8F8B8A" android:pathData="M166,24h66v15h-66z"/>
+        <path android:fillColor="#ffffff" android:pathData="M203,29H198V34H203V29Z"/>
+        <path android:fillColor="#ffffff" android:pathData="M209,31.5C209,30.119 210.119,29 211.5,29C212.881,29 214,30.119 214,31.5C214,32.881 212.881,34 211.5,34C210.119,34 209,32.881 209,31.5Z"/>
+        <path android:fillColor="#ffffff" android:pathData="M222.5,34L225,29H220L222.5,34Z"/>
+        <path android:fillColor="#ffffff" android:pathData="M16,72h150v128h-150z"/>
+        <path android:fillColor="#BDD7FF" android:pathData="M16,24h150v48h-150z"/>
+        <path android:fillAlpha="0.5" android:fillColor="#237BFF"
+            android:pathData="M58,39C58,37.343 59.343,36 61,36H139C140.657,36 142,37.343 142,39C142,40.657 140.657,42 139,42H61C59.343,42 58,40.657 58,39Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#237BFF"
+            android:pathData="M58,53C58,51.343 59.343,50 61,50H115C116.657,50 118,51.343 118,53C118,54.657 116.657,56 115,56H61C59.343,56 58,54.657 58,53Z" android:strokeAlpha="0.5"/>
+        <path android:fillColor="#237BFF" android:fillType="evenOdd" android:pathData="M34,52C39.523,52 44,47.523 44,42C44,36.477 39.523,32 34,32C28.477,32 24,36.477 24,42C24,47.523 28.477,52 34,52Z"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M58,95C58,93.343 59.343,92 61,92H139C140.657,92 142,93.343 142,95C142,96.657 140.657,98 139,98H61C59.343,98 58,96.657 58,95Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M58,138C58,136.343 59.343,135 61,135H139C140.657,135 142,136.343 142,138C142,139.657 140.657,141 139,141H61C59.343,141 58,139.657 58,138Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M61,178C59.343,178 58,179.343 58,181C58,182.657 59.343,184 61,184H139C140.657,184 142,182.657 142,181C142,179.343 140.657,178 139,178H61Z" android:strokeAlpha="0.5"/>
+        <path android:fillColor="#B3B3B3" android:pathData="M34,105C39.523,105 44,100.523 44,95C44,89.477 39.523,85 34,85C28.477,85 24,89.477 24,95C24,100.523 28.477,105 34,105Z"/>
+        <path android:fillColor="#B3B3B3" android:pathData="M34,148C39.523,148 44,143.523 44,138C44,132.477 39.523,128 34,128C28.477,128 24,132.477 24,138C24,143.523 28.477,148 34,148Z"/>
+        <path android:fillColor="#B3B3B3" android:pathData="M44,181C44,186.523 39.523,191 34,191C28.477,191 24,186.523 24,181C24,175.477 28.477,171 34,171C39.523,171 44,175.477 44,181Z"/>
+        <path android:fillAlpha="0.1" android:fillColor="#000000"
+            android:pathData="M166,24h2v176h-2z" android:strokeAlpha="0.1"/>
+    </group>
+</vector>
diff --git a/OsmAnd/res/drawable/img_settings_customize_drawer_night.xml b/OsmAnd/res/drawable/img_settings_customize_drawer_night.xml
new file mode 100644
index 0000000000..a0cfc00b90
--- /dev/null
+++ b/OsmAnd/res/drawable/img_settings_customize_drawer_night.xml
@@ -0,0 +1,30 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0h248v200h-248z"/>
+        <path android:fillColor="#060A0D" android:pathData="M166,24h66v177h-66z"/>
+        <path android:fillColor="#2D2F2F" android:pathData="M166,24h66v15h-66z"/>
+        <path android:fillColor="#727272" android:pathData="M203,29H198V34H203V29Z"/>
+        <path android:fillColor="#727272" android:pathData="M209,31.5C209,30.119 210.119,29 211.5,29C212.881,29 214,30.119 214,31.5C214,32.881 212.881,34 211.5,34C210.119,34 209,32.881 209,31.5Z"/>
+        <path android:fillColor="#727272" android:pathData="M222.5,34L225,29H220L222.5,34Z"/>
+        <path android:fillColor="#323334" android:pathData="M16,72h150v128h-150z"/>
+        <path android:fillColor="#1F2D41" android:pathData="M16,24h150v48h-150z"/>
+        <path android:fillAlpha="0.5" android:fillColor="#237BFF"
+            android:pathData="M58,39C58,37.343 59.343,36 61,36H139C140.657,36 142,37.343 142,39C142,40.657 140.657,42 139,42H61C59.343,42 58,40.657 58,39Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#237BFF"
+            android:pathData="M58,53C58,51.343 59.343,50 61,50H115C116.657,50 118,51.343 118,53C118,54.657 116.657,56 115,56H61C59.343,56 58,54.657 58,53Z" android:strokeAlpha="0.5"/>
+        <path android:fillColor="#237BFF" android:fillType="evenOdd" android:pathData="M34,52C39.523,52 44,47.523 44,42C44,36.477 39.523,32 34,32C28.477,32 24,36.477 24,42C24,47.523 28.477,52 34,52Z"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M58,95C58,93.343 59.343,92 61,92H139C140.657,92 142,93.343 142,95C142,96.657 140.657,98 139,98H61C59.343,98 58,96.657 58,95Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M58,138C58,136.343 59.343,135 61,135H139C140.657,135 142,136.343 142,138C142,139.657 140.657,141 139,141H61C59.343,141 58,139.657 58,138Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M61,178C59.343,178 58,179.343 58,181C58,182.657 59.343,184 61,184H139C140.657,184 142,182.657 142,181C142,179.343 140.657,178 139,178H61Z" android:strokeAlpha="0.5"/>
+        <path android:fillColor="#727272" android:pathData="M34,105C39.523,105 44,100.523 44,95C44,89.477 39.523,85 34,85C28.477,85 24,89.477 24,95C24,100.523 28.477,105 34,105Z"/>
+        <path android:fillColor="#727272" android:pathData="M34,148C39.523,148 44,143.523 44,138C44,132.477 39.523,128 34,128C28.477,128 24,132.477 24,138C24,143.523 28.477,148 34,148Z"/>
+        <path android:fillColor="#727272" android:pathData="M44,181C44,186.523 39.523,191 34,191C28.477,191 24,186.523 24,181C24,175.477 28.477,171 34,171C39.523,171 44,175.477 44,181Z"/>
+        <path android:fillAlpha="0.1" android:fillColor="#000000"
+            android:pathData="M166,24h2v176h-2z" android:strokeAlpha="0.1"/>
+    </group>
+</vector>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 7d5529a3ff..a00d39e6ad 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -43,7 +43,7 @@
     <string name="replace_all_desc">Current items will be replaced with items from the file</string>
     <string name="replace_all">Replace all</string>
     <string name="keep_both">Keep both</string>
-    <string name="keep_both_desc">Imported items will be added with prexif</string>
+    <string name="keep_both_desc">Imported items will be added with prefix</string>
     <string name="import_duplicates_description">OsmAnd already has elements with the same names as those imported.\n\nSelect an action.</string>
     <string name="import_duplicates_title">Some items already exist</string>
     <string name="select_data_to_import">Select the data to be imported.</string>
diff --git a/OsmAnd/src/net/osmand/aidl/ConnectedApp.java b/OsmAnd/src/net/osmand/aidl/ConnectedApp.java
index ce25221fc8..bebccd4097 100644
--- a/OsmAnd/src/net/osmand/aidl/ConnectedApp.java
+++ b/OsmAnd/src/net/osmand/aidl/ConnectedApp.java
@@ -21,7 +21,6 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.views.AidlMapLayer;
 import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapLayer;
-import net.osmand.plus.views.mapwidgets.MapWidgetRegistry;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import net.osmand.util.Algorithms;
 
@@ -174,11 +173,8 @@ public class ConnectedApp implements Comparable<ConnectedApp> {
 				widgetControls.put(widget.getId(), control);
 				int iconId = AndroidUtils.getDrawableId(mapActivity.getMyApplication(), widget.getMenuIconName());
 				int menuIconId = iconId != 0 ? iconId : ContextMenuItem.INVALID_ID;
-				MapWidgetRegistry.MapWidgetRegInfo widgetInfo = layer.registerSideWidget(control, menuIconId,
-						widget.getMenuTitle(), "aidl_widget_" + widget.getId(), false, widget.getOrder());
-				if (!mapActivity.getMapLayers().getMapWidgetRegistry().isVisible(widgetInfo.key)) {
-					mapActivity.getMapLayers().getMapWidgetRegistry().setVisibility(widgetInfo, true, false);
-				}
+				String widgetKey = "aidl_widget_" + widget.getId();
+				layer.registerSideWidget(control, menuIconId, widget.getMenuTitle(), widgetKey, false, widget.getOrder());
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
index 9e7f2feb10..9404442c1d 100644
--- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
+++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
@@ -72,7 +72,6 @@ import net.osmand.plus.views.AidlMapLayer;
 import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapLayer;
 import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.mapwidgets.MapWidgetRegistry.MapWidgetRegInfo;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import net.osmand.router.TurnType;
 import net.osmand.util.Algorithms;
@@ -320,14 +319,11 @@ public class OsmandAidlApi {
 							ApplicationMode.regWidgetVisibility(widget.getId(), (ApplicationMode[]) null);
 							TextInfoWidget control = connectedApp.createWidgetControl(mapActivity, widgetId);
 							connectedApp.getWidgetControls().put(widgetId, control);
+
 							int iconId = AndroidUtils.getDrawableId(app, widget.getMenuIconName());
 							int menuIconId = iconId != 0 ? iconId : ContextMenuItem.INVALID_ID;
-							MapWidgetRegInfo widgetInfo = layer.registerSideWidget(control,
-									menuIconId, widget.getMenuTitle(), "aidl_widget_" + widgetId,
-									false, widget.getOrder());
-							if (!mapActivity.getMapLayers().getMapWidgetRegistry().isVisible(widgetInfo.key)) {
-								mapActivity.getMapLayers().getMapWidgetRegistry().setVisibility(widgetInfo, true, false);
-							}
+							String widgetKey = "aidl_widget_" + widgetId;
+							layer.registerSideWidget(control, menuIconId, widget.getMenuTitle(), widgetKey, false, widget.getOrder());
 							layer.recreateControls();
 						}
 					}
diff --git a/OsmAndCore-sample/build.gradle b/OsmAndCore-sample/build.gradle
index 7a8f84669e..9dc879445d 100644
--- a/OsmAndCore-sample/build.gradle
+++ b/OsmAndCore-sample/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     dexOptions {
         jumboMode true
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -121,9 +121,9 @@ repositories {
 
 dependencies {
     implementation project(path: ':OsmAnd-java', configuration: 'android')
-    implementation 'androidx.multidex:multidex:2.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'commons-logging:commons-logging-api:1.1'
     implementation 'com.moparisthebest:junidecode:0.1.1'