diff --git a/android/res/layout-land/map_navigation_buttons.xml b/android/res/layout-land/map_navigation_buttons.xml
index 13e85b3e14..7a4dc3531f 100644
--- a/android/res/layout-land/map_navigation_buttons.xml
+++ b/android/res/layout-land/map_navigation_buttons.xml
@@ -62,17 +62,18 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <ImageButton
+    <ImageView
       android:id="@+id/dog_btn_bg"
-      style="@style/MwmWidget.MapButton.Traffic"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
       android:layout_gravity="center"
       android:src="?attr/bg_dog_btn"/>
 
-    <ImageButton
+    <ImageView
       android:id="@+id/subs_screen_btn"
-      style="@style/MwmWidget.MapButton.Traffic"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
       android:layout_gravity="center"
-      android:src="@drawable/ic_dog"
-      android:background="@null"/>
+      android:src="@drawable/ic_dog"/>
   </FrameLayout>
 </RelativeLayout>
diff --git a/android/res/layout/map_navigation_buttons.xml b/android/res/layout/map_navigation_buttons.xml
index 2b40c48a30..e5e16e1db7 100644
--- a/android/res/layout/map_navigation_buttons.xml
+++ b/android/res/layout/map_navigation_buttons.xml
@@ -62,17 +62,19 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <ImageButton
+    <ImageView
       android:id="@+id/dog_btn_bg"
       android:layout_gravity="center"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
       style="@style/MwmWidget.MapButton.Traffic"
       android:src="?attr/bg_dog_btn"/>
 
-    <ImageButton
+    <ImageView
       android:id="@+id/subs_screen_btn"
-      style="@style/MwmWidget.MapButton.Traffic"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
       android:layout_gravity="center"
-      android:background="@null"
       android:src="@drawable/ic_dog"/>
   </FrameLayout>
 </RelativeLayout>
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 7f534f2c6c..8e9b1d87b4 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -74,7 +74,6 @@ import com.mapswithme.maps.maplayer.traffic.widget.TrafficButton;
 import com.mapswithme.maps.metrics.UserActionsLogger;
 import com.mapswithme.maps.onboarding.IntroductionDialogFragment;
 import com.mapswithme.maps.onboarding.IntroductionScreenFactory;
-import com.mapswithme.maps.onboarding.OnboardingScreen;
 import com.mapswithme.maps.onboarding.OnboardingTip;
 import com.mapswithme.maps.promo.Promo;
 import com.mapswithme.maps.promo.PromoAfterBooking;
@@ -724,7 +723,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     initToggleMapLayerController(frame);
     View openSubsScreenBtnContainer = frame.findViewById(R.id.subs_screen_btn_container);
-    boolean hasOnBoardingView = OnboardingTip.get() != null;
+    boolean hasOnBoardingView = OnboardingTip.get() != null
+                                && MwmApplication.from(this).isFirstLaunch();
 
     mNavAnimationController = new NavigationButtonsAnimationController(
         zoomIn, zoomOut, myPosition, getWindow().getDecorView().getRootView(), this,
@@ -744,9 +744,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     OnboardingTip tip = Objects.requireNonNull(OnboardingTip.get());
 
-    OnboardingScreen screen = OnboardingScreen.values()[tip.getType()];
-    screen.getOnboardingActivityLauncher().launchScreen(this, tip.getUrl());
-    UserActionsLogger.logCrownClicked();
     Statistics.ParameterBuilder builder = Statistics.makeGuidesSubscriptionBuilder();
     Statistics.INSTANCE.trackEvent(Statistics.EventName.MAP_SPONSORED_BUTTON_CLICK, builder);
     if (mNavAnimationController == null)
diff --git a/android/src/com/mapswithme/maps/onboarding/BuySubscriptionScreenLauncher.java b/android/src/com/mapswithme/maps/onboarding/BuySubscriptionScreenLauncher.java
deleted file mode 100644
index fb97515749..0000000000
--- a/android/src/com/mapswithme/maps/onboarding/BuySubscriptionScreenLauncher.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mapswithme.maps.onboarding;
-
-import android.content.Intent;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import com.mapswithme.maps.purchase.BookmarksAllSubscriptionActivity;
-
-public class BuySubscriptionScreenLauncher implements OnboardingScreenLauncher
-{
-  @Override
-  public void launchScreen(@NonNull FragmentActivity activity, @NonNull String url)
-  {
-    activity.startActivity(new Intent(activity, BookmarksAllSubscriptionActivity.class));
-  }
-}
diff --git a/android/src/com/mapswithme/maps/onboarding/OnboardingScreen.java b/android/src/com/mapswithme/maps/onboarding/OnboardingScreen.java
deleted file mode 100644
index 04753286a0..0000000000
--- a/android/src/com/mapswithme/maps/onboarding/OnboardingScreen.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mapswithme.maps.onboarding;
-
-import androidx.annotation.NonNull;
-
-public enum OnboardingScreen
-{
-  DISCOVER_CATALOG(new OpenCatalogLauncher()),
-  DOWNLOAD_SAMPLES(new OpenCatalogLauncher()),
-  BUY_SUBSCRIPTION(new BuySubscriptionScreenLauncher());
-
-  @NonNull
-  private final OnboardingScreenLauncher mLauncher;
-
-  OnboardingScreen(@NonNull OnboardingScreenLauncher launcher)
-  {
-    mLauncher = launcher;
-  }
-
-  @NonNull
-  public OnboardingScreenLauncher getOnboardingActivityLauncher()
-  {
-    return mLauncher;
-  }
-}
diff --git a/android/src/com/mapswithme/maps/onboarding/OnboardingScreenLauncher.java b/android/src/com/mapswithme/maps/onboarding/OnboardingScreenLauncher.java
deleted file mode 100644
index 17f888467a..0000000000
--- a/android/src/com/mapswithme/maps/onboarding/OnboardingScreenLauncher.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mapswithme.maps.onboarding;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-
-public interface OnboardingScreenLauncher
-{
-  void launchScreen(@NonNull FragmentActivity activity, @NonNull String url);
-}
diff --git a/android/src/com/mapswithme/maps/onboarding/OpenCatalogLauncher.java b/android/src/com/mapswithme/maps/onboarding/OpenCatalogLauncher.java
deleted file mode 100644
index c6ba1276e4..0000000000
--- a/android/src/com/mapswithme/maps/onboarding/OpenCatalogLauncher.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mapswithme.maps.onboarding;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity;
-
-public class OpenCatalogLauncher implements OnboardingScreenLauncher
-{
-  @Override
-  public void launchScreen(@NonNull FragmentActivity activity, @NonNull String url)
-  {
-    BookmarksCatalogActivity.start(activity, url);
-  }
-}