diff --git a/Aaru.Gui/Assets/Icons/entypo/Dark/InfoWithCircle.png b/Aaru.Gui/Assets/Icons/entypo/Dark/InfoWithCircle.png
new file mode 100644
index 000000000..5e89574eb
Binary files /dev/null and b/Aaru.Gui/Assets/Icons/entypo/Dark/InfoWithCircle.png differ
diff --git a/Aaru.Gui/Assets/Icons/entypo/Dark/InfoWithCircle.svg b/Aaru.Gui/Assets/Icons/entypo/Dark/InfoWithCircle.svg
new file mode 100644
index 000000000..240143445
--- /dev/null
+++ b/Aaru.Gui/Assets/Icons/entypo/Dark/InfoWithCircle.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!-- ####################################################################
+
+This file was generates automatically via the
+IconPacks.Browser (MIT-License).
+
+Visit https://github.com/MahApps/MahApps.Metro.IconPacks and
+https://github.com/MahApps/MahApps.Metro.IconPacks/blob/develop/LICENSE
+for more information.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Icon-Name: 			InfoWithCircle
+Iconpack:			Entypo
+Iconpack-Homepage: 	http://www.entypo.com/
+Iconpack-License:	https://creativecommons.org/licenses/by-sa/4.0/
+
+#####################################################################-->
+
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="48"
+     height="48">
+  <path d="M10,0.4c-5.303,0-9.601,4.298-9.601,9.6c0,5.303,4.298,9.601,9.601,9.601c5.301,0,9.6-4.298,9.6-9.601  C19.6,4.698,15.301,0.4,10,0.4z M10.896,3.866c0.936,0,1.211,0.543,1.211,1.164c0,0.775-0.62,1.492-1.679,1.492  c-0.886,0-1.308-0.445-1.282-1.182C9.146,4.719,9.665,3.866,10.896,3.866z M8.498,15.75c-0.64,0-1.107-0.389-0.66-2.094l0.733-3.025  c0.127-0.484,0.148-0.678,0-0.678c-0.191,0-1.022,0.334-1.512,0.664L6.74,10.094c1.555-1.299,3.343-2.061,4.108-2.061  c0.64,0,0.746,0.756,0.427,1.92l-0.84,3.18c-0.149,0.562-0.085,0.756,0.064,0.756c0.192,0,0.82-0.232,1.438-0.719l0.362,0.486  C10.786,15.168,9.137,15.75,8.498,15.75z"
+        style="fill:#FFFFFF;
+                 stroke:none
+                 stroke-width:0;
+                 stroke-linecap:flat;
+                 stroke-linejoin:miter;"
+        transform="matrix(2.4998697473547558,0,0,2.4998697473547558,-0.9974480017778394,-0.9999472060740078)"/>
+</svg>
\ No newline at end of file
diff --git a/Aaru.Gui/Assets/Icons/entypo/InfoWithCircle.png b/Aaru.Gui/Assets/Icons/entypo/InfoWithCircle.png
new file mode 100644
index 000000000..60c800271
Binary files /dev/null and b/Aaru.Gui/Assets/Icons/entypo/InfoWithCircle.png differ
diff --git a/Aaru.Gui/Assets/Icons/entypo/InfoWithCircle.svg b/Aaru.Gui/Assets/Icons/entypo/InfoWithCircle.svg
new file mode 100644
index 000000000..d4b8de290
--- /dev/null
+++ b/Aaru.Gui/Assets/Icons/entypo/InfoWithCircle.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!-- ####################################################################
+
+This file was generates automatically via the
+IconPacks.Browser (MIT-License).
+
+Visit https://github.com/MahApps/MahApps.Metro.IconPacks and
+https://github.com/MahApps/MahApps.Metro.IconPacks/blob/develop/LICENSE
+for more information.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Icon-Name: 			InfoWithCircle
+Iconpack:			Entypo
+Iconpack-Homepage: 	http://www.entypo.com/
+Iconpack-License:	https://creativecommons.org/licenses/by-sa/4.0/
+
+#####################################################################-->
+
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="48"
+     height="48">
+  <path d="M10,0.4c-5.303,0-9.601,4.298-9.601,9.6c0,5.303,4.298,9.601,9.601,9.601c5.301,0,9.6-4.298,9.6-9.601  C19.6,4.698,15.301,0.4,10,0.4z M10.896,3.866c0.936,0,1.211,0.543,1.211,1.164c0,0.775-0.62,1.492-1.679,1.492  c-0.886,0-1.308-0.445-1.282-1.182C9.146,4.719,9.665,3.866,10.896,3.866z M8.498,15.75c-0.64,0-1.107-0.389-0.66-2.094l0.733-3.025  c0.127-0.484,0.148-0.678,0-0.678c-0.191,0-1.022,0.334-1.512,0.664L6.74,10.094c1.555-1.299,3.343-2.061,4.108-2.061  c0.64,0,0.746,0.756,0.427,1.92l-0.84,3.18c-0.149,0.562-0.085,0.756,0.064,0.756c0.192,0,0.82-0.232,1.438-0.719l0.362,0.486  C10.786,15.168,9.137,15.75,8.498,15.75z"
+        style="fill:#000000;
+                 stroke:none
+                 stroke-width:0;
+                 stroke-linecap:flat;
+                 stroke-linejoin:miter;"
+        transform="matrix(2.4998697473547558,0,0,2.4998697473547558,-0.9974480017778394,-0.9999472060740078)"/>
+</svg>
\ No newline at end of file
diff --git a/Aaru.Gui/Assets/Icons/phosphor/Dark/Disc.png b/Aaru.Gui/Assets/Icons/phosphor/Dark/Disc.png
new file mode 100644
index 000000000..b988ea24d
Binary files /dev/null and b/Aaru.Gui/Assets/Icons/phosphor/Dark/Disc.png differ
diff --git a/Aaru.Gui/Assets/Icons/phosphor/Dark/Disc.svg b/Aaru.Gui/Assets/Icons/phosphor/Dark/Disc.svg
new file mode 100644
index 000000000..be242ec3a
--- /dev/null
+++ b/Aaru.Gui/Assets/Icons/phosphor/Dark/Disc.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!-- ####################################################################
+
+This file was generates automatically via the
+IconPacks.Browser (MIT-License).
+
+Visit https://github.com/MahApps/MahApps.Metro.IconPacks and
+https://github.com/MahApps/MahApps.Metro.IconPacks/blob/develop/LICENSE
+for more information.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Icon-Name: 			Disc
+Iconpack:			PhosphorIcons
+Iconpack-Homepage: 	https://phosphoricons.com/
+Iconpack-License:	https://github.com/phosphor-icons/core?tab=MIT-1-ov-file#readme
+
+#####################################################################-->
+
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="48"
+     height="48">
+  <path d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm39.2,96a39.77,39.77,0,0,0-5.84-14l34.23-34.24a87.54,87.54,0,0,1,20,48.28ZM152,128a24,24,0,1,1-24-24A24,24,0,0,1,152,128Zm-24,88A88,88,0,1,1,184.28,60.4L150,94.64A40,40,0,1,0,167.2,136h48.43A88.11,88.11,0,0,1,128,216Z"
+        style="fill:#FFFFFF;
+                 stroke:none
+                 stroke-width:0;
+                 stroke-linecap:flat;
+                 stroke-linejoin:miter;"
+        transform="matrix(0.2307658598054861,0,0,0.2307658598054861,-5.537679474872777,-5.538380415256193)"/>
+</svg>
\ No newline at end of file
diff --git a/Aaru.Gui/Assets/Icons/phosphor/Dark/Toolbox.png b/Aaru.Gui/Assets/Icons/phosphor/Dark/Toolbox.png
new file mode 100644
index 000000000..4d9819de5
Binary files /dev/null and b/Aaru.Gui/Assets/Icons/phosphor/Dark/Toolbox.png differ
diff --git a/Aaru.Gui/Assets/Icons/phosphor/Dark/Toolbox.svg b/Aaru.Gui/Assets/Icons/phosphor/Dark/Toolbox.svg
new file mode 100644
index 000000000..be48d2bc6
--- /dev/null
+++ b/Aaru.Gui/Assets/Icons/phosphor/Dark/Toolbox.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!-- ####################################################################
+
+This file was generates automatically via the
+IconPacks.Browser (MIT-License).
+
+Visit https://github.com/MahApps/MahApps.Metro.IconPacks and
+https://github.com/MahApps/MahApps.Metro.IconPacks/blob/develop/LICENSE
+for more information.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Icon-Name: 			Toolbox
+Iconpack:			PhosphorIcons
+Iconpack-Homepage: 	https://phosphoricons.com/
+Iconpack-License:	https://github.com/phosphor-icons/core?tab=MIT-1-ov-file#readme
+
+#####################################################################-->
+
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="48"
+     height="48">
+  <path d="M224,64H176V56a24,24,0,0,0-24-24H104A24,24,0,0,0,80,56v8H32A16,16,0,0,0,16,80V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V80A16,16,0,0,0,224,64ZM96,56a8,8,0,0,1,8-8h48a8,8,0,0,1,8,8v8H96ZM224,80v32H192v-8a8,8,0,0,0-16,0v8H80v-8a8,8,0,0,0-16,0v8H32V80Zm0,112H32V128H64v8a8,8,0,0,0,16,0v-8h96v8a8,8,0,0,0,16,0v-8h32v64Z"
+        style="fill:#FFFFFF;
+                 stroke:none
+                 stroke-width:0;
+                 stroke-linecap:flat;
+                 stroke-linejoin:miter;"
+        transform="matrix(0.21428571428571427,0,0,0.21428571428571427,-3.4285714285714284,-1.7142857142857142)"/>
+</svg>
\ No newline at end of file
diff --git a/Aaru.Gui/Assets/Icons/phosphor/Dark/VinylRecord.png b/Aaru.Gui/Assets/Icons/phosphor/Dark/VinylRecord.png
new file mode 100644
index 000000000..5dcd8f702
Binary files /dev/null and b/Aaru.Gui/Assets/Icons/phosphor/Dark/VinylRecord.png differ
diff --git a/Aaru.Gui/Assets/Icons/phosphor/Dark/VinylRecord.svg b/Aaru.Gui/Assets/Icons/phosphor/Dark/VinylRecord.svg
new file mode 100644
index 000000000..2f29342da
--- /dev/null
+++ b/Aaru.Gui/Assets/Icons/phosphor/Dark/VinylRecord.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!-- ####################################################################
+
+This file was generates automatically via the
+IconPacks.Browser (MIT-License).
+
+Visit https://github.com/MahApps/MahApps.Metro.IconPacks and
+https://github.com/MahApps/MahApps.Metro.IconPacks/blob/develop/LICENSE
+for more information.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Icon-Name: 			VinylRecord
+Iconpack:			PhosphorIcons
+Iconpack-Homepage: 	https://phosphoricons.com/
+Iconpack-License:	https://github.com/phosphor-icons/core?tab=MIT-1-ov-file#readme
+
+#####################################################################-->
+
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="48"
+     height="48">
+  <path d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Zm0-144a56.06,56.06,0,0,0-56,56,8,8,0,0,1-16,0,72.08,72.08,0,0,1,72-72,8,8,0,0,1,0,16Zm72,56a72.08,72.08,0,0,1-72,72,8,8,0,0,1,0-16,56.06,56.06,0,0,0,56-56,8,8,0,0,1,16,0Zm-40,0a32,32,0,1,0-32,32A32,32,0,0,0,160,128Zm-48,0a16,16,0,1,1,16,16A16,16,0,0,1,112,128Z"
+        style="fill:#FFFFFF;
+                 stroke:none
+                 stroke-width:0;
+                 stroke-linecap:flat;
+                 stroke-linejoin:miter;"
+        transform="matrix(0.2307658598054861,0,0,0.2307658598054861,-5.537679474872777,-5.538380415256193)"/>
+</svg>
\ No newline at end of file
diff --git a/Aaru.Gui/Assets/Icons/phosphor/Disc.png b/Aaru.Gui/Assets/Icons/phosphor/Disc.png
new file mode 100644
index 000000000..71ddf1a49
Binary files /dev/null and b/Aaru.Gui/Assets/Icons/phosphor/Disc.png differ
diff --git a/Aaru.Gui/Assets/Icons/phosphor/Disc.svg b/Aaru.Gui/Assets/Icons/phosphor/Disc.svg
new file mode 100644
index 000000000..5e83e7771
--- /dev/null
+++ b/Aaru.Gui/Assets/Icons/phosphor/Disc.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!-- ####################################################################
+
+This file was generates automatically via the
+IconPacks.Browser (MIT-License).
+
+Visit https://github.com/MahApps/MahApps.Metro.IconPacks and
+https://github.com/MahApps/MahApps.Metro.IconPacks/blob/develop/LICENSE
+for more information.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Icon-Name: 			Disc
+Iconpack:			PhosphorIcons
+Iconpack-Homepage: 	https://phosphoricons.com/
+Iconpack-License:	https://github.com/phosphor-icons/core?tab=MIT-1-ov-file#readme
+
+#####################################################################-->
+
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="48"
+     height="48">
+  <path d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm39.2,96a39.77,39.77,0,0,0-5.84-14l34.23-34.24a87.54,87.54,0,0,1,20,48.28ZM152,128a24,24,0,1,1-24-24A24,24,0,0,1,152,128Zm-24,88A88,88,0,1,1,184.28,60.4L150,94.64A40,40,0,1,0,167.2,136h48.43A88.11,88.11,0,0,1,128,216Z"
+        style="fill:#000000;
+                 stroke:none
+                 stroke-width:0;
+                 stroke-linecap:flat;
+                 stroke-linejoin:miter;"
+        transform="matrix(0.2307658598054861,0,0,0.2307658598054861,-5.537679474872777,-5.538380415256193)"/>
+</svg>
\ No newline at end of file
diff --git a/Aaru.Gui/Assets/Icons/phosphor/LICENSE b/Aaru.Gui/Assets/Icons/phosphor/LICENSE
new file mode 100644
index 000000000..78c981081
--- /dev/null
+++ b/Aaru.Gui/Assets/Icons/phosphor/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Phosphor Icons
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Aaru.Gui/Assets/Icons/phosphor/Toolbox.png b/Aaru.Gui/Assets/Icons/phosphor/Toolbox.png
new file mode 100644
index 000000000..0d821113e
Binary files /dev/null and b/Aaru.Gui/Assets/Icons/phosphor/Toolbox.png differ
diff --git a/Aaru.Gui/Assets/Icons/phosphor/Toolbox.svg b/Aaru.Gui/Assets/Icons/phosphor/Toolbox.svg
new file mode 100644
index 000000000..0262c40c3
--- /dev/null
+++ b/Aaru.Gui/Assets/Icons/phosphor/Toolbox.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!-- ####################################################################
+
+This file was generates automatically via the
+IconPacks.Browser (MIT-License).
+
+Visit https://github.com/MahApps/MahApps.Metro.IconPacks and
+https://github.com/MahApps/MahApps.Metro.IconPacks/blob/develop/LICENSE
+for more information.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Icon-Name: 			Toolbox
+Iconpack:			PhosphorIcons
+Iconpack-Homepage: 	https://phosphoricons.com/
+Iconpack-License:	https://github.com/phosphor-icons/core?tab=MIT-1-ov-file#readme
+
+#####################################################################-->
+
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="48"
+     height="48">
+  <path d="M224,64H176V56a24,24,0,0,0-24-24H104A24,24,0,0,0,80,56v8H32A16,16,0,0,0,16,80V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V80A16,16,0,0,0,224,64ZM96,56a8,8,0,0,1,8-8h48a8,8,0,0,1,8,8v8H96ZM224,80v32H192v-8a8,8,0,0,0-16,0v8H80v-8a8,8,0,0,0-16,0v8H32V80Zm0,112H32V128H64v8a8,8,0,0,0,16,0v-8h96v8a8,8,0,0,0,16,0v-8h32v64Z"
+        style="fill:#000000;
+                 stroke:none
+                 stroke-width:0;
+                 stroke-linecap:flat;
+                 stroke-linejoin:miter;"
+        transform="matrix(0.21428571428571427,0,0,0.21428571428571427,-3.4285714285714284,-1.7142857142857142)"/>
+</svg>
\ No newline at end of file
diff --git a/Aaru.Gui/Assets/Icons/phosphor/VinylRecord.png b/Aaru.Gui/Assets/Icons/phosphor/VinylRecord.png
new file mode 100644
index 000000000..3df6cbbe5
Binary files /dev/null and b/Aaru.Gui/Assets/Icons/phosphor/VinylRecord.png differ
diff --git a/Aaru.Gui/Assets/Icons/phosphor/VinylRecord.svg b/Aaru.Gui/Assets/Icons/phosphor/VinylRecord.svg
new file mode 100644
index 000000000..b73d562cf
--- /dev/null
+++ b/Aaru.Gui/Assets/Icons/phosphor/VinylRecord.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!-- ####################################################################
+
+This file was generates automatically via the
+IconPacks.Browser (MIT-License).
+
+Visit https://github.com/MahApps/MahApps.Metro.IconPacks and
+https://github.com/MahApps/MahApps.Metro.IconPacks/blob/develop/LICENSE
+for more information.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Icon-Name: 			VinylRecord
+Iconpack:			PhosphorIcons
+Iconpack-Homepage: 	https://phosphoricons.com/
+Iconpack-License:	https://github.com/phosphor-icons/core?tab=MIT-1-ov-file#readme
+
+#####################################################################-->
+
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="48"
+     height="48">
+  <path d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Zm0-144a56.06,56.06,0,0,0-56,56,8,8,0,0,1-16,0,72.08,72.08,0,0,1,72-72,8,8,0,0,1,0,16Zm72,56a72.08,72.08,0,0,1-72,72,8,8,0,0,1,0-16,56.06,56.06,0,0,0,56-56,8,8,0,0,1,16,0Zm-40,0a32,32,0,1,0-32,32A32,32,0,0,0,160,128Zm-48,0a16,16,0,1,1,16,16A16,16,0,0,1,112,128Z"
+        style="fill:#000000;
+                 stroke:none
+                 stroke-width:0;
+                 stroke-linecap:flat;
+                 stroke-linejoin:miter;"
+        transform="matrix(0.2307658598054861,0,0,0.2307658598054861,-5.537679474872777,-5.538380415256193)"/>
+</svg>
\ No newline at end of file
diff --git a/Aaru.Gui/Assets/Logos/Buses/Dark/SATA.png b/Aaru.Gui/Assets/Logos/Buses/Dark/SATA.png
new file mode 100644
index 000000000..953688c15
Binary files /dev/null and b/Aaru.Gui/Assets/Logos/Buses/Dark/SATA.png differ
diff --git a/Aaru.Gui/Assets/Logos/Buses/Dark/SATA.svg b/Aaru.Gui/Assets/Logos/Buses/Dark/SATA.svg
new file mode 100644
index 000000000..a100c29d7
--- /dev/null
+++ b/Aaru.Gui/Assets/Logos/Buses/Dark/SATA.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    width="112.87776mm"
+    height="97.624901mm"
+    viewBox="0 0 112.87776 97.624901"
+    version="1.1"
+    id="svg1"
+    inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+    sodipodi:docname="Logo of SATA.svg"
+    xmlns="http://www.w3.org/2000/svg"
+>
+  <sodipodi:namedview
+      id="namedview1"
+      pagecolor="#ffffff"
+      bordercolor="#000000"
+      borderopacity="0.25"
+      inkscape:showpageshadow="2"
+      inkscape:pageopacity="0.0"
+      inkscape:pagecheckerboard="0"
+      inkscape:deskcolor="#d1d1d1"
+      inkscape:document-units="mm"
+      inkscape:zoom="0.32363343"
+      inkscape:cx="-20.084451"
+      inkscape:cy="434.13314"
+      inkscape:window-width="1870"
+      inkscape:window-height="1011"
+      inkscape:window-x="0"
+      inkscape:window-y="0"
+      inkscape:window-maximized="1"
+      inkscape:current-layer="layer1"/>
+  <defs
+      id="defs1"/>
+  <g
+      inkscape:label="Layer 1"
+      inkscape:groupmode="layer"
+      id="layer1"
+      transform="translate(-67.46875,-75.40625)">
+    <path
+        fill-rule="nonzero"
+        fill="#c70651"
+        fill-opacity="1"
+        d="M 67.46875,173.03115 H 180.34651 V 75.40625 H 67.46875 Z m 0,0"
+        id="path176"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="M 70.954168,169.35487 H 176.68682 V 97.667285 H 70.954168 Z m 0,0"
+        id="path177"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 70.900226,89.675721 5.688699,-0.290444 c 0.124476,0.771771 0.377589,1.360972 0.759324,1.767604 0.618247,0.65974 1.506199,0.987535 2.659707,0.987535 0.863056,0 1.526945,-0.165967 1.991667,-0.502064 0.464721,-0.336094 0.697082,-0.72613 0.697082,-1.170105 0,-0.427379 -0.219925,-0.809117 -0.659736,-1.136912 -0.443979,-0.340243 -1.464708,-0.655591 -3.074639,-0.950189 -2.630661,-0.497919 -4.506147,-1.161807 -5.630611,-1.99167 -1.128611,-0.817412 -1.692916,-1.867188 -1.692916,-3.141023 0,-0.84646 0.286288,-1.638979 0.867205,-2.385855 0.576753,-0.742724 1.448108,-1.327778 2.609915,-1.755157 1.161807,-0.427376 2.755139,-0.643143 4.775853,-0.643143 2.481286,0 4.373369,0.390036 5.676252,1.161807 1.302882,0.771771 2.078803,1.999968 2.327763,3.684586 l -5.655509,0.278008 c -0.149377,-0.726127 -0.464722,-1.25309 -0.94604,-1.585034 -0.485471,-0.331945 -1.149359,-0.497918 -1.999965,-0.497918 -0.697085,0 -1.224048,0.124476 -1.576738,0.365141 -0.35684,0.248951 -0.531112,0.547708 -0.531112,0.904548 0,0.269697 0.145222,0.506216 0.435677,0.709533 0.286319,0.211615 0.958491,0.414928 2.016562,0.601648 2.622365,0.473023 4.502,0.954341 5.63476,1.43566 1.136912,0.48547 1.962622,1.09127 2.477137,1.813248 0.518665,0.717831 0.77592,1.526945 0.77592,2.414896 0,1.049776 -0.344392,2.016565 -1.033176,2.900367 -0.688787,0.879653 -1.651423,1.543542 -2.887919,1.995816 -1.236492,0.448125 -2.796634,0.672187 -4.680419,0.672187 -3.302847,0 -5.593265,-0.531108 -6.862954,-1.589183 -1.273838,-1.058074 -1.995816,-2.410747 -2.161789,-4.053872"
+        id="path178"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 91.032665,78.750593 h 16.115905 v 3.460523 H 97.036712 v 2.614063 h 9.377438 v 3.323597 h -9.377438 v 3.215711 h 10.394018 v 3.672138 H 91.032665 V 78.750593"
+        id="path179"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 116.2895,82.036843 h 2.60577 c 1.08297,0 1.82154,0.141067 2.21573,0.419081 0.39003,0.282163 0.5892,0.684635 0.5892,1.211597 0,0.360992 -0.12863,0.67634 -0.37344,0.950192 -0.24895,0.278008 -0.5726,0.448125 -0.96264,0.510366 -0.78006,0.153532 -1.30288,0.228206 -1.57259,0.228206 h -2.50203 z m 0,12.999782 v -6.605698 h 0.52697 c 0.54356,0 1.03317,0.124476 1.46055,0.373439 0.31534,0.195024 0.67634,0.614096 1.07882,1.253089 l 3.19496,4.97917 h 6.76753 l -2.90452,-4.721914 c -0.14107,-0.228205 -0.42323,-0.564305 -0.83816,-1.00828 -0.41908,-0.439827 -0.73857,-0.72613 -0.95434,-0.858907 -0.32779,-0.19918 -0.84646,-0.398332 -1.56014,-0.601648 0.8921,-0.170123 1.58919,-0.385887 2.09956,-0.643143 0.80496,-0.406633 1.4315,-0.937745 1.89207,-1.593335 0.45643,-0.651442 0.68464,-1.431511 0.68464,-2.340208 0,-1.041478 -0.29875,-1.921131 -0.9004,-2.638962 -0.5975,-0.721978 -1.38587,-1.215747 -2.36096,-1.481301 -0.97923,-0.265542 -2.39414,-0.398334 -4.24474,-0.398334 h -9.97908 v 16.286032 h 6.03724"
+        id="path180"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 131.01539,95.036625 h 6.00405 V 78.750593 h -6.00405 z m 0,0"
+        id="path181"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 147.29312,88.816814 2.112,-5.846375 2.1203,5.846375 z m 6.46463,6.219811 h 6.2696 l -7.25714,-16.286032 h -6.58495 l -7.26128,16.286032 h 6.12437 l 0.97094,-2.684603 h 6.77166 l 0.9668,2.684603"
+        id="path182"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 161.5128,78.750593 h 6.00403 V 91.04499 h 9.34011 v 3.991635 H 161.5128 V 78.750593"
+        id="path183"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#00529b"
+        fill-opacity="1"
+        d="m 88.37296,145.09387 4.294532,-27.67588 4.282084,27.67588 z m 11.93755,21.81292 h 11.04962 L 98.522165,100.13612 h -11.55582 l -12.775719,66.77067 h 10.7965 l 1.85474,-12.09523 h 11.609757 l 1.858887,12.09523"
+        id="path184"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#00529b"
+        fill-opacity="1"
+        d="m 150.33456,145.09387 4.29454,-27.67588 4.28209,27.67588 z m 11.93756,21.81292 h 11.04961 l -12.83796,-66.77067 h -11.55582 l -12.77572,66.77067 h 10.7965 l 1.85475,-12.09523 h 11.60975 l 1.85889,12.09523"
+        id="path185"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#00529b"
+        fill-opacity="1"
+        d="m 107.77927,100.13612 h 32.0617 v 9.65544 h -10.75916 v 57.11523 h -10.54339 v -57.11523 h -10.75915 v -9.65544"
+        id="path186"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffd659"
+        fill-opacity="1"
+        d="m 97.38526,154.81156 c -13.174054,2.24475 -21.725778,2.79661 -21.725778,2.79661 -2.09125,0.17855 -3.311149,1.75516 -3.136877,3.33191 0.174278,1.57672 1.394168,3.15348 3.833959,2.80492 1.614081,-0.23245 10.319328,-0.78422 23.01621,-2.9543 l -0.921151,-5.97914 H 97.38526"
+        id="path187"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffd659"
+        fill-opacity="1"
+        d="m 151.25571,136.05253 c -0.69708,-7.01234 -7.66792,-7.80069 -15.50181,-7.36087 -1.90453,0.10379 -4.21154,0.25726 -6.67209,0.43153 v 6.43557 c 3.67629,-0.17428 6.81732,-0.32779 8.41481,-0.38173 4.87543,-0.17844 7.66376,0.17012 7.83803,1.751 0.17428,1.57674 -1.91698,7.53514 -28.21943,13.84626 -2.92942,0.7012 -5.76754,1.33605 -8.48949,1.90453 l 1.17426,6.11193 c 3.70117,-0.78838 7.60567,-1.69708 11.66784,-2.7593 18.11588,-4.73023 30.67998,-11.02472 29.78788,-19.97892"
+        id="path188"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffd659"
+        fill-opacity="1"
+        d="m 175.29681,106.2522 c -0.17434,-1.40246 -1.74272,-2.9792 -4.35677,-2.80078 -17.18229,1.14936 -51.273,6.88785 -68.80383,15.94579 -6.448021,3.33189 -7.493648,6.66379 -6.796563,10.51849 1.053919,5.81733 7.842193,6.48537 12.891903,6.48537 1.90868,0 5.86297,-0.14938 10.30687,-0.34854 v -6.11193 c -2.14519,0.17843 -4.12856,0.34855 -5.77998,0.50207 -3.8298,0.34854 -10.62223,0 -10.7965,-2.45639 -0.17428,-2.45225 4.70116,-5.95841 30.82936,-12.09109 18.93329,-4.44806 30.19866,-5.01651 37.97446,-6.13682 3.65969,-0.52696 4.70117,-2.1037 4.53105,-3.50617"
+        id="path189"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 174.50843,80.422762 h -0.63484 v -2.51448 h -0.91701 v -0.53941 h 2.46886 v 0.53941 h -0.91701 v 2.51448"
+        id="path190"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 178.71583,80.422762 h -0.59335 V 77.87094 h -0.009 l -0.56429,2.551822 h -0.62241 l -0.55602,-2.551822 h -0.009 v 2.551822 h -0.5892 v -3.05389 h 0.92529 l 0.54771,2.406601 h 0.009 l 0.54358,-2.406601 h 0.91698 v 3.05389"
+        id="path191"
+        style="stroke-width:1.06222"/>
+  </g>
+</svg>
diff --git a/Aaru.Gui/Assets/Logos/Buses/Dark/SCSI.png b/Aaru.Gui/Assets/Logos/Buses/Dark/SCSI.png
new file mode 100644
index 000000000..a99dd4e57
Binary files /dev/null and b/Aaru.Gui/Assets/Logos/Buses/Dark/SCSI.png differ
diff --git a/Aaru.Gui/Assets/Logos/Buses/Dark/SCSI.svg b/Aaru.Gui/Assets/Logos/Buses/Dark/SCSI.svg
new file mode 100644
index 000000000..b841af267
--- /dev/null
+++ b/Aaru.Gui/Assets/Logos/Buses/Dark/SCSI.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    width="100%"
+    height="100%"
+    version="1.1"
+    viewBox="0 0 122.92 125.21"
+    id="svg3"
+    sodipodi:docname="SCSI.svg"
+    inkscape:version="1.4.2 (ebf0e940, 2025-05-08)"
+    xmlns="http://www.w3.org/2000/svg"
+>
+  <defs
+      id="defs3"/>
+  <sodipodi:namedview
+      id="namedview3"
+      pagecolor="#ffffff"
+      bordercolor="#000000"
+      borderopacity="0.25"
+      inkscape:showpageshadow="2"
+      inkscape:pageopacity="0.0"
+      inkscape:pagecheckerboard="0"
+      inkscape:deskcolor="#d1d1d1"
+      showgrid="false"
+      inkscape:zoom="6.7406757"
+      inkscape:cx="61.418175"
+      inkscape:cy="62.605"
+      inkscape:window-width="1920"
+      inkscape:window-height="1021"
+      inkscape:window-x="0"
+      inkscape:window-y="31"
+      inkscape:window-maximized="1"
+      inkscape:current-layer="svg3"/>
+  <g
+      transform="translate(-2638.5 -2182.7)"
+      id="g3"
+      style="fill:#ffffff">
+    <g
+        transform="matrix(13.333 0 0 13.333 6.5963e-5 -8.9697e-6)"
+        id="g2"
+        style="fill:#ffffff">
+      <g
+          transform="translate(197.56 172.67)"
+          id="g1"
+          style="fill:#ffffff">
+        <path
+            d="m9.5469-3.5625v-1.4219h-4.5625c-0.9375 0-0.9375 1.4219 0 1.4219zm-1.1875 0.65625h-1.2969l-2.0312 2.0156-3.4062-3.3906 3.4062-3.3906 2.0312 2.0312h1.2969l-3.3281-3.3281-4.7031 4.6875 4.7031 4.7031z"
+            id="path1"
+            style="fill:#ffffff"/>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/Aaru.Gui/Assets/Logos/Buses/SATA.png b/Aaru.Gui/Assets/Logos/Buses/SATA.png
new file mode 100644
index 000000000..953688c15
Binary files /dev/null and b/Aaru.Gui/Assets/Logos/Buses/SATA.png differ
diff --git a/Aaru.Gui/Assets/Logos/Buses/SATA.svg b/Aaru.Gui/Assets/Logos/Buses/SATA.svg
new file mode 100644
index 000000000..a100c29d7
--- /dev/null
+++ b/Aaru.Gui/Assets/Logos/Buses/SATA.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    width="112.87776mm"
+    height="97.624901mm"
+    viewBox="0 0 112.87776 97.624901"
+    version="1.1"
+    id="svg1"
+    inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+    sodipodi:docname="Logo of SATA.svg"
+    xmlns="http://www.w3.org/2000/svg"
+>
+  <sodipodi:namedview
+      id="namedview1"
+      pagecolor="#ffffff"
+      bordercolor="#000000"
+      borderopacity="0.25"
+      inkscape:showpageshadow="2"
+      inkscape:pageopacity="0.0"
+      inkscape:pagecheckerboard="0"
+      inkscape:deskcolor="#d1d1d1"
+      inkscape:document-units="mm"
+      inkscape:zoom="0.32363343"
+      inkscape:cx="-20.084451"
+      inkscape:cy="434.13314"
+      inkscape:window-width="1870"
+      inkscape:window-height="1011"
+      inkscape:window-x="0"
+      inkscape:window-y="0"
+      inkscape:window-maximized="1"
+      inkscape:current-layer="layer1"/>
+  <defs
+      id="defs1"/>
+  <g
+      inkscape:label="Layer 1"
+      inkscape:groupmode="layer"
+      id="layer1"
+      transform="translate(-67.46875,-75.40625)">
+    <path
+        fill-rule="nonzero"
+        fill="#c70651"
+        fill-opacity="1"
+        d="M 67.46875,173.03115 H 180.34651 V 75.40625 H 67.46875 Z m 0,0"
+        id="path176"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="M 70.954168,169.35487 H 176.68682 V 97.667285 H 70.954168 Z m 0,0"
+        id="path177"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 70.900226,89.675721 5.688699,-0.290444 c 0.124476,0.771771 0.377589,1.360972 0.759324,1.767604 0.618247,0.65974 1.506199,0.987535 2.659707,0.987535 0.863056,0 1.526945,-0.165967 1.991667,-0.502064 0.464721,-0.336094 0.697082,-0.72613 0.697082,-1.170105 0,-0.427379 -0.219925,-0.809117 -0.659736,-1.136912 -0.443979,-0.340243 -1.464708,-0.655591 -3.074639,-0.950189 -2.630661,-0.497919 -4.506147,-1.161807 -5.630611,-1.99167 -1.128611,-0.817412 -1.692916,-1.867188 -1.692916,-3.141023 0,-0.84646 0.286288,-1.638979 0.867205,-2.385855 0.576753,-0.742724 1.448108,-1.327778 2.609915,-1.755157 1.161807,-0.427376 2.755139,-0.643143 4.775853,-0.643143 2.481286,0 4.373369,0.390036 5.676252,1.161807 1.302882,0.771771 2.078803,1.999968 2.327763,3.684586 l -5.655509,0.278008 c -0.149377,-0.726127 -0.464722,-1.25309 -0.94604,-1.585034 -0.485471,-0.331945 -1.149359,-0.497918 -1.999965,-0.497918 -0.697085,0 -1.224048,0.124476 -1.576738,0.365141 -0.35684,0.248951 -0.531112,0.547708 -0.531112,0.904548 0,0.269697 0.145222,0.506216 0.435677,0.709533 0.286319,0.211615 0.958491,0.414928 2.016562,0.601648 2.622365,0.473023 4.502,0.954341 5.63476,1.43566 1.136912,0.48547 1.962622,1.09127 2.477137,1.813248 0.518665,0.717831 0.77592,1.526945 0.77592,2.414896 0,1.049776 -0.344392,2.016565 -1.033176,2.900367 -0.688787,0.879653 -1.651423,1.543542 -2.887919,1.995816 -1.236492,0.448125 -2.796634,0.672187 -4.680419,0.672187 -3.302847,0 -5.593265,-0.531108 -6.862954,-1.589183 -1.273838,-1.058074 -1.995816,-2.410747 -2.161789,-4.053872"
+        id="path178"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 91.032665,78.750593 h 16.115905 v 3.460523 H 97.036712 v 2.614063 h 9.377438 v 3.323597 h -9.377438 v 3.215711 h 10.394018 v 3.672138 H 91.032665 V 78.750593"
+        id="path179"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 116.2895,82.036843 h 2.60577 c 1.08297,0 1.82154,0.141067 2.21573,0.419081 0.39003,0.282163 0.5892,0.684635 0.5892,1.211597 0,0.360992 -0.12863,0.67634 -0.37344,0.950192 -0.24895,0.278008 -0.5726,0.448125 -0.96264,0.510366 -0.78006,0.153532 -1.30288,0.228206 -1.57259,0.228206 h -2.50203 z m 0,12.999782 v -6.605698 h 0.52697 c 0.54356,0 1.03317,0.124476 1.46055,0.373439 0.31534,0.195024 0.67634,0.614096 1.07882,1.253089 l 3.19496,4.97917 h 6.76753 l -2.90452,-4.721914 c -0.14107,-0.228205 -0.42323,-0.564305 -0.83816,-1.00828 -0.41908,-0.439827 -0.73857,-0.72613 -0.95434,-0.858907 -0.32779,-0.19918 -0.84646,-0.398332 -1.56014,-0.601648 0.8921,-0.170123 1.58919,-0.385887 2.09956,-0.643143 0.80496,-0.406633 1.4315,-0.937745 1.89207,-1.593335 0.45643,-0.651442 0.68464,-1.431511 0.68464,-2.340208 0,-1.041478 -0.29875,-1.921131 -0.9004,-2.638962 -0.5975,-0.721978 -1.38587,-1.215747 -2.36096,-1.481301 -0.97923,-0.265542 -2.39414,-0.398334 -4.24474,-0.398334 h -9.97908 v 16.286032 h 6.03724"
+        id="path180"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 131.01539,95.036625 h 6.00405 V 78.750593 h -6.00405 z m 0,0"
+        id="path181"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 147.29312,88.816814 2.112,-5.846375 2.1203,5.846375 z m 6.46463,6.219811 h 6.2696 l -7.25714,-16.286032 h -6.58495 l -7.26128,16.286032 h 6.12437 l 0.97094,-2.684603 h 6.77166 l 0.9668,2.684603"
+        id="path182"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 161.5128,78.750593 h 6.00403 V 91.04499 h 9.34011 v 3.991635 H 161.5128 V 78.750593"
+        id="path183"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#00529b"
+        fill-opacity="1"
+        d="m 88.37296,145.09387 4.294532,-27.67588 4.282084,27.67588 z m 11.93755,21.81292 h 11.04962 L 98.522165,100.13612 h -11.55582 l -12.775719,66.77067 h 10.7965 l 1.85474,-12.09523 h 11.609757 l 1.858887,12.09523"
+        id="path184"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#00529b"
+        fill-opacity="1"
+        d="m 150.33456,145.09387 4.29454,-27.67588 4.28209,27.67588 z m 11.93756,21.81292 h 11.04961 l -12.83796,-66.77067 h -11.55582 l -12.77572,66.77067 h 10.7965 l 1.85475,-12.09523 h 11.60975 l 1.85889,12.09523"
+        id="path185"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#00529b"
+        fill-opacity="1"
+        d="m 107.77927,100.13612 h 32.0617 v 9.65544 h -10.75916 v 57.11523 h -10.54339 v -57.11523 h -10.75915 v -9.65544"
+        id="path186"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffd659"
+        fill-opacity="1"
+        d="m 97.38526,154.81156 c -13.174054,2.24475 -21.725778,2.79661 -21.725778,2.79661 -2.09125,0.17855 -3.311149,1.75516 -3.136877,3.33191 0.174278,1.57672 1.394168,3.15348 3.833959,2.80492 1.614081,-0.23245 10.319328,-0.78422 23.01621,-2.9543 l -0.921151,-5.97914 H 97.38526"
+        id="path187"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffd659"
+        fill-opacity="1"
+        d="m 151.25571,136.05253 c -0.69708,-7.01234 -7.66792,-7.80069 -15.50181,-7.36087 -1.90453,0.10379 -4.21154,0.25726 -6.67209,0.43153 v 6.43557 c 3.67629,-0.17428 6.81732,-0.32779 8.41481,-0.38173 4.87543,-0.17844 7.66376,0.17012 7.83803,1.751 0.17428,1.57674 -1.91698,7.53514 -28.21943,13.84626 -2.92942,0.7012 -5.76754,1.33605 -8.48949,1.90453 l 1.17426,6.11193 c 3.70117,-0.78838 7.60567,-1.69708 11.66784,-2.7593 18.11588,-4.73023 30.67998,-11.02472 29.78788,-19.97892"
+        id="path188"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffd659"
+        fill-opacity="1"
+        d="m 175.29681,106.2522 c -0.17434,-1.40246 -1.74272,-2.9792 -4.35677,-2.80078 -17.18229,1.14936 -51.273,6.88785 -68.80383,15.94579 -6.448021,3.33189 -7.493648,6.66379 -6.796563,10.51849 1.053919,5.81733 7.842193,6.48537 12.891903,6.48537 1.90868,0 5.86297,-0.14938 10.30687,-0.34854 v -6.11193 c -2.14519,0.17843 -4.12856,0.34855 -5.77998,0.50207 -3.8298,0.34854 -10.62223,0 -10.7965,-2.45639 -0.17428,-2.45225 4.70116,-5.95841 30.82936,-12.09109 18.93329,-4.44806 30.19866,-5.01651 37.97446,-6.13682 3.65969,-0.52696 4.70117,-2.1037 4.53105,-3.50617"
+        id="path189"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 174.50843,80.422762 h -0.63484 v -2.51448 h -0.91701 v -0.53941 h 2.46886 v 0.53941 h -0.91701 v 2.51448"
+        id="path190"
+        style="stroke-width:1.06222"/>
+    <path
+        fill-rule="nonzero"
+        fill="#ffffff"
+        fill-opacity="1"
+        d="m 178.71583,80.422762 h -0.59335 V 77.87094 h -0.009 l -0.56429,2.551822 h -0.62241 l -0.55602,-2.551822 h -0.009 v 2.551822 h -0.5892 v -3.05389 h 0.92529 l 0.54771,2.406601 h 0.009 l 0.54358,-2.406601 h 0.91698 v 3.05389"
+        id="path191"
+        style="stroke-width:1.06222"/>
+  </g>
+</svg>
diff --git a/Aaru.Gui/Assets/Logos/Buses/SCSI.png b/Aaru.Gui/Assets/Logos/Buses/SCSI.png
new file mode 100644
index 000000000..b389b43b8
Binary files /dev/null and b/Aaru.Gui/Assets/Logos/Buses/SCSI.png differ
diff --git a/Aaru.Gui/Assets/Logos/Buses/SCSI.svg b/Aaru.Gui/Assets/Logos/Buses/SCSI.svg
new file mode 100644
index 000000000..17a41c9dd
--- /dev/null
+++ b/Aaru.Gui/Assets/Logos/Buses/SCSI.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 122.92 125.21" xmlns="http://www.w3.org/2000/svg">
+  <g transform="translate(-2638.5 -2182.7)">
+    <g transform="matrix(13.333 0 0 13.333 6.5963e-5 -8.9697e-6)">
+      <g transform="translate(197.56 172.67)">
+        <path d="m9.5469-3.5625v-1.4219h-4.5625c-0.9375 0-0.9375 1.4219 0 1.4219zm-1.1875 0.65625h-1.2969l-2.0312 2.0156-3.4062-3.3906 3.4062-3.3906 2.0312 2.0312h1.2969l-3.3281-3.3281-4.7031 4.6875 4.7031 4.7031z"/>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Panels/ImageInfo.xaml b/Aaru.Gui/Views/Panels/ImageInfo.xaml
index df2bf96c7..15d526f06 100644
--- a/Aaru.Gui/Views/Panels/ImageInfo.xaml
+++ b/Aaru.Gui/Views/Panels/ImageInfo.xaml
@@ -74,7 +74,14 @@
         <TabControl Grid.Row="5">
             <TabItem>
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:UI.Title_General}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Icons/entypo/InfoWithCircle.svg', Mode=OneWay}"
+                             VerticalAlignment="Center" />
+                        <TextBlock Text="{x:Static localization:UI.Title_General}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Auto">
@@ -224,7 +231,14 @@
             </TabItem>
             <TabItem IsVisible="{Binding !!Sessions.Count, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:UI.Title_Sessions}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Icons/phosphor/VinylRecord.svg', Mode=OneWay}"
