diff --git a/android/res/drawable-hdpi/btn_menu_tail_normal.png b/android/res/drawable-hdpi/btn_menu_tail_normal.png
deleted file mode 100644
index 83401f05ef..0000000000
Binary files a/android/res/drawable-hdpi/btn_menu_tail_normal.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/btn_menu_tail_pressed.png b/android/res/drawable-hdpi/btn_menu_tail_pressed.png
deleted file mode 100644
index d107cde392..0000000000
Binary files a/android/res/drawable-hdpi/btn_menu_tail_pressed.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/btn_menu_tail_normal.png b/android/res/drawable-mdpi/btn_menu_tail_normal.png
deleted file mode 100644
index e3c0b7c234..0000000000
Binary files a/android/res/drawable-mdpi/btn_menu_tail_normal.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/btn_menu_tail_pressed.png b/android/res/drawable-mdpi/btn_menu_tail_pressed.png
deleted file mode 100644
index aff92fcfaa..0000000000
Binary files a/android/res/drawable-mdpi/btn_menu_tail_pressed.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/btn_menu_tail_normal.png b/android/res/drawable-xhdpi/btn_menu_tail_normal.png
deleted file mode 100644
index 79a7f75e6d..0000000000
Binary files a/android/res/drawable-xhdpi/btn_menu_tail_normal.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/btn_menu_tail_pressed.png b/android/res/drawable-xhdpi/btn_menu_tail_pressed.png
deleted file mode 100644
index c6638f8cf2..0000000000
Binary files a/android/res/drawable-xhdpi/btn_menu_tail_pressed.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/btn_menu_tail_normal.png b/android/res/drawable-xxhdpi/btn_menu_tail_normal.png
deleted file mode 100644
index fa9f1d63d3..0000000000
Binary files a/android/res/drawable-xxhdpi/btn_menu_tail_normal.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/btn_menu_tail_pressed.png b/android/res/drawable-xxhdpi/btn_menu_tail_pressed.png
deleted file mode 100644
index 8896a2da68..0000000000
Binary files a/android/res/drawable-xxhdpi/btn_menu_tail_pressed.png and /dev/null differ
diff --git a/android/res/drawable/btn_menu_tail_selector.xml b/android/res/drawable/btn_menu_tail_selector.xml
deleted file mode 100644
index 4b51a78c49..0000000000
--- a/android/res/drawable/btn_menu_tail_selector.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/btn_menu_tail_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/btn_menu_tail_normal"/>
-
-</selector>
\ No newline at end of file
diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml
deleted file mode 100644
index f349db8c59..0000000000
--- a/android/res/layout/activity_map.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/lv"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <android.support.v4.widget.DrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <FrameLayout
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-
-            <include layout="@layout/map" />
-        </FrameLayout>
-
-        <RelativeLayout
-            android:id="@+id/left_drawer"
-            android:layout_width="@dimen/drawer_width"
-            android:layout_height="match_parent"
-            android:layout_gravity="end"
-            android:background="@drawable/drawer_back" >
-
-            <include
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                layout="@layout/drawer_main" />
-
-            <!-- Dark vertical line -->
-            <View
-                android:layout_width="3dp"
-                android:layout_height="match_parent"
-                android:layout_alignParentLeft="true"
-                android:background="#000033" />
-        </RelativeLayout>
-    </android.support.v4.widget.DrawerLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/drawer_main.xml b/android/res/layout/drawer_main.xml
deleted file mode 100644
index ee9a10d793..0000000000
--- a/android/res/layout/drawer_main.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <ScrollView
-        android:id="@+id/scroll_up"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/buy_pro"
-        android:layout_alignParentTop="true"
-        android:background="@null"
-        android:paddingRight="3dp" >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:orientation="vertical" >
-
-            <FrameLayout
-                android:id="@+id/map_container_download"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/drawer_item_back_selector" >
-
-                <TextView
-                    android:id="@+id/map_button_download"
-                    style="@style/Widget.MapButtonDrawer"
-                    android:contentDescription="@string/download_maps"
-                    android:drawableLeft="@drawable/ic_map_selector"
-                    android:text="@string/download_maps" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/map_container_bookmarks"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/drawer_item_back_selector" >
-
-                <TextView
-                    android:id="@+id/map_button_bookmarks"
-                    style="@style/Widget.MapButtonDrawer"
-                    android:contentDescription="@string/bookmarks"
-                    android:drawableLeft="@drawable/ic_bookmarks_selector"
-                    android:drawableRight="@drawable/ic_probadge"
-                    android:text="@string/bookmarks" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/menuitem_settings_activity"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/drawer_item_back_selector" >
-
-                <TextView
-                    style="@style/Widget.MapButtonDrawer"
-                    android:contentDescription="@string/settings"
-                    android:drawableLeft="@drawable/ic_settings_selector"
-                    android:text="@string/settings" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/map_button_share_myposition"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/drawer_item_back_selector" >
-
-                <TextView
-                    style="@style/Widget.MapButtonDrawer"
-                    android:contentDescription="@string/share"
-                    android:drawableLeft="@drawable/ic_send_selector"
-                    android:text="@string/share_my_location" />
-            </FrameLayout>
-        </LinearLayout>
-    </ScrollView>
-
-    <Button
-        android:id="@+id/buy_pro"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_margin="@dimen/dp_x_8"
-        android:layout_marginTop="@dimen/dp_x_6"
-        android:background="@drawable/buy_pro_selector"
-        android:paddingBottom="@dimen/dp_x_2"
-        android:paddingLeft="@dimen/dp_x_6"
-        android:paddingRight="@dimen/dp_x_6"
-        android:paddingTop="@dimen/dp_x_2"
-        android:text="@string/become_a_pro"
-        android:textSize="@dimen/sp_x_4"
-        android:textColor="@android:color/white" />
-
-</merge>
\ No newline at end of file
diff --git a/android/res/layout/map.xml b/android/res/layout/map.xml
index e6c87276d1..edf38d65f4 100644
--- a/android/res/layout/map.xml
+++ b/android/res/layout/map.xml
@@ -13,7 +13,7 @@
         android:background="@android:color/transparent" />
 
     <!--
