diff --git a/src/app/containers/page.tsx b/src/app/containers/page.tsx
index 62590e4..b273773 100644
--- a/src/app/containers/page.tsx
+++ b/src/app/containers/page.tsx
@@ -1,10 +1,10 @@
 "use client";
 
 import { DashboardLayout } from "@/components/dashboard/DashboardLayout";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Card, CardContent } from "@/components/ui/card";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import { MoreVertical, Play, Square, Trash2, Container } from "lucide-react";
+import { MoreVertical, Play, Square, Container } from "lucide-react";
 import { useEffect, useState } from "react";
 import { getDocker, removeContainer } from "@/core/docker";
 import { getNodes } from "@/core/node";
@@ -239,17 +239,23 @@ export default function ContainersPage() {
 
                 <div className="flex justify-end gap-1 pt-2">
                   {container.status === "running" ? (
-                    <Button variant="ghost" size="icon-sm">
+                    <Button
+                      variant="ghost"
+                      size="icon-sm"
+                      onClick={() => stopContainer(container.id)}
+                    >
                       <Square className="w-3 h-3" />
                     </Button>
                   ) : (
-                    <Button variant="ghost" size="icon-sm">
+                    <Button
+                      variant="ghost"
+                      size="icon-sm"
+                      onClick={() => startContainer(container.id)}
+                    >
                       <Play className="w-3 h-3" />
                     </Button>
                   )}
-                  <Button variant="ghost" size="icon-sm">
-                    <Trash2 className="w-3 h-3" />
-                  </Button>
+                  <RemoveDialog remove={() => removeContainer(container.id)} />
                   <Button variant="ghost" size="icon-sm">
                     <MoreVertical className="w-3 h-3" />
                   </Button>
diff --git a/src/app/environment/page.tsx b/src/app/environment/page.tsx
index fb43a13..286428d 100644
--- a/src/app/environment/page.tsx
+++ b/src/app/environment/page.tsx
@@ -6,16 +6,7 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { Input } from "@/components/ui/input";
-import {
-  Plus,
-  Trash2,
-  Eye,
-  EyeOff,
-  Copy,
-  Save,
-  Lock,
-  Loader2,
-} from "lucide-react";
+import { Trash2, Eye, EyeOff, Copy, Save, Lock, Loader2 } from "lucide-react";
 import { Env } from "@/lib/types";
 import { getEnv, setEnv } from "@/core/application";
 import { AddVariableDialog } from "@/components/dialogs/AddVariable";
diff --git a/src/app/nodes/page.tsx b/src/app/nodes/page.tsx
index 28820b7..21328c9 100644
--- a/src/app/nodes/page.tsx
+++ b/src/app/nodes/page.tsx
@@ -4,7 +4,7 @@ import { DashboardLayout } from "@/components/dashboard/DashboardLayout";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import { Server, Plus, Settings, Trash2 } from "lucide-react";
+import { Server, Plus, Settings } from "lucide-react";
 import { Progress } from "@/components/ui/progress";
 import { Docker, Node, NodeLiveData } from "@/lib/types";
 import { useEffect, useState } from "react";
@@ -13,6 +13,7 @@ import { formatBytes } from "@/lib/format";
 import { setNodes as updateNodes } from "@/core/node";
 import AddNode from "@/components/dialogs/AddNode";
 import { getDocker } from "@/core/docker";
+import RemoveDialog from "@/components/dialogs/Remove";
 
 function DiskUsage({ liveData }: NodeLiveData) {
   if (!liveData) return null;
@@ -97,17 +98,13 @@ export default function NodesPage() {
                 <Button variant="ghost" size="icon-sm">
                   <Settings className="w-4 h-4" />
                 </Button>
-                <Button
-                  variant="ghost"
-                  size="icon-sm"
-                  onClick={async () => {
+                <RemoveDialog
+                  remove={async () => {
                     const newNodes = nodes.filter((_, index) => index !== i);
                     setNodes(newNodes);
                     await updateNodes(newNodes);
                   }}
-                >
-                  <Trash2 className="w-4 h-4" />
-                </Button>
+                />
               </div>
             </CardHeader>
             <CardContent>