diff --git a/src/components/map/controls/DrawingToolSettings.tsx b/src/components/controls/DrawingToolSettings.tsx
similarity index 82%
rename from src/components/map/controls/DrawingToolSettings.tsx
rename to src/components/controls/DrawingToolSettings.tsx
index e66205e..b9cd167 100644
--- a/src/components/map/controls/DrawingToolSettings.tsx
+++ b/src/components/controls/DrawingToolSettings.tsx
@@ -2,34 +2,34 @@ import { useEffect } from "react";
 import { Flex, IconButton } from "theme-ui";
 import { useMedia } from "react-media";
 
-import RadioIconButton from "../../RadioIconButton";
+import RadioIconButton from "../RadioIconButton";
 
-import ColorControl from "./ColorControl";
-import AlphaBlendToggle from "./AlphaBlendToggle";
-import ToolSection from "./ToolSection";
+import ColorControl from "./shared/ColorControl";
+import AlphaBlendToggle from "./shared/AlphaBlendToggle";
+import ToolSection from "./shared/ToolSection";
 
-import BrushIcon from "../../../icons/BrushToolIcon";
-import BrushPaintIcon from "../../../icons/BrushPaintIcon";
-import BrushLineIcon from "../../../icons/BrushLineIcon";
-import BrushRectangleIcon from "../../../icons/BrushRectangleIcon";
-import BrushCircleIcon from "../../../icons/BrushCircleIcon";
-import BrushTriangleIcon from "../../../icons/BrushTriangleIcon";
-import EraseAllIcon from "../../../icons/EraseAllIcon";
-import EraseIcon from "../../../icons/EraseToolIcon";
+import BrushIcon from "../../icons/BrushToolIcon";
+import BrushPaintIcon from "../../icons/BrushPaintIcon";
+import BrushLineIcon from "../../icons/BrushLineIcon";
+import BrushRectangleIcon from "../../icons/BrushRectangleIcon";
+import BrushCircleIcon from "../../icons/BrushCircleIcon";
+import BrushTriangleIcon from "../../icons/BrushTriangleIcon";
+import EraseAllIcon from "../../icons/EraseAllIcon";
+import EraseIcon from "../../icons/EraseToolIcon";
 
-import UndoButton from "./UndoButton";
-import RedoButton from "./RedoButton";
+import UndoButton from "./shared/UndoButton";
+import RedoButton from "./shared/RedoButton";
 
-import Divider from "../../Divider";
+import Divider from "../Divider";
 
-import { useKeyboard } from "../../../contexts/KeyboardContext";
+import { useKeyboard } from "../../contexts/KeyboardContext";
 
