diff --git a/crates/desktop/artcraft/tauri.artcraft_3d.conf.toml b/crates/desktop/artcraft/tauri.artcraft_3d.conf.toml
index a049179edc..69ae44539a 100644
--- a/crates/desktop/artcraft/tauri.artcraft_3d.conf.toml
+++ b/crates/desktop/artcraft/tauri.artcraft_3d.conf.toml
@@ -3,3 +3,7 @@
 frontendDist = "../../../frontend/apps/editor3d/dist"
 beforeDevCommand = "npx nx run editor3d:dev"
 devUrl = "http://localhost:5173"
+
+[[app.windows]]
+decorations = true
+title = "ArtCraft"
\ No newline at end of file
diff --git a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json b/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json
index 29720ce7a7..2c1bf75efa 100644
--- a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json
+++ b/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json
@@ -4,5 +4,16 @@
     "beforeDevCommand": "echo 'no dev'",
     "devUrl": "http://localhost:5173",
     "beforeBuildCommand": "npx nx run editor3d:build"
+  },
+  "app": {
+    "windows": [
+      {
+        "title": "ArtCraft",
+        "resizable": true,
+        "fullscreen": false,
+        "dragDropEnabled": false,
+        "decorations": false
+      }
+    ]
   }
 }
diff --git a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.toml b/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.toml
index 057dd29d0f..0a4aa9e9b2 100644
--- a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.toml
+++ b/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.toml
@@ -4,3 +4,7 @@ frontendDist = "../../../frontend/apps/editor3d/dist"
 #beforeDevCommand = "nx run editor3d:dev"
 beforeDevCommand = "echo 'no dev'"
 devUrl = "http://localhost:5173"
+
+[[app.windows]]
+decorations = true
+title = "ArtCraft"
diff --git a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev_windows.conf.json b/crates/desktop/artcraft/tauri.artcraft_3d.no_dev_windows.conf.json
index 29720ce7a7..2c1bf75efa 100644
--- a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev_windows.conf.json
+++ b/crates/desktop/artcraft/tauri.artcraft_3d.no_dev_windows.conf.json
@@ -4,5 +4,16 @@
     "beforeDevCommand": "echo 'no dev'",
     "devUrl": "http://localhost:5173",
     "beforeBuildCommand": "npx nx run editor3d:build"
+  },
+  "app": {
+    "windows": [
+      {
+        "title": "ArtCraft",
+        "resizable": true,
+        "fullscreen": false,
+        "dragDropEnabled": false,
+        "decorations": false
+      }
+    ]
   }
 }
diff --git a/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx b/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx
index 56272cdc9d..178286613f 100644
--- a/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx
+++ b/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx
@@ -150,28 +150,7 @@ export const TopBar = ({ pageName, loginSignUpPressed }: Props) => {
           aria-label="navigation"
         >
           <div className="flex items-center gap-3">
-            {isDesktop && platform === "macos" && (
-              <div className="no-drag me-2 flex items-center gap-2">
-                <button
-                  aria-label="Close"
-                  onClick={close}
-                  className="h-[12px] w-[12px] rounded-full transition-opacity duration-200 hover:opacity-60"
-                  style={{ backgroundColor: "#ff5f57" }}
-                />
-                <button
-                  aria-label="Minimize"
-                  onClick={minimize}
-                  className="h-[12px] w-[12px] rounded-full transition-opacity duration-200 hover:opacity-60"
-                  style={{ backgroundColor: "#febc2e" }}
-                />
-                <button
-                  aria-label="Enter Fullscreen"
-                  onClick={toggleMaximize}
-                  className="h-[12px] w-[12px] rounded-full transition-opacity duration-200 hover:opacity-60"
-                  style={{ backgroundColor: "#28c840" }}
-                />
-              </div>
-            )}
+            
             <div className="mr-2">
               <span className="sr-only">ArtCraft</span>
               <img