diff --git a/packages/web/index.html b/packages/web/index.html
index d48d430a..f21e342e 100644
--- a/packages/web/index.html
+++ b/packages/web/index.html
@@ -7,7 +7,7 @@
     <link rel="apple-touch-icon" href="/apple-touch-icon.png" sizes="180x180" />
 
     <link rel="manifest" href="site.webmanifest" />
-    <link rel="mask-icon" href="Logo_Black.svg" color="#67ea94" />
+    <link rel="mask-icon" href="logo_black.svg" color="#67ea94" />
     <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
     <link
       rel="stylesheet"
diff --git a/packages/web/public/diy.svg b/packages/web/public/devices/diy.svg
similarity index 100%
rename from packages/web/public/diy.svg
rename to packages/web/public/devices/diy.svg
diff --git a/packages/web/public/heltec-ht62-esp32c3-sx1262.svg b/packages/web/public/devices/heltec-ht62-esp32c3-sx1262.svg
similarity index 100%
rename from packages/web/public/heltec-ht62-esp32c3-sx1262.svg
rename to packages/web/public/devices/heltec-ht62-esp32c3-sx1262.svg
diff --git a/packages/web/public/heltec-mesh-node-t114-case.svg b/packages/web/public/devices/heltec-mesh-node-t114-case.svg
similarity index 100%
rename from packages/web/public/heltec-mesh-node-t114-case.svg
rename to packages/web/public/devices/heltec-mesh-node-t114-case.svg
diff --git a/packages/web/public/heltec-mesh-node-t114.svg b/packages/web/public/devices/heltec-mesh-node-t114.svg
similarity index 100%
rename from packages/web/public/heltec-mesh-node-t114.svg
rename to packages/web/public/devices/heltec-mesh-node-t114.svg
diff --git a/packages/web/public/heltec-v3-case.svg b/packages/web/public/devices/heltec-v3-case.svg
similarity index 100%
rename from packages/web/public/heltec-v3-case.svg
rename to packages/web/public/devices/heltec-v3-case.svg
diff --git a/packages/web/public/heltec-v3.svg b/packages/web/public/devices/heltec-v3.svg
similarity index 100%
rename from packages/web/public/heltec-v3.svg
rename to packages/web/public/devices/heltec-v3.svg
diff --git a/packages/web/public/heltec-vision-master-e213.svg b/packages/web/public/devices/heltec-vision-master-e213.svg
similarity index 100%
rename from packages/web/public/heltec-vision-master-e213.svg
rename to packages/web/public/devices/heltec-vision-master-e213.svg
diff --git a/packages/web/public/heltec-vision-master-e290.svg b/packages/web/public/devices/heltec-vision-master-e290.svg
similarity index 100%
rename from packages/web/public/heltec-vision-master-e290.svg
rename to packages/web/public/devices/heltec-vision-master-e290.svg
diff --git a/packages/web/public/heltec-vision-master-t190.svg b/packages/web/public/devices/heltec-vision-master-t190.svg
similarity index 100%
rename from packages/web/public/heltec-vision-master-t190.svg
rename to packages/web/public/devices/heltec-vision-master-t190.svg
diff --git a/packages/web/public/heltec-wireless-paper-V1_0.svg b/packages/web/public/devices/heltec-wireless-paper-V1_0.svg
similarity index 100%
rename from packages/web/public/heltec-wireless-paper-V1_0.svg
rename to packages/web/public/devices/heltec-wireless-paper-V1_0.svg
diff --git a/packages/web/public/heltec-wireless-paper.svg b/packages/web/public/devices/heltec-wireless-paper.svg
similarity index 100%
rename from packages/web/public/heltec-wireless-paper.svg
rename to packages/web/public/devices/heltec-wireless-paper.svg
diff --git a/packages/web/public/heltec-wireless-tracker-V1-0.svg b/packages/web/public/devices/heltec-wireless-tracker-V1-0.svg
similarity index 100%
rename from packages/web/public/heltec-wireless-tracker-V1-0.svg
rename to packages/web/public/devices/heltec-wireless-tracker-V1-0.svg
diff --git a/packages/web/public/heltec-wireless-tracker.svg b/packages/web/public/devices/heltec-wireless-tracker.svg
similarity index 100%
rename from packages/web/public/heltec-wireless-tracker.svg
rename to packages/web/public/devices/heltec-wireless-tracker.svg
diff --git a/packages/web/public/heltec-wsl-v3.svg b/packages/web/public/devices/heltec-wsl-v3.svg
similarity index 100%
rename from packages/web/public/heltec-wsl-v3.svg
rename to packages/web/public/devices/heltec-wsl-v3.svg
diff --git a/packages/web/public/nano-g2-ultra.svg b/packages/web/public/devices/nano-g2-ultra.svg
similarity index 100%
rename from packages/web/public/nano-g2-ultra.svg
rename to packages/web/public/devices/nano-g2-ultra.svg
diff --git a/packages/web/public/pico.svg b/packages/web/public/devices/pico.svg
similarity index 100%
rename from packages/web/public/pico.svg
rename to packages/web/public/devices/pico.svg
diff --git a/packages/web/public/promicro.svg b/packages/web/public/devices/promicro.svg
similarity index 100%
rename from packages/web/public/promicro.svg
rename to packages/web/public/devices/promicro.svg
diff --git a/packages/web/public/rak-wismeshtap.svg b/packages/web/public/devices/rak-wismeshtap.svg
similarity index 100%
rename from packages/web/public/rak-wismeshtap.svg
rename to packages/web/public/devices/rak-wismeshtap.svg
diff --git a/packages/web/public/rak11310.svg b/packages/web/public/devices/rak11310.svg
similarity index 100%
rename from packages/web/public/rak11310.svg
rename to packages/web/public/devices/rak11310.svg
diff --git a/packages/web/public/rak2560.svg b/packages/web/public/devices/rak2560.svg
similarity index 100%
rename from packages/web/public/rak2560.svg
rename to packages/web/public/devices/rak2560.svg
diff --git a/packages/web/public/rak4631.svg b/packages/web/public/devices/rak4631.svg
similarity index 100%
rename from packages/web/public/rak4631.svg
rename to packages/web/public/devices/rak4631.svg
diff --git a/packages/web/public/rak4631_case.svg b/packages/web/public/devices/rak4631_case.svg
similarity index 100%
rename from packages/web/public/rak4631_case.svg
rename to packages/web/public/devices/rak4631_case.svg
diff --git a/packages/web/public/rpipicow.svg b/packages/web/public/devices/rpipicow.svg
similarity index 100%
rename from packages/web/public/rpipicow.svg
rename to packages/web/public/devices/rpipicow.svg
diff --git a/packages/web/public/seeed-sensecap-indicator.svg b/packages/web/public/devices/seeed-sensecap-indicator.svg
similarity index 100%
rename from packages/web/public/seeed-sensecap-indicator.svg
rename to packages/web/public/devices/seeed-sensecap-indicator.svg
diff --git a/packages/web/public/seeed-xiao-s3.svg b/packages/web/public/devices/seeed-xiao-s3.svg
similarity index 100%
rename from packages/web/public/seeed-xiao-s3.svg
rename to packages/web/public/devices/seeed-xiao-s3.svg
diff --git a/packages/web/public/station-g2.svg b/packages/web/public/devices/station-g2.svg
similarity index 100%
rename from packages/web/public/station-g2.svg
rename to packages/web/public/devices/station-g2.svg
diff --git a/packages/web/public/t-deck.svg b/packages/web/public/devices/t-deck.svg
similarity index 100%
rename from packages/web/public/t-deck.svg
rename to packages/web/public/devices/t-deck.svg
diff --git a/packages/web/public/t-echo.svg b/packages/web/public/devices/t-echo.svg
similarity index 100%
rename from packages/web/public/t-echo.svg
rename to packages/web/public/devices/t-echo.svg
diff --git a/packages/web/public/t-watch-s3.svg b/packages/web/public/devices/t-watch-s3.svg
similarity index 100%
rename from packages/web/public/t-watch-s3.svg
rename to packages/web/public/devices/t-watch-s3.svg
diff --git a/packages/web/public/tbeam-s3-core.svg b/packages/web/public/devices/tbeam-s3-core.svg
similarity index 100%
rename from packages/web/public/tbeam-s3-core.svg
rename to packages/web/public/devices/tbeam-s3-core.svg
diff --git a/packages/web/public/tbeam.svg b/packages/web/public/devices/tbeam.svg
similarity index 100%
rename from packages/web/public/tbeam.svg
rename to packages/web/public/devices/tbeam.svg
diff --git a/packages/web/public/tlora-c6.svg b/packages/web/public/devices/tlora-c6.svg
similarity index 100%
rename from packages/web/public/tlora-c6.svg
rename to packages/web/public/devices/tlora-c6.svg
diff --git a/packages/web/public/tlora-t3s3-epaper.svg b/packages/web/public/devices/tlora-t3s3-epaper.svg
similarity index 100%
rename from packages/web/public/tlora-t3s3-epaper.svg
rename to packages/web/public/devices/tlora-t3s3-epaper.svg
diff --git a/packages/web/public/tlora-t3s3-v1.svg b/packages/web/public/devices/tlora-t3s3-v1.svg
similarity index 100%
rename from packages/web/public/tlora-t3s3-v1.svg
rename to packages/web/public/devices/tlora-t3s3-v1.svg
diff --git a/packages/web/public/tlora-v2-1-1_6.svg b/packages/web/public/devices/tlora-v2-1-1_6.svg
similarity index 100%
rename from packages/web/public/tlora-v2-1-1_6.svg
rename to packages/web/public/devices/tlora-v2-1-1_6.svg
diff --git a/packages/web/public/tlora-v2-1-1_8.svg b/packages/web/public/devices/tlora-v2-1-1_8.svg
similarity index 100%
rename from packages/web/public/tlora-v2-1-1_8.svg
rename to packages/web/public/devices/tlora-v2-1-1_8.svg
diff --git a/packages/web/public/tracker-t1000-e.svg b/packages/web/public/devices/tracker-t1000-e.svg
similarity index 100%
rename from packages/web/public/tracker-t1000-e.svg
rename to packages/web/public/devices/tracker-t1000-e.svg
diff --git a/packages/web/public/unknown.svg b/packages/web/public/devices/unknown.svg
similarity index 100%
rename from packages/web/public/unknown.svg
rename to packages/web/public/devices/unknown.svg
diff --git a/packages/web/public/wio-tracker-wm1110.svg b/packages/web/public/devices/wio-tracker-wm1110.svg
similarity index 100%
rename from packages/web/public/wio-tracker-wm1110.svg
rename to packages/web/public/devices/wio-tracker-wm1110.svg
diff --git a/packages/web/public/wm1110_dev_kit.svg b/packages/web/public/devices/wm1110_dev_kit.svg
similarity index 100%
rename from packages/web/public/wm1110_dev_kit.svg
rename to packages/web/public/devices/wm1110_dev_kit.svg
diff --git a/packages/web/public/logo.svg b/packages/web/public/logo.svg
new file mode 100644
index 00000000..e6863f6a
--- /dev/null
+++ b/packages/web/public/logo.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="512" height="512" viewBox="0 0 512 512" xml:space="preserve">
+<desc>Created with Fabric.js 4.6.0</desc>
+<defs>
+</defs>
+<g transform="matrix(1 0 0 1 256 256)" id="xYQ9Gk9Jwpgj_HMOXB3F_"  >
+<path style="stroke: rgb(213,130,139); stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(103,234,148); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-256, -256)" d="M 0 0 L 512 0 L 512 512 L 0 512 z" stroke-linecap="round" />
+</g>
+<g transform="matrix(1.79 0 0 1.79 313.74 258.36)" id="1xBsk2n9FZp60Rz1O-ceJ"  >
+<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: round; stroke-miterlimit: 2; fill: rgb(44,45,60); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-250.97, -362.41)" d="M 250.908 330.267 L 193.126 415.005 L 180.938 406.694 L 244.802 313.037 C 246.174 311.024 248.453 309.819 250.889 309.816 C 253.326 309.814 255.606 311.015 256.982 313.026 L 320.994 406.536 L 308.821 414.869 L 250.908 330.267 Z" stroke-linecap="round" />
+</g>
+<g transform="matrix(1.81 0 0 1.81 145 256.15)" id="KxN7E9YpbyPgz0S4z4Cl6"  >
+<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: round; stroke-miterlimit: 2; fill: rgb(44,45,60); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-115.14, -528.06)" d="M 87.642 581.398 L 154.757 482.977 L 142.638 474.713 L 75.523 573.134 L 87.642 581.398 Z" stroke-linecap="round" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/packages/web/public/logo_black.svg b/packages/web/public/logo_black.svg
new file mode 100644
index 00000000..e0f9bb19
--- /dev/null
+++ b/packages/web/public/logo_black.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 100 55" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(0.802386,0,0,0.460028,-421.748,-122.127)">
+        <g transform="matrix(0.579082,0,0,1.01004,460.975,-39.6867)">
+            <path d="M250.908,330.267L193.126,415.005L180.938,406.694L244.802,313.037C246.174,311.024 248.453,309.819 250.889,309.816C253.326,309.814 255.606,311.015 256.982,313.026L320.994,406.536L308.821,414.869L250.908,330.267Z"/>
+        </g>
+        <g transform="matrix(0.582378,0,0,1.01579,485.019,-211.182)">
+            <path d="M87.642,581.398L154.757,482.977L142.638,474.713L75.523,573.134L87.642,581.398Z"/>
+        </g>
+    </g>
+</svg>
diff --git a/packages/web/public/logo_white.svg b/packages/web/public/logo_white.svg
new file mode 100644
index 00000000..b1bcd575
--- /dev/null
+++ b/packages/web/public/logo_white.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 100 55" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(0.802386,0,0,0.460028,-421.748,-122.127)">
+        <g transform="matrix(0.579082,0,0,1.01004,460.975,-39.6867)">
+            <path d="M250.908,330.267L193.126,415.005L180.938,406.694L244.802,313.037C246.174,311.024 248.453,309.819 250.889,309.816C253.326,309.814 255.606,311.015 256.982,313.026L320.994,406.536L308.821,414.869L250.908,330.267Z" style="fill:white;"/>
+        </g>
+        <g transform="matrix(0.582378,0,0,1.01579,485.019,-211.182)">
+            <path d="M87.642,581.398L154.757,482.977L142.638,474.713L75.523,573.134L87.642,581.398Z" style="fill:white;"/>
+        </g>
+    </g>
+</svg>
diff --git a/packages/web/public/site.webmanifest b/packages/web/public/site.webmanifest
index a5f2d0ca..dc9509b9 100644
--- a/packages/web/public/site.webmanifest
+++ b/packages/web/public/site.webmanifest
@@ -5,7 +5,7 @@
   "description": "Meshtastic Web App",
   "icons": [
     {
-      "src": "/Logo.svg",
+      "src": "/logo.svg",
       "sizes": "any",
       "type": "image/svg+xml"
     }
diff --git a/packages/web/src/components/Sidebar.tsx b/packages/web/src/components/Sidebar.tsx
index a55d89e8..ddef36aa 100644
--- a/packages/web/src/components/Sidebar.tsx
+++ b/packages/web/src/components/Sidebar.tsx
@@ -1,4 +1,5 @@
-import React, { useEffect, useState, useTransition } from "react";
+import type React from "react";
+import { useEffect, useState, useTransition } from "react";
 import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.tsx";
 import { Subtle } from "@components/UI/Typography/Subtle.tsx";
 import { useDevice } from "@core/stores/deviceStore.ts";
@@ -101,7 +102,7 @@ export const Sidebar = ({ children }: SidebarProps) => {
         setDisplayedNodeCount(currentNodeCountValue);
       });
     }