-import shortcuts from "../../../shortcuts";
+import shortcuts from "../../shortcuts";
 
 import {
   DrawingToolSettings as DrawingToolSettingsType,
   DrawingToolType,
-} from "../../../types/Drawing";
+} from "../../types/Drawing";
 
 type DrawingToolSettingsProps = {
   settings: DrawingToolSettingsType;
diff --git a/src/components/map/controls/FogToolSettings.tsx b/src/components/controls/FogToolSettings.tsx
similarity index 82%
rename from src/components/map/controls/FogToolSettings.tsx
rename to src/components/controls/FogToolSettings.tsx
index 47d47f1..f227d1f 100644
--- a/src/components/map/controls/FogToolSettings.tsx
+++ b/src/components/controls/FogToolSettings.tsx
@@ -1,32 +1,32 @@
 import { Flex } from "theme-ui";
 import { useMedia } from "react-media";
 
-import RadioIconButton from "../../RadioIconButton";
+import RadioIconButton from "../RadioIconButton";
 
-import MultilayerToggle from "./MultilayerToggle";
-import FogPreviewToggle from "./FogPreviewToggle";
-import FogCutToggle from "./FogCutToggle";
+import MultilayerToggle from "./shared/MultilayerToggle";
+import FogPreviewToggle from "./shared/FogPreviewToggle";
+import FogCutToggle from "./shared/FogCutToggle";
 
-import FogBrushIcon from "../../../icons/FogBrushIcon";
-import FogPolygonIcon from "../../../icons/FogPolygonIcon";
-import FogRemoveIcon from "../../../icons/FogRemoveIcon";
-import FogToggleIcon from "../../../icons/FogToggleIcon";
-import FogRectangleIcon from "../../../icons/FogRectangleIcon";
+import FogBrushIcon from "../../icons/FogBrushIcon";
+import FogPolygonIcon from "../../icons/FogPolygonIcon";
+import FogRemoveIcon from "../../icons/FogRemoveIcon";
+import FogToggleIcon from "../../icons/FogToggleIcon";
+import FogRectangleIcon from "../../icons/FogRectangleIcon";
 
-import UndoButton from "./UndoButton";
-import RedoButton from "./RedoButton";
-import ToolSection from "./ToolSection";
+import UndoButton from "./shared/UndoButton";
+import RedoButton from "./shared/RedoButton";
+import ToolSection from "./shared/ToolSection";
 
-import Divider from "../../Divider";
+import Divider from "../Divider";
 
-import { useKeyboard } from "../../../contexts/KeyboardContext";
+import { useKeyboard } from "../../contexts/KeyboardContext";
 
-import shortcuts from "../../../shortcuts";
+import shortcuts from "../../shortcuts";
 
 import {
   FogToolSettings as FogToolSettingsType,
   FogToolType,
-} from "../../../types/Fog";
+} from "../../types/Fog";
 
 type FogToolSettingsProps = {
   settings: FogToolSettingsType;
diff --git a/src/components/map/controls/PointerToolSettings.tsx b/src/components/controls/PointerToolSettings.tsx
similarity index 89%
rename from src/components/map/controls/PointerToolSettings.tsx
rename to src/components/controls/PointerToolSettings.tsx
index 90b570b..ebbab14 100644
--- a/src/components/map/controls/PointerToolSettings.tsx
+++ b/src/components/controls/PointerToolSettings.tsx
@@ -1,8 +1,8 @@
 import { Flex } from "theme-ui";
 
-import ColorControl from "./ColorControl";
+import ColorControl from "./shared/ColorControl";
 
-import { PointerToolSettings as PointerToolSettingsType } from "../../../types/Pointer";
+import { PointerToolSettings as PointerToolSettingsType } from "../../types/Pointer";
 
 type PointerToolSettingsProps = {
   settings: PointerToolSettingsType;
diff --git a/src/components/map/controls/SelectToolSettings.tsx b/src/components/controls/SelectToolSettings.tsx
similarity index 80%
rename from src/components/map/controls/SelectToolSettings.tsx
rename to src/components/controls/SelectToolSettings.tsx
index 1abb058..9d7a8bb 100644
--- a/src/components/map/controls/SelectToolSettings.tsx
+++ b/src/components/controls/SelectToolSettings.tsx
@@ -3,16 +3,16 @@ import { Flex } from "theme-ui";
 import {
   SelectToolSettings as SelectToolSettingsType,
   SelectToolType,
-} from "../../../types/Select";
+} from "../../types/Select";
 
-import { useKeyboard } from "../../../contexts/KeyboardContext";
+import { useKeyboard } from "../../contexts/KeyboardContext";
 
-import ToolSection from "./ToolSection";
+import ToolSection from "./shared/ToolSection";
 
-import shortcuts from "../../../shortcuts";
+import shortcuts from "../../shortcuts";
 
-import RectIcon from "../../../icons/SelectRectangleIcon";
-import PathIcon from "../../../icons/SelectPathIcon";
+import RectIcon from "../../icons/SelectRectangleIcon";
+import PathIcon from "../../icons/SelectPathIcon";
 
 type SelectToolSettingsProps = {
   settings: SelectToolSettingsType;
diff --git a/src/components/map/controls/AlphaBlendToggle.tsx b/src/components/controls/shared/AlphaBlendToggle.tsx
similarity index 100%
rename from src/components/map/controls/AlphaBlendToggle.tsx
rename to src/components/controls/shared/AlphaBlendToggle.tsx
diff --git a/src/components/map/controls/ColorControl.tsx b/src/components/controls/shared/ColorControl.tsx
similarity index 98%
rename from src/components/map/controls/ColorControl.tsx
rename to src/components/controls/shared/ColorControl.tsx
index 2ddf049..a0a3544 100644
--- a/src/components/map/controls/ColorControl.tsx
+++ b/src/components/controls/shared/ColorControl.tsx
@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import { Box, SxProp } from "theme-ui";
 
 import colors, { colorOptions, Color } from "../../../helpers/colors";
-import MapMenu from "../MapMenu";
+import MapMenu from "../../map/MapMenu";
 
 type ColorCircleProps = {
   color: Color;
diff --git a/src/components/map/controls/FogCutToggle.tsx b/src/components/controls/shared/FogCutToggle.tsx
similarity index 100%
rename from src/components/map/controls/FogCutToggle.tsx
rename to src/components/controls/shared/FogCutToggle.tsx
diff --git a/src/components/map/controls/FogPreviewToggle.tsx b/src/components/controls/shared/FogPreviewToggle.tsx
similarity index 100%
rename from src/components/map/controls/FogPreviewToggle.tsx
rename to src/components/controls/shared/FogPreviewToggle.tsx
diff --git a/src/components/map/controls/MultilayerToggle.tsx b/src/components/controls/shared/MultilayerToggle.tsx
similarity index 100%
rename from src/components/map/controls/MultilayerToggle.tsx
rename to src/components/controls/shared/MultilayerToggle.tsx
diff --git a/src/components/map/controls/RedoButton.tsx b/src/components/controls/shared/RedoButton.tsx
similarity index 100%
rename from src/components/map/controls/RedoButton.tsx
rename to src/components/controls/shared/RedoButton.tsx
diff --git a/src/components/map/controls/ToolSection.tsx b/src/components/controls/shared/ToolSection.tsx
similarity index 100%
rename from src/components/map/controls/ToolSection.tsx
rename to src/components/controls/shared/ToolSection.tsx
diff --git a/src/components/map/controls/UndoButton.tsx b/src/components/controls/shared/UndoButton.tsx
similarity index 100%
rename from src/components/map/controls/UndoButton.tsx
rename to src/components/controls/shared/UndoButton.tsx
diff --git a/src/components/map/MapControls.tsx b/src/components/map/MapControls.tsx
index 71c40dd..5e88a9e 100644
--- a/src/components/map/MapControls.tsx
+++ b/src/components/map/MapControls.tsx
@@ -6,10 +6,10 @@ import Divider from "../Divider";
 
 import SelectMapButton from "./SelectMapButton";
 
-import FogToolSettings from "./controls/FogToolSettings";
-import DrawingToolSettings from "./controls/DrawingToolSettings";
-import PointerToolSettings from "./controls/PointerToolSettings";
-import SelectToolSettings from "./controls/SelectToolSettings";
+import FogToolSettings from "../controls/FogToolSettings";
+import DrawingToolSettings from "../controls/DrawingToolSettings";
+import PointerToolSettings from "../controls/PointerToolSettings";
+import SelectToolSettings from "../controls/SelectToolSettings";
 
 import MoveToolIcon from "../../icons/MoveToolIcon";
 import FogToolIcon from "../../icons/FogToolIcon";