diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java
index 8c6ba533d..903161b35 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java
@@ -16,30 +16,33 @@ import android.widget.TextView;
 import com.vtosters.lite.R;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.utils.Themes;
 
-public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditViewHolder>
+public class DockBarAdapter extends RecyclerView.a
         implements IItemTouchHelper {
 
     public static final int SELECTED_TAB_TYPE = 1;
     public static final int DISABLED_TAB_TYPE = 2;
+    public static final int GROUP_TITLE_TYPE = 3;
 
+    
     private final DockBarManager mDockBarManager = DockBarManager.getInstance();
 
     @Override
-    public DockBarEditViewHolder b(ViewGroup parent, int i) {
-        LinearLayout container = new LinearLayout(parent.getContext());
-        container.setLayoutParams(new LinearLayout.LayoutParams(-1, -2));
+    public RecyclerView.x b(ViewGroup parent, int viewType) {
+        if (viewType == GROUP_TITLE_TYPE) {
+            return new GroupViewHolder(createGroupTitle());
+        } else {
+            return new DockBarEditViewHolder(createTabItem());
+        }
+    }
 
-        View tabItem = createTabItem();
-        container.addView(tabItem, new LinearLayout.LayoutParams(-1, -2));
-
-        View groupTitle = createGroupTitle();
-        container.addView(groupTitle, new LinearLayout.LayoutParams(-1, -2));
-
-        return new DockBarEditViewHolder(container);
+    @Override
+    public int b(int i) {
+        return getItemType(i);
     }
 
     private View createTabItem() {
@@ -54,7 +57,6 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
                 Helper.convertDpToPixel(12)
         );
         container.setLayoutParams(new LinearLayout.LayoutParams(-1, Helper.convertDpToPixel(48)));
-        container.setVisibility(View.GONE);
 
         ImageView icon = new ImageView(Helper.GetContext());
         icon.setTag("icon");
@@ -69,23 +71,18 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
         title.setTextSize(16.0f);
         title.setTypeface(Typeface.DEFAULT_BOLD);
         title.setTextColor(Themes.getTextAttr());
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0, -2);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(-1, -2);
         params.weight = 1;
         params.leftMargin = Helper.convertDpToPixel(16);
         container.addView(title, params);
 
-//        ImageView move = new ImageView(Helper.GetContext());
-//        move.setTag("move");
-//        move.setImageTintList(ColorStateList.valueOf(textSecondary));
-//        move.setLayoutParams(new LinearLayout.LayoutParams(
-//                Helper.convertDpToPixel(24),
-//                Helper.convertDpToPixel(24)));
-//        container.addView(move);
-
         return container;
     }
 
     private View createGroupTitle() {
+        LinearLayout layout = new LinearLayout(Helper.GetContext());
+        layout.setLayoutParams(new LinearLayout.LayoutParams(-1, -2));
+
         TextView title = new TextView(Helper.GetContext());
         title.setTag("group_title");
         title.setTextSize(13.0f);
@@ -96,23 +93,23 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
                 Helper.convertDpToPixel(13)
         );
         title.setAllCaps(true);
-        title.setLayoutParams(new LinearLayout.LayoutParams(-1, -2));
-        title.setVisibility(View.GONE);
-
         title.setTextColor(Themes.getTextAttr());
+        layout.addView(title, new LinearLayout.LayoutParams(-2, -2));
 
-        return title;
+        return layout;
     }
 
     @Override
