diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java
index d1396ec8b..f68f333a2 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java
@@ -22,6 +22,7 @@ import com.vk.music.fragment.MusicFragment;
 import com.vk.newsfeed.HomeFragment;
 import com.vk.newsfeed.NewsfeedFragment;
 import com.vk.notifications.NotificationsContainerFragment;
+import com.vk.profile.catalog.CommunitiesCatalogFragment;
 import com.vk.search.fragment.GroupsSearchFragment;
 import com.vk.superapp.SuperAppFragment;
 import com.vtosters.lite.R;
@@ -132,6 +133,10 @@ public class DockBarManager{
                     tab.iconID = R.drawable.ic_users_outline_28;
                 }
 
+                if (milkshake() && GroupsFragment1.class == tab.fragmentClass) {
+                    tab.fragmentClass = CommunitiesCatalogFragment.class;
+                }
+
             } else {
                 if (HomeFragment.class == tab.fragmentClass)
                     tab.fragmentClass = NewsfeedFragment.class;
@@ -146,6 +151,14 @@ public class DockBarManager{
                     tab.fragmentClass = ThemedFeedFragment.class;
                 }
 
+                if (SearchMenuFragment.class == tab.fragmentClass) {
+                    tab.fragmentClass = ThemedFeedFragment.class;
+                }
+
+                if (CommunitiesCatalogFragment.class == tab.fragmentClass) {
+                    tab.fragmentClass = GroupsFragment1.class;
+                }
+
                 if (FriendsCatalogFragment.class == tab.fragmentClass) {
                     tab.fragmentClass = NotificationsContainerFragment.class;
                     tab.iconID = R.drawable.ic_menu_notification_outline_28;
@@ -229,7 +242,7 @@ public class DockBarManager{
                 R.drawable.ic_users_outline_28,
                 R.string.groups,
                 R.id.menu_groups,
-                GroupsFragment1.class));
+                milkshake() ? CommunitiesCatalogFragment.class : GroupsFragment1.class));
         mDisabledTabs.add(DockBarTab.valuesOf(
                 "tab_photos",
                 R.drawable.ic_camera_outline_28,
diff --git a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java
index a98a0f6a2..5760ac731 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java
@@ -30,6 +30,7 @@ import com.vk.music.fragment.MusicFragment;
 import com.vk.newsfeed.HomeFragment;
 import com.vk.newsfeed.NewsfeedFragment;
 import com.vk.notifications.NotificationsContainerFragment;
+import com.vk.profile.catalog.CommunitiesCatalogFragment;
 import com.vk.search.fragment.GroupsSearchFragment;
 import com.vk.superapp.SuperAppFragment;
 import com.vtosters.lite.fragments.ProfileFragment;
@@ -255,7 +256,7 @@ public class Newsfeed{
             case "messenger":
                 return DialogsFragment.class;
             case "groups":
-                return GroupsFragment1.class;
+                return milkshake() ? CommunitiesCatalogFragment.class : GroupsFragment1.class;
             case "music":
                 return getBoolValue("musicnewcatalog", true) ? MusicCatalogFragment1.class : MusicFragment.class;
             case "friends":