+                             VerticalAlignment="Center" />
+                        <TextBlock Text="{x:Static localization:UI.Title_Sessions}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <DataGrid ItemsSource="{Binding Sessions, Mode=OneWay}"
                           IsVisible="{Binding !!Sessions.Count, Mode=OneWay}"
@@ -318,7 +332,14 @@
             </TabItem>
             <TabItem IsVisible="{Binding !!Tracks.Count, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:UI.Title_Tracks}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Icons/phosphor/Disc.svg', Mode=OneWay}"
+                             VerticalAlignment="Center" />
+                        <TextBlock Text="{x:Static localization:UI.Title_Tracks}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <DataGrid ItemsSource="{Binding Tracks, Mode=OneWay}"
                           IsVisible="{Binding !!Tracks.Count, Mode=OneWay}"
@@ -460,7 +481,14 @@
             </TabItem>
             <TabItem IsVisible="{Binding !!DumpHardwareList.Count, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:UI.Title_Dump_hardware}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Icons/phosphor/Toolbox.svg', Mode=OneWay}"
+                             VerticalAlignment="Center" />
+                        <TextBlock Text="{x:Static localization:UI.Title_Dump_hardware}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <DataGrid ItemsSource="{Binding DumpHardwareList, Mode=OneWay}"
                           IsVisible="{Binding !!DumpHardwareList.Count, Mode=OneWay}"