-    public void a(DockBarEditViewHolder holder, int position) {
-        int viewType = mDockBarManager.getItemType(position);
-        if (viewType == 1) {
-            holder.bind(mDockBarManager.getSelectedTab(position));
-        } else if (viewType == 2) {
-            holder.bind(mDockBarManager.getDisabledTab(position));
-        } else if (viewType == androidx.recyclerview.widget.RecyclerView.INVALID_TYPE) {
-            holder.bind(mDockBarManager.getGroupTitle(position));
+    public void a(RecyclerView.x holder, int position) {
+        if (holder instanceof GroupViewHolder) {
+            ((GroupViewHolder) holder).bind(mDockBarManager.getGroupTitle(position));
+        } else {
+            int viewType = getItemType(position);
+            if (viewType == SELECTED_TAB_TYPE) {
+                ((DockBarEditViewHolder) holder).bind(mDockBarManager.getSelectedTab(position));
+            } else if (viewType == DISABLED_TAB_TYPE) {
+                ((DockBarEditViewHolder) holder).bind(mDockBarManager.getDisabledTab(position));
+            }
         }
     }
 
@@ -136,7 +133,7 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
             if (fromViewType != toViewType) {
                 mDockBarManager.swapAndMigrate(this, fromPosition, toPosition);
             } else {
-                List<DockBarTab> list = fromViewType == 1 ? mDockBarManager.getSelectedTabs() : mDockBarManager.getDisabledTabs();
+                List<DockBarTab> list = fromViewType == SELECTED_TAB_TYPE ? mDockBarManager.getSelectedTabs() : mDockBarManager.getDisabledTabs();
                 mDockBarManager.swap(this, list, fromViewType, fromPosition, toPosition);
             }
 
@@ -145,7 +142,7 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
             if (fromViewType != toViewType) {
                 mDockBarManager.swapAndMigrate(this, fromPosition, toPosition);
             } else {
-                List<DockBarTab> list = fromViewType == 1 ? mDockBarManager.getSelectedTabs() : mDockBarManager.getDisabledTabs();
+                List<DockBarTab> list = fromViewType == SELECTED_TAB_TYPE ? mDockBarManager.getSelectedTabs() : mDockBarManager.getDisabledTabs();
                 mDockBarManager.swap(this, list, fromViewType, fromPosition, toPosition);
             }
 
@@ -162,35 +159,35 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
         return mDockBarManager.getItemType(position);
     }
 
-
     static class DockBarEditViewHolder extends RecyclerView.x {
 
-        private LinearLayout mTabContainer;
         private ImageView mIcon;
         private TextView mTitle;
-//        private ImageView mMove;
-
-        private TextView mGroupTitle;
 
         public DockBarEditViewHolder(View itemView) {
             super(itemView);
 
-            mTabContainer = itemView.findViewWithTag("tab_item_container");
             mIcon = itemView.findViewWithTag("icon");
             mTitle = itemView.findViewWithTag("title");
-//            mMove = itemView.findViewWithTag("move");
-
-            mGroupTitle = itemView.findViewWithTag("group_title");
         }
 
         public void bind(DockBarTab tab) {
-            mTabContainer.setVisibility(View.VISIBLE);
             mIcon.setImageResource(tab.iconID);
             mTitle.setText(tab.titleID);
         }
+    }
+
+    static class GroupViewHolder extends RecyclerView.x {
+
+        private TextView mGroupTitle;
+
+        public GroupViewHolder(View view) {
+            super(view);
+
+            mGroupTitle = view.findViewWithTag("group_title");
+        }
 
         public void bind(String groupTitle) {
-            mGroupTitle.setVisibility(View.VISIBLE);
             mGroupTitle.setText(groupTitle);
         }
     }
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java
index 20f8a472b..6826a254b 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java
@@ -5,17 +5,12 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.a.ItemTouchHelper;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
-
-import java.io.File;
 
 import me.grishka.appkit.fragments.ToolbarFragment;
 import ru.vtosters.lite.utils.Helper;
@@ -32,7 +27,6 @@ public class DockBarFragment extends ToolbarFragment {
 
         LinearLayout container = new LinearLayout(n());
         container.setLayoutParams(new FrameLayout.LayoutParams(-1, -1));
-        container.setGravity(Gravity.CENTER);
         container.setOrientation(LinearLayout.VERTICAL);
 
         LinearLayout buttonsContainer = new LinearLayout(n());
@@ -91,12 +85,4 @@ public class DockBarFragment extends ToolbarFragment {
 
         a("Редактор докбара");
     }
-
-
-
-   /* @Override
-    public void A_() {
-        super.A_();
-
-    }*/
 }
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 711af8cc3..2e2175ee0 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
@@ -277,21 +277,20 @@ public class DockBarManager {
             return position - 1;
         } else if (viewType == DockBarAdapter.DISABLED_TAB_TYPE) {
             return position - mSelectedTabs.size() - mGroups.size();
-        } else if (viewType == RecyclerView.INVALID_TYPE){
-            return position != 0 ? 1 : 0;
         } else {
-            return -1;
+            return position != 0 ? 1 : 0;
         }
     }
 
     public int getItemType(int position) {
         if (position == 0 || position == mSelectedTabs.size() + 1) {
-            return RecyclerView.INVALID_TYPE;
+            return DockBarAdapter.GROUP_TITLE_TYPE;
         } else if (position - 1 < mSelectedTabs.size()) {
             return DockBarAdapter.SELECTED_TAB_TYPE;
-        } else {
+        } else if (position - 1 >= mSelectedTabs.size()) {
             return DockBarAdapter.DISABLED_TAB_TYPE;
         }
+        return -1;
     }
 
     public DockBarTab getSelectedTab(int pos) {
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java
index 245f29c65..efd78dc03 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java
@@ -13,20 +13,20 @@ public class ItemTouchHelperCallback extends ItemTouchHelper.a {
         this.mAdapter = mAdapter;
     }
 
-    @Override // isItemViewSwipeEnabled
+    @Override // isLongPressDragEnabled
     public boolean a() {
         return true;
     }
 
-    @Override // isLongPressDragEnabled
+    @Override // isItemViewSwipeEnabled
     public boolean b() {
-        return true;
+        return false;
     }
 
     @Override
     public int a(RecyclerView recyclerView, RecyclerView.x viewHolder) {
         int pos = mAdapter.getItemType(viewHolder.d());
-        int dragFlags = pos != androidx.recyclerview.widget.RecyclerView.INVALID_TYPE ? androidx.recyclerview.widget.ItemTouchHelper.UP | androidx.recyclerview.widget.ItemTouchHelper.DOWN : 0;
+        int dragFlags = pos != DockBarAdapter.GROUP_TITLE_TYPE ? androidx.recyclerview.widget.ItemTouchHelper.UP | androidx.recyclerview.widget.ItemTouchHelper.DOWN : 0;
         int swipeFlags = pos == 1 ? androidx.recyclerview.widget.ItemTouchHelper.START | androidx.recyclerview.widget.ItemTouchHelper.END : 0;
         return makeMovementFlags(dragFlags, swipeFlags);
     }
@@ -38,7 +38,7 @@ public class ItemTouchHelperCallback extends ItemTouchHelper.a {
 
     @Override
     public boolean b(RecyclerView recyclerView, RecyclerView.x viewHolder, RecyclerView.x target) {
-        if (mAdapter.getItemType(viewHolder.d()) == androidx.recyclerview.widget.RecyclerView.INVALID_TYPE)
+        if (mAdapter.getItemType(viewHolder.d()) == DockBarAdapter.GROUP_TITLE_TYPE)
             return false;
         return mAdapter.onItemMove(viewHolder.d(), target.d());
     }