-  }, [currentNodeCountValue, displayedNodeCount, startNodeCountTransition]);
+  }, [currentNodeCountValue, displayedNodeCount]);
 
   const pages: NavLink[] = [
     {
@@ -146,7 +147,7 @@ export const Sidebar = ({ children }: SidebarProps) => {
         )}
       >
         <img
-          src="/Logo.svg"
+          src="/logo.svg"
           alt={t("app.logo")}
           className="size-10 flex-shrink-0 rounded-xl"
         />
@@ -163,10 +164,7 @@ export const Sidebar = ({ children }: SidebarProps) => {
         </h2>
       </div>
 
-      <SidebarSection
-        label={t("navigation.title")}
-        className="mt-4 px-0"
-      >
+      <SidebarSection label={t("navigation.title")} className="mt-4 px-0">
         {pages.map((link) => {
           return (
             <SidebarButton
@@ -186,12 +184,7 @@ export const Sidebar = ({ children }: SidebarProps) => {
         })}
       </SidebarSection>
 
-      <div
-        className={cn(
-          "flex-1 min-h-0",
-          isCollapsed && "overflow-hidden",
-        )}
-      >
+      <div className={cn("flex-1 min-h-0", isCollapsed && "overflow-hidden")}>
         {children}
       </div>
 
diff --git a/packages/web/src/components/generic/DeviceImage.tsx b/packages/web/src/components/generic/DeviceImage.tsx
index b80ebbac..ef96a429 100644
--- a/packages/web/src/components/generic/DeviceImage.tsx
+++ b/packages/web/src/components/generic/DeviceImage.tsx
@@ -47,7 +47,7 @@ const hardwareModelToFilename: { [key: string]: string } = {
 };
 
 export const DeviceImage = ({ deviceType, className }: DeviceImageProps) => {
-  const getPath = (device: string) => `/${device}`;
+  const getPath = (device: string) => `/devices/${device}`;
   const device = hardwareModelToFilename[deviceType] || "unknown.svg";
   return <img className={className} src={getPath(device)} alt={device} />;
 };