@@ -616,63 +644,114 @@
             </TabItem>
             <TabItem IsVisible="{Binding !!ScsiInfo, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:UI.Title_SCSI}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Logos/Buses/SCSI.svg', Mode=OneWay}" />
+                        <TextBlock Text="{x:Static localization:UI.Title_SCSI}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <ContentControl Content="{Binding ScsiInfo, Mode=OneWay}"
                                 Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!AtaInfo, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:UI.Title_ATA_ATAPI}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Logos/Buses/SATA.svg', Mode=OneWay}" />
+                        <TextBlock Text="{x:Static localization:UI.Title_ATA_ATAPI}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <ContentControl Content="{Binding AtaInfo, Mode=OneWay}"
                                 Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!CompactDiscInfo, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:Core.Title_CompactDisc}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Logos/Media/CD.svg', Mode=OneWay}" />
+                        <TextBlock Text="{x:Static localization:Core.Title_CompactDisc}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <ContentControl Content="{Binding CompactDiscInfo, Mode=OneWay}"
                                 Margin="8" />
             </TabItem>
-            <TabItem IsVisible="{Binding !!DvdInfo, Mode=OneWay}">
-                <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:Core.Title_DVD_HD_DVD}" />
+            <TabItem IsVisible="{Binding !!DvdInfo, Mode=OneWay}">                <TabItem.Header>
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Logos/Media/DVDDownload.svg', Mode=OneWay}" />
+                        <TextBlock Text="{x:Static localization:Core.Title_DVD_HD_DVD}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <ContentControl Content="{Binding DvdInfo, Mode=OneWay}"
                                 Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!DvdWritableInfo, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:Core.Title_DVD_Plus_Dash_R_W}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Logos/Media/DVDRW.svg', Mode=OneWay}" />
