diff --git a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
index 42c222cb4..f09a0574f 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
@@ -35,6 +35,7 @@ import {
   ApiOutlined,
   AppstoreAddOutlined,
   BellOutlined,
+  BugOutlined,
   ExportOutlined,
   FileExclamationOutlined,
   LayoutOutlined,
@@ -111,7 +112,7 @@ export const Navbar = withTrackingScope(function Navbar({
         <StatusMessage />
         <NavbarScreenshotButton />
         <NavbarScreenRecordButton />
-        <LaunchEmulatorButton />
+        <LaunchVirtualDeviceButton />
         {getRenderHostInstance().GK('flipper_connection_troubleshoot') && (
           <ConnectionTroubleshootButton
             toplevelSelection={toplevelSelection}
@@ -141,6 +142,7 @@ export const Navbar = withTrackingScope(function Navbar({
           toplevelSelection={toplevelSelection}
           setToplevelSelection={setToplevelSelection}
         />
+        <TroubleshootMenu />
         <ExtrasMenu />
         <SetupDoctorButton />
         <ExportEverythingEverywhereAllAtOnceButton />
@@ -364,13 +366,13 @@ function RightSidebarToggleButton() {
   );
 }
 
-function LaunchEmulatorButton() {
+function LaunchVirtualDeviceButton() {
   const store = useStore();
 
   return (
     <NavbarButton
       icon={RocketOutlined}
-      label="Start [E/Si]mulator"
+      label="Virtual Device"
       onClick={() => {
         showEmulatorLauncher(store);
       }}
@@ -645,6 +647,27 @@ const submenu = css`
   }
 `;
 
+function TroubleshootMenu() {
+  return (
+    <Menu
+      mode="vertical"
+      className={menu}
+      selectable={false}
+      style={{backgroundColor: theme.backgroundDefault}}>
+      <Menu.SubMenu
+        popupOffset={[-90, 50]}
+        key="extras"
+        title={<NavbarButton icon={BugOutlined} label="Troubleshoot" />}
+        className={submenu}>
+        <Menu.Item>TODO troubleshooting guide</Menu.Item>
+        <Menu.Item>TODO troubleshoot</Menu.Item>
+        <Menu.Item>TODO flipper logs</Menu.Item>
+        <Menu.Item>TODO setup doctor</Menu.Item>
+      </Menu.SubMenu>
+    </Menu>
+  );
+}
+
 function ExtrasMenu() {
   const store = useStore();