-    	Default margin = @dimen/map_controls_margin - 1 (like in map_button_bottom)
+	Default margin = @dimen/map_controls_margin - 1 (like in map_bottom_toolbar)
      	Right margin = @dimen/zoom_margin + @dimen/zoom_margin_right - 1 (like in map_navigation_buttons)
     -->
     <include
@@ -33,12 +33,12 @@
         layout="@layout/map_navigation_buttons" />
 
     <include
-        android:id="@+id/map_buttons_bottom_ref"
+        android:id="@+id/map_bottom_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/info_box"
         android:layout_margin="0dp"
-        layout="@layout/map_button_bottom" />
+        layout="@layout/map_bottom_toolbar" />
 
     <com.mapswithme.maps.widget.MapInfoView
         android:id="@+id/info_box"
diff --git a/android/res/layout/map_button_bottom.xml b/android/res/layout/map_bottom_toolbar.xml
similarity index 61%
rename from android/res/layout/map_button_bottom.xml
rename to android/res/layout/map_bottom_toolbar.xml
index 8700d76c2e..024fe9cb2e 100644
--- a/android/res/layout/map_button_bottom.xml
+++ b/android/res/layout/map_bottom_toolbar.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/map_butons_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="bottom|left"
@@ -21,17 +20,4 @@
         android:paddingBottom="0dp"
         android:src="@drawable/btn_map_controls_location_normal" />
 
-    <ImageButton
-        android:id="@+id/map_button_toggle_drawer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right|bottom"
-        android:layout_marginBottom="@dimen/map_controls_margin"
-        android:background="@null"
-        android:contentDescription="@string/my_position"
-        android:paddingBottom="0dp"
-        android:paddingLeft="@dimen/dp_x_2"
-        android:paddingTop="@dimen/dp_x_6"
-        android:src="@drawable/btn_menu_tail_selector" />
-
 </FrameLayout>
diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java
index f03ddb7d5b..6bc6cde2df 100644
--- a/android/src/com/mapswithme/maps/MWMActivity.java
+++ b/android/src/com/mapswithme/maps/MWMActivity.java
@@ -17,19 +17,13 @@ import android.location.Location;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v4.widget.DrawerLayout.DrawerListener;
 import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.View.OnTouchListener;
 import android.widget.ImageButton;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -55,7 +49,6 @@ import com.mapswithme.maps.widget.MapInfoView;
 import com.mapswithme.maps.widget.MapInfoView.OnVisibilityChangedListener;
 import com.mapswithme.maps.widget.MapInfoView.State;
 import com.mapswithme.util.ConnectionState;
-import com.mapswithme.util.ShareAction;
 import com.mapswithme.util.StoragePathManager;
 import com.mapswithme.util.StoragePathManager.SetStoragePathListener;
 import com.mapswithme.util.UiUtils;
@@ -67,7 +60,6 @@ import com.nvidia.devtech.NvEventQueueActivity;
 public class MWMActivity extends NvEventQueueActivity
     implements LocationService.Listener,
     OnBalloonListener,
