diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
index 53b883f7c4..86ab7b1e7d 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -422,14 +422,14 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     view.findViewById(R.id.block_street).setOnClickListener(this);
     mStreet = view.findViewById(R.id.street);
     View blockHouseNumber = view.findViewById(R.id.block_building);
-    mHouseNumber = findInputAndInitBlock(blockHouseNumber, 0, R.string.house_number);
+    mHouseNumber = findInputAndInitBlock(blockHouseNumber, R.drawable.ic_building, R.string.house_number);
     mInputHouseNumber = blockHouseNumber.findViewById(R.id.custom_input);
 
-    initBlock(view, Metadata.MetadataType.FMD_POSTCODE, R.id.block_zipcode, 0, R.string.editor_zip_code, 0);
+    initBlock(view, Metadata.MetadataType.FMD_POSTCODE, R.id.block_zipcode, R.drawable.ic_address, R.string.editor_zip_code, 0);
 
     // Details
     View mBlockLevels = view.findViewById(R.id.block_levels);
-    mBuildingLevels = findInputAndInitBlock(mBlockLevels, 0,
+    mBuildingLevels = findInputAndInitBlock(mBlockLevels, R.drawable.ic_floor,
         getString(R.string.editor_storey_number, Editor.nativeGetMaxEditableBuildingLevels()));
     mBuildingLevels.setInputType(InputType.TYPE_CLASS_NUMBER);
     mInputBuildingLevels = mBlockLevels.findViewById(R.id.custom_input);
diff --git a/android/app/src/main/res/drawable/ic_building.xml b/android/app/src/main/res/drawable/ic_building.xml
new file mode 100644
index 0000000000..c2424cc1f0
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_building.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M120,840v-560h160v-160h400v320h160v400L520,840v-160h-80v160L120,840ZM200,760h80v-80h-80v80ZM200,600h80v-80h-80v80ZM200,440h80v-80h-80v80ZM360,600h80v-80h-80v80ZM360,440h80v-80h-80v80ZM360,280h80v-80h-80v80ZM520,600h80v-80h-80v80ZM520,440h80v-80h-80v80ZM520,280h80v-80h-80v80ZM680,760h80v-80h-80v80ZM680,600h80v-80h-80v80Z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_floor.xml b/android/app/src/main/res/drawable/ic_floor.xml
new file mode 100644
index 0000000000..4b2a27afb2
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_floor.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="22"
+    android:viewportWidth="22">
+
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M2,2h10v19h11v1L1,22v-1h1zM3,21h8L11,3L3,3zM17.176,5L15.5,2.942 13.824,5L15,5v13h-1.176l1.676,2.058L17.176,18L16,18L16,5zM8,5h2v2L8,7zM4,12h2v-2L4,10zM4,7h2L6,5L4,5zM4,17h2v-2L4,15zM8,12h2v-2L8,10zM8,17h2v-2L8,15z" />
+
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_operating_hours.xml b/android/app/src/main/res/drawable/ic_operating_hours.xml
index 682253e6f6..2ce8a142ba 100644
--- a/android/app/src/main/res/drawable/ic_operating_hours.xml
+++ b/android/app/src/main/res/drawable/ic_operating_hours.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#FFF"
       android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM16.2,16.2L11,13V7h1.5v5.2l4.5,2.7L16.2,16.2z"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_street_address.xml b/android/app/src/main/res/drawable/ic_street_address.xml
new file mode 100644
index 0000000000..85d5766f30
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_street_address.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M440,880v-160L240,720L120,600l120,-120h200v-80L160,400v-240h280v-80h80v80h200l120,120 -120,120L520,400v80h280v240L520,720v160h-80ZM240,320h447l40,-40 -40,-40L240,240v80ZM273,640h447v-80L273,560l-40,40 40,40ZM240,320v-80,80ZM720,640v-80,80Z"
+      android:fillColor="#FFF"/>
+</vector>
diff --git a/android/app/src/main/res/layout/fragment_editor.xml b/android/app/src/main/res/layout/fragment_editor.xml
index 92f53510ef..9ea65f5cb9 100644
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -91,7 +91,7 @@
           android:paddingTop="@dimen/margin_half">
           <ImageView
             style="@style/MwmWidget.Editor.MetadataIcon"
-            app:srcCompat="@drawable/ic_address"
+            app:srcCompat="@drawable/ic_street_address"
             tools:ignore="ContentDescription" />
           <TextView
             android:id="@+id/street_title"