diff --git a/src/components/Topbar/Topbar.vue b/src/components/TopBar2/TopBar2.vue
similarity index 100%
rename from src/components/Topbar/Topbar.vue
rename to src/components/TopBar2/TopBar2.vue
diff --git a/src/components/Topbar/components/ChannelsPop.vue b/src/components/TopBar2/components/ChannelsPop.vue
similarity index 100%
rename from src/components/Topbar/components/ChannelsPop.vue
rename to src/components/TopBar2/components/ChannelsPop.vue
diff --git a/src/components/Topbar/components/FavoritesPop.vue b/src/components/TopBar2/components/FavoritesPop.vue
similarity index 100%
rename from src/components/Topbar/components/FavoritesPop.vue
rename to src/components/TopBar2/components/FavoritesPop.vue
diff --git a/src/components/Topbar/components/HistoryPop.vue b/src/components/TopBar2/components/HistoryPop.vue
similarity index 100%
rename from src/components/Topbar/components/HistoryPop.vue
rename to src/components/TopBar2/components/HistoryPop.vue
diff --git a/src/components/Topbar/components/MomentsPop.vue b/src/components/TopBar2/components/MomentsPop.vue
similarity index 100%
rename from src/components/Topbar/components/MomentsPop.vue
rename to src/components/TopBar2/components/MomentsPop.vue
diff --git a/src/components/Topbar/components/MorePop.vue b/src/components/TopBar2/components/MorePop.vue
similarity index 100%
rename from src/components/Topbar/components/MorePop.vue
rename to src/components/TopBar2/components/MorePop.vue
diff --git a/src/components/Topbar/components/NotificationsPop.vue b/src/components/TopBar2/components/NotificationsPop.vue
similarity index 100%
rename from src/components/Topbar/components/NotificationsPop.vue
rename to src/components/TopBar2/components/NotificationsPop.vue
diff --git a/src/components/Topbar/components/UploadPop.vue b/src/components/TopBar2/components/UploadPop.vue
similarity index 100%
rename from src/components/Topbar/components/UploadPop.vue
rename to src/components/TopBar2/components/UploadPop.vue
diff --git a/src/components/Topbar/components/UserPanelPop.vue b/src/components/TopBar2/components/UserPanelPop.vue
similarity index 100%
rename from src/components/Topbar/components/UserPanelPop.vue
rename to src/components/TopBar2/components/UserPanelPop.vue
diff --git a/src/components/Topbar/notify.ts b/src/components/TopBar2/notify.ts
similarity index 100%
rename from src/components/Topbar/notify.ts
rename to src/components/TopBar2/notify.ts
diff --git a/src/components/Topbar/types.ts b/src/components/TopBar2/types.ts
similarity index 100%
rename from src/components/Topbar/types.ts
rename to src/components/TopBar2/types.ts
diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue
index 9e9a82b3..04ba5703 100644
--- a/src/contentScripts/views/App.vue
+++ b/src/contentScripts/views/App.vue
@@ -269,14 +269,14 @@ provide('scrollbarRef', scrollbarRef)
     <!-- Topbar -->
     <div m-auto max-w="$bew-page-max-width">
       <Transition name="topbar">
-        <Topbar
+        <TopBar2
           v-if="settings.isShowTopbar && !isHomePage()"
           pos="top-0 left-0" z="99 hover:1001" w-full
           :style="{ position: isTopbarFixed ? 'fixed' : 'absolute' }"
           :show-search-bar="!isSearchPage"
           :mask="showTopbarMask"
         />
-        <Topbar
+        <TopBar2
           v-else-if="settings.isShowTopbar && isHomePage()"
           ref="topbarRef"
           :show-search-bar="showTopbarMask && settings.useSearchPageModeOnHomePage || (!settings.useSearchPageModeOnHomePage && activatedPage !== AppPage.Search || activatedPage !== AppPage.Home && activatedPage !== AppPage.Search)"