-    DrawerListener,
     OnVisibilityChangedListener
 {
   public static final String EXTRA_TASK = "map_task";
@@ -88,9 +80,6 @@ public class MWMActivity extends NvEventQueueActivity
   private SurfaceView mMapSurface;
   // Info box (place page).
   private MapInfoView mInfoView;
-  // Drawer components
-  private DrawerLayout mDrawerLayout;
-  private View mMainDrawer;
   private SearchController mSearchController;
   private String mProDialogMessage;
   private boolean m_needCheckUpdate = true;
@@ -624,7 +613,7 @@ public class MWMActivity extends NvEventQueueActivity
       getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN);
       getWindow().clearFlags(android.view.WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
     }
-    setContentView(R.layout.activity_map);
+    setContentView(R.layout.map);
     super.onCreate(savedInstanceState);
     mApplication = (MWMApplication) getApplication();
 
@@ -662,145 +651,81 @@ public class MWMActivity extends NvEventQueueActivity
     mInfoView.setOnVisibilityChangedListener(this);
   }
 
-  private void setUpDrawer()
-  {
-    final boolean isPro = mApplication.isProVersion();
-    final OnClickListener drawerItemsClickListener = new OnClickListener()
-    {
-      @Override
-      public void onClick(View v)
-      {
-        final int id = v.getId();
-
-        if (R.id.menuitem_settings_activity == id)
-          startActivity(new Intent(MWMActivity.this, SettingsActivity.class));
-        else if (R.id.map_container_bookmarks == id)
-        {
-          if (isPro || Yota.isYota())
-            onBookmarksClicked();
-          else
-            runProVersionMarketActivity();
-        }
-        else if (R.id.map_container_download == id)
-        {
-          onDownloadClicked();
-        }
-        else if (R.id.buy_pro == id)
-        {
-          runProVersionMarketActivity();
-        }
-        else if (R.id.map_button_share_myposition == id)
-        {
-          final Location loc = MWMApplication.get().getLocationService().getLastKnown();
-          if (loc != null)
-          {
-            final String geoUrl = Framework.getGe0Url(loc.getLatitude(), loc.getLongitude(), Framework.getDrawScale(), "");
-            final String httpUrl = Framework.getHttpGe0Url(loc.getLatitude(), loc.getLongitude(), Framework.getDrawScale(), "");
-            final String body = getString(R.string.my_position_share_sms, geoUrl, httpUrl);
-            // we use shortest message we can have here
-            ShareAction.getAnyShare().shareWithText(getActivity(), body, "");
-          }
-          else
-          {
-            new AlertDialog.Builder(MWMActivity.this)
-                .setMessage(R.string.unknown_current_position)
-                .setCancelable(true)
-                .setPositiveButton(android.R.string.ok, new Dialog.OnClickListener()
-                {
-                  @Override
-                  public void onClick(DialogInterface dialog, int which)
-                  {
-                    dialog.dismiss();
-                  }
-                })
-                .create()
-                .show();
-          }
-        }
-
-        toggleDrawer();
-      }
-    };
-
-
-    mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-    mDrawerLayout.setDrawerListener(this);
-    mMainDrawer = findViewById(R.id.left_drawer);
-    mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
-
-    mMapSurface.setOnTouchListener(new OnTouchListener()
-    {
-      @Override
-      public boolean onTouch(View v, MotionEvent event)
-      {
-        if (mRenderingInitialized == false)
-          return false;
-        return MWMActivity.this.onTouchEvent(event);
-      }
-    });
-
-    final SimpleOnGestureListener gestureListener = new SimpleOnGestureListener()
-    {
-      @Override
-      public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY)
-      {
-        if (mDrawerLayout.isDrawerOpen(mMainDrawer))
-          return false;
-
-        final float dX = e2.getX() - e1.getX();
-        if (dX < 0) // scroll is left
-        {
-          final float dY = e2.getY() - e1.getY();
-          if (Math.abs(dX) > Math.abs(dY)) // is closer to horizontal
-          {
-            mDrawerLayout.openDrawer(mMainDrawer);
-            return true;
-          }
-        }
-        return false;
-      }
-    };
-
-    final GestureDetectorCompat detector = new GestureDetectorCompat(this, gestureListener);
-    final View toggleDrawer = findViewById(R.id.map_button_toggle_drawer);
-
-    toggleDrawer.setOnTouchListener(new OnTouchListener()
-    {
-      @Override
-      public boolean onTouch(View v, MotionEvent event)
-      {
-        return detector.onTouchEvent(event);
-      }
-    });
-
-    findViewById(R.id.map_container_bookmarks).setOnClickListener(drawerItemsClickListener);
-    findViewById(R.id.map_container_download).setOnClickListener(drawerItemsClickListener);
-    toggleDrawer.setOnClickListener(drawerItemsClickListener);
-    findViewById(R.id.menuitem_settings_activity).setOnClickListener(drawerItemsClickListener);
-    findViewById(R.id.map_button_share_myposition).setOnClickListener(drawerItemsClickListener);
-    findViewById(R.id.buy_pro).setOnClickListener(drawerItemsClickListener);
-
-    if (isPro || Yota.isYota())
-    {
-      final TextView bookmarksView = (TextView) findViewById(R.id.map_button_bookmarks);
-
-      // Make post stuff because of Android strange behavior:
-      // direct call doesn't work on Sony LT devices.
-      // http://stackoverflow.com/questions/20423445/setcompounddrawableswithintrinsicboundsint-int-int-int-not-working
-      bookmarksView.post(new Runnable()
-      {
-        @Override
-        public void run()
-        {
-          bookmarksView.setCompoundDrawablesWithIntrinsicBounds(
-              R.drawable.ic_bookmarks_selector, 0, 0, 0);
-        }
-      });
-    }
-
-    if (isPro)
-      UiUtils.hide(findViewById(R.id.buy_pro));
-  }
+//        if (R.id.menuitem_settings_activity == id)
+//          startActivity(new Intent(MWMActivity.this, SettingsActivity.class));
+//        else if (R.id.map_container_bookmarks == id)
+//        {
+//          if (isPro || Yota.isYota())
+//            onBookmarksClicked();
+//          else
+//            runProVersionMarketActivity();
+//        }
+//        else if (R.id.map_container_download == id)
+//        {
+//          onDownloadClicked();
+//        }
+//        else if (R.id.buy_pro == id)
+//        {
+//          runProVersionMarketActivity();
+//        }
+//        else if (R.id.map_button_share_myposition == id)
+//        {
+//          final Location loc = MWMApplication.get().getLocationService().getLastKnown();
+//          if (loc != null)
+//          {
+//            final String geoUrl = Framework.getGe0Url(loc.getLatitude(), loc.getLongitude(), Framework.getDrawScale(), "");
+//            final String httpUrl = Framework.getHttpGe0Url(loc.getLatitude(), loc.getLongitude(), Framework.getDrawScale(), "");
+//            final String body = getString(R.string.my_position_share_sms, geoUrl, httpUrl);
+//            // we use shortest message we can have here
+//            ShareAction.getAnyShare().shareWithText(getActivity(), body, "");
+//          }
+//          else
+//          {
+//            new AlertDialog.Builder(MWMActivity.this)
+//                .setMessage(R.string.unknown_current_position)
+//                .setCancelable(true)
+//                .setPositiveButton(android.R.string.ok, new Dialog.OnClickListener()
+//                {
+//                  @Override
+//                  public void onClick(DialogInterface dialog, int which)
+//                  {
+//                    dialog.dismiss();
+//                  }
+//                })
+//                .create()
+//                .show();
+//          }
+//        }
+//    mMapSurface.setOnTouchListener(new OnTouchListener()
+//    {
+//      @Override
+//      public boolean onTouch(View v, MotionEvent event)
+//      {
+//        if (mRenderingInitialized == false)
+//          return false;
+//        return MWMActivity.this.onTouchEvent(event);
+//      }
+//    });
+//    if (isPro || Yota.isYota())
+//    {
+//      final TextView bookmarksView = (TextView) findViewById(R.id.map_button_bookmarks);
+//
+//      // Make post stuff because of Android strange behavior:
+//      // direct call doesn't work on Sony LT devices.
+//      // http://stackoverflow.com/questions/20423445/setcompounddrawableswithintrinsicboundsint-int-int-int-not-working
+//      bookmarksView.post(new Runnable()
+//      {
+//        @Override
+//        public void run()
+//        {
+//          bookmarksView.setCompoundDrawablesWithIntrinsicBounds(
+//              R.drawable.ic_bookmarks_selector, 0, 0, 0);
+//        }
+//      });
+//    }
+//
+//    if (isPro)
+//      UiUtils.hide(findViewById(R.id.buy_pro));
 
   private void yotaSetup()
   {
@@ -895,16 +820,6 @@ public class MWMActivity extends NvEventQueueActivity
     final int margin = (int) getResources().getDimension(R.dimen.zoom_margin);
     final int marginTop = (int) getResources().getDimension(R.dimen.zoom_plus_top_margin);
     lp.setMargins(margin, marginTop, margin, margin);
-
-    // Calculate padding as one quarter of height
-    int drawerItemsPadding = 0;
-    if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT)
-    {
-      final DisplayMetrics dm = getResources().getDisplayMetrics();
-      drawerItemsPadding = Math.max(dm.heightPixels, dm.widthPixels) / 5;
-    }
-
-    findViewById(R.id.scroll_up).setPadding(0, drawerItemsPadding, 0, 0);
   }
 
   /// @name From Location interface
