diff --git a/OsmAnd/res/drawable-hdpi/map_bg_point_octagon_bottom.png b/OsmAnd/res/drawable-hdpi/map_bg_point_octagon_bottom.png
new file mode 100644
index 0000000000..28e7300687
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_bg_point_octagon_bottom.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_bg_point_octagon_center.png b/OsmAnd/res/drawable-hdpi/map_bg_point_octagon_center.png
new file mode 100644
index 0000000000..1c808231eb
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_bg_point_octagon_center.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_bg_point_octagon_top.png b/OsmAnd/res/drawable-hdpi/map_bg_point_octagon_top.png
new file mode 100644
index 0000000000..a65fd59720
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_bg_point_octagon_top.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_bg_point_octagon_bottom.png b/OsmAnd/res/drawable-mdpi/map_bg_point_octagon_bottom.png
new file mode 100644
index 0000000000..5f65385c11
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_bg_point_octagon_bottom.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_bg_point_octagon_center.png b/OsmAnd/res/drawable-mdpi/map_bg_point_octagon_center.png
new file mode 100644
index 0000000000..1c2e794c46
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_bg_point_octagon_center.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_bg_point_octagon_top.png b/OsmAnd/res/drawable-mdpi/map_bg_point_octagon_top.png
new file mode 100644
index 0000000000..f99116ef61
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_bg_point_octagon_top.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_bg_point_octagon_bottom.png b/OsmAnd/res/drawable-xhdpi/map_bg_point_octagon_bottom.png
new file mode 100644
index 0000000000..376c2bc6e3
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_bg_point_octagon_bottom.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_bg_point_octagon_center.png b/OsmAnd/res/drawable-xhdpi/map_bg_point_octagon_center.png
new file mode 100644
index 0000000000..d65c95ef13
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_bg_point_octagon_center.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_bg_point_octagon_top.png b/OsmAnd/res/drawable-xhdpi/map_bg_point_octagon_top.png
new file mode 100644
index 0000000000..9d42a43c6e
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_bg_point_octagon_top.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_bg_point_octagon_bottom.png b/OsmAnd/res/drawable-xxhdpi/map_bg_point_octagon_bottom.png
new file mode 100644
index 0000000000..73eff57876
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_bg_point_octagon_bottom.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_bg_point_octagon_center.png b/OsmAnd/res/drawable-xxhdpi/map_bg_point_octagon_center.png
new file mode 100644
index 0000000000..d85495acd0
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_bg_point_octagon_center.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_bg_point_octagon_top.png b/OsmAnd/res/drawable-xxhdpi/map_bg_point_octagon_top.png
new file mode 100644
index 0000000000..1a99ecac96
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_bg_point_octagon_top.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_octagon_bottom.png b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_octagon_bottom.png
new file mode 100644
index 0000000000..8a50fc173c
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_octagon_bottom.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_octagon_center.png b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_octagon_center.png
new file mode 100644
index 0000000000..dca08e1053
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_octagon_center.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_octagon_top.png b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_octagon_top.png
new file mode 100644
index 0000000000..ac7c4f2b2a
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_octagon_top.png differ
diff --git a/OsmAnd/res/drawable/bg_point_circle.xml b/OsmAnd/res/drawable/bg_point_circle.xml
index ce07e759e2..bb19ed7e02 100644
--- a/OsmAnd/res/drawable/bg_point_circle.xml
+++ b/OsmAnd/res/drawable/bg_point_circle.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
   <path
-      android:pathData="M20,40C31.0457,40 40,31.0457 40,20C40,8.9543 31.0457,0 20,0C8.9543,0 0,8.9543 0,20C0,31.0457 8.9543,40 20,40Z"
+      android:pathData="M18,36C27.9411,36 36,27.9411 36,18C36,8.0589 27.9411,0 18,0C8.0589,0 0,8.0589 0,18C0,27.9411 8.0589,36 18,36Z"
       android:fillColor="#727272"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/OsmAnd/res/drawable/bg_point_octagon.xml b/OsmAnd/res/drawable/bg_point_octagon.xml
new file mode 100644
index 0000000000..31cb20bb90
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_point_octagon.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="34dp"
+    android:height="34dp"
+    android:viewportWidth="34"
+    android:viewportHeight="34">
+  <path
+      android:pathData="M9,0H25L34,9V25L25,34H9L0,25V9L9,0Z"
+      android:fillColor="#727272"/>
+</vector>
diff --git a/OsmAnd/res/drawable/bg_point_square.xml b/OsmAnd/res/drawable/bg_point_square.xml
index 0e509ce31f..f964af876a 100644
--- a/OsmAnd/res/drawable/bg_point_square.xml
+++ b/OsmAnd/res/drawable/bg_point_square.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
   <path
-      android:pathData="M4,1L36,1A3,3 0,0 1,39 4L39,36A3,3 0,0 1,36 39L4,39A3,3 0,0 1,1 36L1,4A3,3 0,0 1,4 1z"
+      android:pathData="M3,0L29,0A3,3 0,0 1,32 3L32,29A3,3 0,0 1,29 32L3,32A3,3 0,0 1,0 29L0,3A3,3 0,0 1,3 0z"
       android:fillColor="#727272"/>
 </vector>