diff --git a/android/app/build.gradle b/android/app/build.gradle
index c86dd4e755..765b91da10 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -82,7 +82,7 @@ def getCommitMessage() {
 
 def osName = System.properties['os.name'].toLowerCase()
 
-project.ext.appId = 'app.organicmaps'
+project.ext.appId = 'tj.tourism.rebus'
 project.ext.appName = 'Organic Maps'
 
 java {
diff --git a/android/app/src/main/res/layout-h400dp/map_buttons_layout_planning.xml b/android/app/src/main/res/layout-h400dp/map_buttons_layout_planning.xml
index b80f476643..ff1cdc98c8 100644
--- a/android/app/src/main/res/layout-h400dp/map_buttons_layout_planning.xml
+++ b/android/app/src/main/res/layout-h400dp/map_buttons_layout_planning.xml
@@ -22,6 +22,7 @@
       layout="@layout/map_buttons_bookmarks"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:visibility="gone"
       android:layout_alignParentBottom="true"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent" />
diff --git a/android/app/src/main/res/layout-h400dp/map_buttons_layout_regular.xml b/android/app/src/main/res/layout-h400dp/map_buttons_layout_regular.xml
index b3e31d6e42..f43525640c 100644
--- a/android/app/src/main/res/layout-h400dp/map_buttons_layout_regular.xml
+++ b/android/app/src/main/res/layout-h400dp/map_buttons_layout_regular.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
@@ -8,6 +7,7 @@
   android:clipChildren="false"
   android:clipToPadding="false"
   tools:background="@color/bg_primary">
+
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_top"
     android:layout_width="wrap_content"
@@ -16,7 +16,9 @@
     android:layout_alignParentTop="true"
     android:clipChildren="false"
     android:clipToPadding="false"
-    android:padding="@dimen/nav_frame_padding">
+    android:padding="@dimen/nav_frame_padding"
+    android:visibility="gone">
+
     <include
       layout="@layout/map_buttons_layers"
       android:layout_width="wrap_content"
@@ -25,6 +27,7 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
+
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_inner_right"
     android:layout_width="wrap_content"
@@ -35,6 +38,7 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     android:padding="@dimen/nav_frame_padding">
+
     <include
       layout="@layout/map_buttons_zoom"
       android:layout_width="wrap_content"
@@ -43,6 +47,7 @@
       android:layout_marginBottom="@dimen/zoom_buttons_margin"
       app:layout_constraintBottom_toTopOf="@+id/my_position"
       app:layout_constraintEnd_toEndOf="parent" />
+
     <include
       layout="@layout/map_buttons_myposition"
       android:layout_width="wrap_content"
@@ -51,10 +56,12 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
+
   <include
     layout="@layout/map_buttons_bottom"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true"
     android:layout_alignParentBottom="true"
-    android:layout_alignParentEnd="true" />
+    android:visibility="gone" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/map_buttons_layout_planning.xml b/android/app/src/main/res/layout/map_buttons_layout_planning.xml
index 9549e63416..83d8fed37c 100644
--- a/android/app/src/main/res/layout/map_buttons_layout_planning.xml
+++ b/android/app/src/main/res/layout/map_buttons_layout_planning.xml
@@ -23,6 +23,7 @@
       layout="@layout/map_buttons_bookmarks"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:visibility="gone"
       android:layout_alignParentBottom="true"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent" />
diff --git a/android/app/src/main/res/layout/map_buttons_layout_regular.xml b/android/app/src/main/res/layout/map_buttons_layout_regular.xml
index 9feb8cdbb2..03674ccef4 100644
--- a/android/app/src/main/res/layout/map_buttons_layout_regular.xml
+++ b/android/app/src/main/res/layout/map_buttons_layout_regular.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
@@ -8,15 +7,18 @@
   android:clipChildren="false"
   android:clipToPadding="false"
   tools:background="@color/bg_primary">
+
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_top"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_alignParentTop="true"
     android:layout_alignParentLeft="true"
+    android:layout_alignParentTop="true"
     android:clipChildren="false"
     android:clipToPadding="false"
-    android:padding="@dimen/nav_frame_padding">
+    android:padding="@dimen/nav_frame_padding"
+    android:visibility="gone">
+
     <include
       layout="@layout/map_buttons_layers"
       android:layout_width="wrap_content"
@@ -25,16 +27,18 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
+
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_inner_right"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
+    android:layout_alignParentEnd="true"
     android:layout_marginTop="@dimen/action_bar_extended_height"
     android:layout_marginBottom="@dimen/nav_menu_height"
-    android:layout_alignParentEnd="true"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:padding="@dimen/nav_frame_padding">
+
     <include
       layout="@layout/map_buttons_zoom"
       android:layout_width="wrap_content"
@@ -43,6 +47,7 @@
       android:layout_marginBottom="@dimen/margin_half"
       app:layout_constraintBottom_toTopOf="@+id/my_position"
       app:layout_constraintEnd_toEndOf="parent" />
+
     <include
       layout="@layout/map_buttons_myposition"
       android:layout_width="wrap_content"
@@ -51,10 +56,12 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
+
   <include
     layout="@layout/map_buttons_bottom"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true"
     android:layout_alignParentBottom="true"
-    android:layout_alignParentEnd="true" />
+    android:visibility="gone" />
 </RelativeLayout>
\ No newline at end of file