@@ -1081,8 +996,8 @@ public class MWMActivity extends NvEventQueueActivity
       // Add local maps to the model
       nativeStorageConnected();
 
-      // enable downloader button and dismiss blocking popup
-      findViewById(R.id.map_button_download).setVisibility(View.VISIBLE);
+      // @TODO enable downloader button and dismiss blocking popup
+
       if (m_storageDisconnectedDialog != null)
         m_storageDisconnectedDialog.dismiss();
     }
@@ -1091,8 +1006,8 @@ public class MWMActivity extends NvEventQueueActivity
       // Add local maps to the model
       nativeStorageConnected();
 
-      // disable downloader button and dismiss blocking popup
-      findViewById(R.id.map_button_download).setVisibility(View.INVISIBLE);
+      // @TODO disable downloader button and dismiss blocking popup
+
       if (m_storageDisconnectedDialog != null)
         m_storageDisconnectedDialog.dismiss();
     }
@@ -1101,8 +1016,8 @@ public class MWMActivity extends NvEventQueueActivity
       // Remove local maps from the model
       nativeStorageDisconnected();
 
-      // enable downloader button and show blocking popup
-      findViewById(R.id.map_button_download).setVisibility(View.VISIBLE);
+      // @TODO enable downloader button and show blocking popup
+
       if (m_storageDisconnectedDialog == null)
       {
         m_storageDisconnectedDialog = new AlertDialog.Builder(this)
@@ -1206,14 +1121,9 @@ public class MWMActivity extends NvEventQueueActivity
     m_externalStorageReceiver = null;
   }
 
