diff --git a/desktop/app/src/index.tsx b/desktop/app/src/index.tsx
index 018bdadfc..cacf31270 100644
--- a/desktop/app/src/index.tsx
+++ b/desktop/app/src/index.tsx
@@ -131,6 +131,7 @@ export {default as FlexRow} from './ui/components/FlexRow';
 export {default as FlexColumn} from './ui/components/FlexColumn';
 export {default as FlexCenter} from './ui/components/FlexCenter';
 export {default as Toolbar, Spacer} from './ui/components/Toolbar';
+export {default as ToolbarIcon} from './ui/components/ToolbarIcon';
 export {default as Panel} from './ui/components/Panel';
 export {default as Text} from './ui/components/Text';
 export {default as TextParagraph} from './ui/components/TextParagraph';
diff --git a/desktop/plugins/layout/ToolbarIcon.tsx b/desktop/app/src/ui/components/ToolbarIcon.tsx
similarity index 89%
rename from desktop/plugins/layout/ToolbarIcon.tsx
rename to desktop/app/src/ui/components/ToolbarIcon.tsx
index b301e76f4..cc864476b 100644
--- a/desktop/plugins/layout/ToolbarIcon.tsx
+++ b/desktop/app/src/ui/components/ToolbarIcon.tsx
@@ -7,7 +7,9 @@
  * @format
  */
 
-import {Glyph, styled, colors} from 'flipper';
+import Glyph from './Glyph';
+import {colors} from './colors';
+import styled from '@emotion/styled';
 import React from 'react';
 
 type Props = {
diff --git a/desktop/app/src/ui/index.tsx b/desktop/app/src/ui/index.tsx
index 7529fb731..7f861ee44 100644
--- a/desktop/app/src/ui/index.tsx
+++ b/desktop/app/src/ui/index.tsx
@@ -110,6 +110,7 @@ export {default as FlexRow} from './components/FlexRow';
 export {default as FlexColumn} from './components/FlexColumn';
 export {default as FlexCenter} from './components/FlexCenter';
 export {default as Toolbar, Spacer} from './components/Toolbar';
+export {default as ToolbarIcon} from './components/ToolbarIcon';
 export {default as Panel} from './components/Panel';
 export {default as Text} from './components/Text';
 export {default as TextParagraph} from './components/TextParagraph';
diff --git a/desktop/plugins/layout/index.tsx b/desktop/plugins/layout/index.tsx
index a0c245caf..2cc108886 100644
--- a/desktop/plugins/layout/index.tsx
+++ b/desktop/plugins/layout/index.tsx
@@ -28,9 +28,9 @@ import {
   constants,
   ReduxState,
   ArchivedDevice,
+  ToolbarIcon,
 } from 'flipper';
 import Inspector from './Inspector';
-import ToolbarIcon from './ToolbarIcon';
 import InspectorSidebar from './InspectorSidebar';
 import Search from './Search';
 import ProxyArchiveClient from './ProxyArchiveClient';