diff --git a/web/app.react.js b/web/app.react.js
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -48,13 +48,13 @@
 import history from './router-history';
 import AccountSettings from './settings/account-settings.react';
 import DangerZone from './settings/danger-zone.react';
-import AppSwitcher from './sidebar/app-switcher.react';
 import CommunityPicker from './sidebar/community-picker.react';
-import SettingsSwitcher from './sidebar/settings-switcher.react';
 import Splash from './splash/splash.react';
 import './typography.css';
 import css from './style.css';
 import getTitle from './title/getTitle';
+import AppSwitcher from './topbar/app-switcher.react';
+import SettingsSwitcher from './topbar/settings-switcher.react';
 import { type NavInfo } from './types/nav-types';
 import { canonicalURLFromReduxState, navInfoFromURL } from './url-utils';
 
diff --git a/web/sidebar/app-switcher.react.js b/web/topbar/app-switcher.react.js
rename from web/sidebar/app-switcher.react.js
rename to web/topbar/app-switcher.react.js
--- a/web/sidebar/app-switcher.react.js
+++ b/web/topbar/app-switcher.react.js
@@ -12,8 +12,8 @@
 import { useSelector } from '../redux/redux-utils';
 import { navTabSelector } from '../selectors/nav-selectors.js';
 import SWMansionIcon from '../SWMansionIcon.react';
-import css from './left-layout-aside.css';
 import NavigationPanel from './navigation-panel.react';
+import css from './topbar.css';
 
 function AppSwitcher(): React.Node {
   const activeChatThreadID = useSelector(
diff --git a/web/sidebar/navigation-panel.react.js b/web/topbar/navigation-panel.react.js
rename from web/sidebar/navigation-panel.react.js
rename to web/topbar/navigation-panel.react.js
--- a/web/sidebar/navigation-panel.react.js
+++ b/web/topbar/navigation-panel.react.js
@@ -5,7 +5,7 @@
 
 import type { AppState } from '../redux/redux-setup.js';
 import { useSelector } from '../redux/redux-utils';
-import css from './left-layout-aside.css';
+import css from './topbar.css';
 
 type NavigationPanelItemProps = {
   +tab: string,
diff --git a/web/sidebar/settings-switcher.react.js b/web/topbar/settings-switcher.react.js
rename from web/sidebar/settings-switcher.react.js
rename to web/topbar/settings-switcher.react.js
--- a/web/sidebar/settings-switcher.react.js
+++ b/web/topbar/settings-switcher.react.js
@@ -5,8 +5,8 @@
 
 import { updateNavInfoActionType } from '../redux/action-types';
 import { navSettingsSectionSelector } from '../selectors/nav-selectors.js';
-import css from './left-layout-aside.css';
 import NavigationPanel from './navigation-panel.react';
+import css from './topbar.css';
 
 function SettingsSwitcher(): React.Node {
   const dispatch = useDispatch();
diff --git a/web/sidebar/left-layout-aside.css b/web/topbar/topbar.css
rename from web/sidebar/left-layout-aside.css
rename to web/topbar/topbar.css