-  /// Map tasks invoked by intent processing.
-
-  private void toggleDrawer()
+  private void toggleMoreMenu()
   {
-    if (mDrawerLayout.isDrawerOpen(mMainDrawer))
-      mDrawerLayout.closeDrawer(mMainDrawer);
-    else
-      mDrawerLayout.openDrawer(mMainDrawer);
+    // @TODO show/hide More menu
   }
 
   @Override
@@ -1221,7 +1131,7 @@ public class MWMActivity extends NvEventQueueActivity
   {
     if (KeyEvent.KEYCODE_MENU == keyCode && !event.isCanceled())
     {
-      toggleDrawer();
+      toggleMoreMenu();
       return true;
     }
     return super.onKeyUp(keyCode, event);
@@ -1343,7 +1253,7 @@ public class MWMActivity extends NvEventQueueActivity
     mInfoView.setState(State.COLLAPSED);
     mInfoView.setMapObject(null);
 
-    UiUtils.show(findViewById(R.id.map_buttons_bottom_ref));
+    UiUtils.show(findViewById(R.id.map_bottom_toolbar));
   }
 
   @Override
@@ -1436,28 +1346,10 @@ public class MWMActivity extends NvEventQueueActivity
 
   public native boolean showMapForUrl(String url);
 
-  @Override
-  public void onDrawerClosed(View arg0)
-  {
-    mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
-  }
-
-  @Override
-  public void onDrawerOpened(View arg0)
-  {
-    mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
-  }
-
-  @Override
-  public void onDrawerSlide(View arg0, float arg1) {}
-
-  @Override
-  public void onDrawerStateChanged(int arg0) {}
-
   @Override
   public void onPPPVisibilityChanged(boolean isVisible)
   {
-    final View mapButtonBottom = findViewById(R.id.map_buttons_bottom_ref);
+    final View mapButtonBottom = findViewById(R.id.map_bottom_toolbar);
     final RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) mapButtonBottom.getLayoutParams();
     lp.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, isVisible ? 0 : RelativeLayout.TRUE);
     mapButtonBottom.setLayoutParams(lp);
@@ -1466,8 +1358,8 @@ public class MWMActivity extends NvEventQueueActivity
   @Override
   public void onPPVisibilityChanged(boolean isVisible)
   {
-    // If body is visible -- hide my location and drawer buttons
-    UiUtils.showIf(!isVisible, findViewById(R.id.map_buttons_bottom_ref));
+    // Hide toolbar if PlacePage is visible
+    UiUtils.showIf(!isVisible, findViewById(R.id.map_bottom_toolbar));
   }
 
   public interface MapTask extends Serializable