diff --git a/src/components/tool-settings/BlockSelector.tsx b/src/components/sidebar/BlockSelector.tsx
similarity index 100%
rename from src/components/tool-settings/BlockSelector.tsx
rename to src/components/sidebar/BlockSelector.tsx
diff --git a/src/components/tool-settings/ColorPicker.tsx b/src/components/sidebar/ColorPicker.tsx
similarity index 100%
rename from src/components/tool-settings/ColorPicker.tsx
rename to src/components/sidebar/ColorPicker.tsx
diff --git a/src/components/tool-settings/History.tsx b/src/components/sidebar/History.tsx
similarity index 90%
rename from src/components/tool-settings/History.tsx
rename to src/components/sidebar/History.tsx
index 5079cbb..ad8a0da 100644
--- a/src/components/tool-settings/History.tsx
+++ b/src/components/sidebar/History.tsx
@@ -1,13 +1,14 @@
 import { useContext, useEffect, useRef } from "react";
 import { HistoryContext } from "@/context/History";
 import { ScrollArea } from "@/components/ui/scroll-area";
-import { BombIcon, EraserIcon, PencilIcon, PresentationIcon, SquareDashedIcon, Trash2Icon, WandIcon } from "lucide-react";
+import { BombIcon, EraserIcon, LassoIcon, PencilIcon, PresentationIcon, SquareDashedIcon, Trash2Icon, WandIcon } from "lucide-react";
 
 const iconMap = {
 	"New Canvas": PresentationIcon,
 	Pencil: PencilIcon,
 	Eraser: EraserIcon,
 	"Rectangle Select": SquareDashedIcon,
+	Lasso: LassoIcon,
 	"Magic Wand": WandIcon,
 	"Clear All": BombIcon,
 	Delete: Trash2Icon,
diff --git a/src/components/tool-settings/Radius.tsx b/src/components/sidebar/Radius.tsx
similarity index 100%
rename from src/components/tool-settings/Radius.tsx
rename to src/components/sidebar/Radius.tsx
diff --git a/src/components/tool-settings/Replace.tsx b/src/components/sidebar/Replace.tsx
similarity index 100%
rename from src/components/tool-settings/Replace.tsx
rename to src/components/sidebar/Replace.tsx
diff --git a/src/components/tool-settings/index.tsx b/src/components/sidebar/index.tsx
similarity index 97%
rename from src/components/tool-settings/index.tsx
rename to src/components/sidebar/index.tsx
index 39c703a..6f6f6fc 100644
--- a/src/components/tool-settings/index.tsx
+++ b/src/components/sidebar/index.tsx
@@ -6,15 +6,15 @@ import { SettingsContext } from "@/context/Settings";
 import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
 import { ScrollArea } from "@/components/ui/scroll-area";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 import History from "./History";
 import ColorPicker from "./ColorPicker";
 import Replace from "./Replace";
 import Radius from "./Radius";
 import BlockSelector from "./BlockSelector";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs";
 
-function ToolSettings() {
+function Sidebar() {
 	const { settings } = useContext(SettingsContext);
 
 	const [width, setWidth] = useState(300);
@@ -145,4 +145,4 @@ function ToolSettings() {
 	);
 }
 
-export default ToolSettings;
+export default Sidebar;
diff --git a/src/pages/AppPage.tsx b/src/pages/AppPage.tsx
index 4b2c119..b6b091b 100644
--- a/src/pages/AppPage.tsx
+++ b/src/pages/AppPage.tsx
@@ -10,7 +10,7 @@ import MobileNotice from "@/components/MobileNotice";
 import Menubar from "@/components/menubar";
 import Toolbar from "@/components/toolbar";
 import Canvas from "@/components/canvas/Canvas";
-import ToolSettings from "@/components/tool-settings";
+import Sidebar from "@/components/sidebar";
 
 function AppPage() {
 	return (
@@ -27,7 +27,7 @@ function AppPage() {
 										<Menubar />
 										<Toolbar />
 										<Canvas />
-										<ToolSettings />
+										<Sidebar />
 									</main>
 								</SelectionProvider>
 							</ToolProvider>