+                        <TextBlock Text="{x:Static localization:Core.Title_DVD_Plus_Dash_R_W}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <ContentControl Content="{Binding DvdWritableInfo, Mode=OneWay}"
                                 Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!BlurayInfo, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:Core.Title_Blu_ray}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Logos/Media/BDROM.svg', Mode=OneWay}" />
+                        <TextBlock Text="{x:Static localization:Core.Title_Blu_ray}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <ContentControl Content="{Binding BlurayInfo, Mode=OneWay}"
                                 Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!PcmciaInfo, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:UI.Title_PCMCIA}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <TextBlock Text="{x:Static localization:UI.Title_PCMCIA}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <ContentControl Content="{Binding PcmciaInfo, Mode=OneWay}"
                                 Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!SdMmcInfo, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:UI.Title_SD_MMC}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Logos/Media/SecureDigital.svg', Mode=OneWay}" />
+                        <TextBlock Text="{x:Static localization:UI.Title_SD_MMC}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <ContentControl Content="{Binding SdMmcInfo, Mode=OneWay}"
                                 Margin="8" />
             </TabItem>
             <TabItem IsVisible="{Binding !!XboxInfo, Mode=OneWay}">
                 <TabItem.Header>
-                    <TextBlock Text="{x:Static localization:Core.Title_Xbox}" />
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="4">
+                        <Svg MaxHeight="24"
+                             Path="{Binding $parent[UserControl].ActualThemeVariant, Converter={StaticResource ThemeToSvgPathConverter}, ConverterParameter='/Assets/Logos/Media/XGD.svg', Mode=OneWay}" />
+                        <TextBlock Text="{x:Static localization:Core.Title_Xbox}"
+                                   VerticalAlignment="Center" />
+                    </StackPanel>
                 </TabItem.Header>
                 <ContentControl Content="{Binding XboxInfo, Mode=OneWay}"
                                 Margin="8" />