diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..f3fdae91
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+scripts/icons.manifest -text
+scripts/*.sh text eol=lf
diff --git a/.github/workflows/architecture-boundaries.yml b/.github/workflows/architecture-boundaries.yml
index ae36b7e4..a3093fc6 100644
--- a/.github/workflows/architecture-boundaries.yml
+++ b/.github/workflows/architecture-boundaries.yml
@@ -15,3 +15,6 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y ripgrep
       - name: Check architecture boundaries
         run: bash scripts/check-architecture-boundaries.sh
+      # A missing or mis-painted icon is silent at runtime, so it has to be caught here.
+      - name: Check icon references
+        run: bash scripts/check-icon-references.sh
diff --git a/AGENTS.md b/AGENTS.md
index 51b26975..cb211528 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -20,7 +20,7 @@ This is a Rust 2024 Cargo workspace.
 * `crates/nyaterm-store`: transitional persistence façade. The implementation currently remains in `nyaterm-core`; do not expand the re-export-only boundary without either moving the implementation or updating consumers to use this crate.
 * `crates/nyaterm-legacy`: migration and legacy-source compatibility only. Do not add new product features here.
 * `crates/nyaterm-otp`: bundled OTP implementation used for HOTP/TOTP compatibility.
-* `crates/nyaterm-app/assets`: application SVG assets.
+* `crates/nyaterm-app/assets`: bundled icon assets. `icons/**` is monochrome and painted with `svg()`; `color/**` is full color and painted with `img()`. The two are not interchangeable — see `docs/third-party-icons.md`. Assets are vendored by `scripts/sync-icons.sh` from `scripts/icons.manifest` and committed, so add or change icons through the manifest rather than by hand.
 * `vendor/`: modified or pinned third-party dependencies such as `russh`, `russh-sftp`, and `zmodem2`.
 
 ## Architectural Rules
diff --git a/Cargo.lock b/Cargo.lock
index 70aa8517..450440b2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4212,9 +4212,11 @@ dependencies = [
  "gpui",
  "nyaterm-core",
  "nyaterm-desktop",
+ "rust-embed",
  "tracing",
  "tracing-appender",
  "tracing-subscriber",
+ "usvg",
 ]
 
 [[package]]
@@ -4299,6 +4301,7 @@ dependencies = [
  "alacritty_terminal",
  "encoding_rs",
  "flate2",
+ "memchr",
  "unicode-width",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index c2a57879..8a9a78fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -55,6 +55,7 @@ redb = "4.1.0"
 regex = "1.11.1"
 russh = { path = "vendor/russh/russh", features = ["des", "dsa"] }
 russh-sftp = { path = "vendor/russh-sftp" }
+rust-embed = { version = "8.11", features = ["include-exclude", "debug-embed"] }
 serialport = { version = "4", default-features = false }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["raw_value"] }
@@ -68,6 +69,9 @@ tokio-socks = "0.5.2"
 tracing = "0.1"
 tracing-appender = "0.2.4"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
+# Test-only. Feature set must mirror gpui's own usvg dependency (default-features
+# = false) so asset tests cannot pass under capabilities the app does not build.
+usvg = { version = "0.45", default-features = false }
 uuid = { version = "1", features = ["v4", "serde"] }
 vte = "0.14"
 zmodem2 = { path = "vendor/zmodem2" }
diff --git a/crates/nyaterm-app/Cargo.toml b/crates/nyaterm-app/Cargo.toml
index c36d4c04..c800e17e 100644
--- a/crates/nyaterm-app/Cargo.toml
+++ b/crates/nyaterm-app/Cargo.toml
@@ -11,10 +11,18 @@ anyhow.workspace = true
 gpui.workspace = true
 nyaterm-core.workspace = true
 nyaterm-desktop.workspace = true
+rust-embed.workspace = true
 tracing.workspace = true
 tracing-appender.workspace = true
 tracing-subscriber.workspace = true
 
+[dev-dependencies]
+usvg.workspace = true
+
+[lib]
+name = "nyaterm_app"
+path = "src/lib.rs"
+
 [[bin]]
 name = "nyaterm"
 path = "src/main.rs"
diff --git a/crates/nyaterm-app/assets/color/brand/mobaxterm.png b/crates/nyaterm-app/assets/color/brand/mobaxterm.png
new file mode 100644
index 00000000..6fa3021f
Binary files /dev/null and b/crates/nyaterm-app/assets/color/brand/mobaxterm.png differ
diff --git a/crates/nyaterm-app/assets/color/brand/windterm.png b/crates/nyaterm-app/assets/color/brand/windterm.png
new file mode 100644
index 00000000..f438ed99
Binary files /dev/null and b/crates/nyaterm-app/assets/color/brand/windterm.png differ
diff --git a/crates/nyaterm-app/assets/color/brand/xshell.png b/crates/nyaterm-app/assets/color/brand/xshell.png
new file mode 100644
index 00000000..c9e95488
Binary files /dev/null and b/crates/nyaterm-app/assets/color/brand/xshell.png differ
diff --git a/crates/nyaterm-app/assets/color/os/alibabacloudlinux.svg b/crates/nyaterm-app/assets/color/os/alibabacloudlinux.svg
new file mode 100644
index 00000000..a50bbbca
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/alibabacloudlinux.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M51.2 422.86l62.26 35.994v211.2L512 900.71l398.54-230.656V461.158l62.26-36.096V706.1L512 972.8 51.2 706.048V422.912z m116.429 58.88l326.86 192.513v144.384L167.63 626.074V481.69z m692.633-1.126v144.384l-326.86 191.488V672.102l326.86-191.488zM167.63 300.902l326.86 192.512v144.384L167.63 445.184V300.8v0.102z m692.633 0v144.333l-326.86 191.488V492.34l326.86-191.488zM237.67 567.552a27.29 27.29 0 1 0 0.052 54.528 27.29 27.29 0 0 0-0.052-54.528zM513.946 51.2l346.316 202.854L513.946 456.91 167.629 254.054 513.946 51.2zM235.725 386.714a25.344 25.344 0 1 0 0.102 50.688 25.344 25.344 0 0 0-0.102-50.688z" fill="#FF6A00"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/almalinux.svg b/crates/nyaterm-app/assets/color/os/almalinux.svg
new file mode 100644
index 00000000..12a9bbe3
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/almalinux.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M528.854082 409.853034c0.415965 6.591438 0.831929 15.262698 0.831929 23.517994 0 2.047825-1.247894 3.711683-2.079822 5.759509-1.631861-1.215896-4.511615-1.631861-5.343544-3.295719-5.759509-11.966979-11.519017-23.933958-16.478594-35.900937a282.983858 282.983858 0 0 1-18.974382-82.552958 391.902566 391.902566 0 0 1 1.247894-58.171037 219.821246 219.821246 0 0 1 9.055227-45.820091 317.988872 317.988872 0 0 1 18.142453-47.867916 260.681761 260.681761 0 0 1 68.826128-86.648608c14.014804-11.966979 30.493399-18.558417 48.635851-20.638239 17.310523-1.663858 35.037011-2.495787 50.299708 8.255296 9.919154 7.007402 16.478594 15.678662 18.558417 28.47757 3.295719 20.222275 5.343544 40.860514 14.814736 59.418931 18.974381 37.116833 47.835919 51.195632 86.168649 50.331706 13.182875-0.383967 26.365751-0.383967 38.33273 4.959577 17.310523 7.839331 22.654067 23.517994 23.070032 41.276478 0.415965 18.174449-0.799932 36.316902-7.007403 53.659423-4.92758 14.014804-10.719086 13.59884-20.606242 9.471192-32.957188-13.59884-67.194267-16.478594-102.231278-11.966979-8.223298 1.279891-16.478594 1.663858-24.73389 2.495787-6.591438 0.415965-10.719086-2.495787-11.934982-9.087225-0.831929-3.711683-1.247894-7.839331-1.663858-11.551015-2.047825-30.557393-10.303121-58.618999-30.077434-82.552957-13.59884-16.510591-31.357325-25.597816-53.179463-20.638239-17.310523 3.711683-29.693467 15.678662-39.996588 29.309499-14.814736 19.838308-23.485996 42.524372-29.245505 66.874295a643.337115 643.337115 0 0 0-14.430769 132.884663z" fill="#F6CD49"></path><path d="M701.799328 754.463635c-0.831929 32.605218-6.175473 67.258262-21.022207 99.86348-12.382944 27.645641-34.237079 46.236055-63.482584 54.491351-16.894559 4.959577-34.621046-2.079823-45.756096-16.510591-11.519017-15.262698-23.901961-29.725464-39.996588-40.44455-29.245505-18.974381-58.938972-18.558417-89.016406-2.079822-8.639263 4.959577-16.894559 10.751083-25.981783 14.878731-23.901961 11.519017-41.212484 7.423367-56.475182-14.878731a126.165237 126.165237 0 0 1-21.022207-49.499777c-0.383967-3.327716-0.799932-6.623435-0.383967-9.503189 0.799932-5.375541 3.295719-9.919154 9.055228-10.719086 40.79652-5.759509 75.001601-25.181852 106.326929-50.779668 2.879754-2.46379 6.20747-4.959577 9.503189-7.039399 8.639263-5.759509 14.014804-4.92758 19.774313 3.74368 10.303121 14.846733 21.022207 28.893535 35.452975 40.028585 15.262698 11.966979 31.741292 21.886133 51.93157 23.102029 25.981783 1.279891 47.419954-14.430769 55.259286-40.444549 8.223298-28.061606 5.759509-56.123212-1.663858-84.152821a468.63202 468.63202 0 0 0-35.452976-92.888075c-8.639263-17.34252-18.942384-33.821115-28.445573-50.747671-1.631861-2.495787-2.047825-5.759509-2.879754-8.67126 3.711683 0.415965 8.255296-0.415965 10.719085 1.631861 17.310523 12.798908 35.037011 25.181852 50.299709 39.644617a267.241201 267.241201 0 0 1 74.20167 125.4293c6.175473 24.38192 9.471192 48.315878 9.055227 75.545555z" fill="#5EC0F9"></path><path d="M722.789537 438.26661c-27.613644 3.327716-57.275114 6.20747-86.96858 10.751083-18.142452 2.879754-35.86894 9.087225-53.595428 14.014805-1.663858 0.415965-3.711683-0.415965-5.759508-0.415965 0.799932-2.46379 0.799932-5.343544 2.047825-6.591438 5.759509-5.759509 11.519017-11.13505 17.726488-16.094627a288.967347 288.967347 0 0 1 87.800509-47.867916 257.162061 257.162061 0 0 1 115.830118-11.13505 233.996037 233.996037 0 0 1 91.512193 30.94136c18.942384 10.719086 37.500801 22.2701 50.683676 40.028585 14.846733 20.222275 22.686065 42.908339 19.80631 68.922121-1.663858 16.926556-10.719086 27.645641-25.981783 34.653043-14.846733 7.039399-30.077434 13.630837-43.260309 23.549991-33.821115 24.73389-43.292307 60.25086-31.741292 101.111374 2.46379 8.639263 4.095651 17.310523 5.343544 25.981783 2.46379 23.517994-9.471192 40.028585-32.157257 46.236056a154.418826 154.418826 0 0 1-49.46778 5.343544c-13.59884-0.383967-16.478594-5.343544-15.678662-18.558417 0.863926-17.758485 0.447962-35.51697-1.599864-53.243457-1.663858-14.846733-6.20747-29.3095-9.919153-44.156233-2.047825-8.255296-5.759509-16.094627-9.055228-24.317926-4.959577-11.998976-2.079823-18.590414 10.303121-22.718061 26.365751-8.255296 49.051815-21.886133 67.578235-42.940337 9.919154-11.519017 16.926556-24.73389 17.726488-39.996588 1.247894-19.838308-8.223298-35.51697-23.485997-47.899913-13.59884-11.13505-29.277502-16.926556-45.756096-20.222275-16.894559-2.46379-33.373153-3.295719-51.93157-5.375542z" fill="#9AD850"></path><path d="M797.695147 33.021183c38.33273-1.215896 76.665459 34.237079 77.113421 77.177416 0.383967 42.108408-34.653044 78.841274-75.865528 79.673203-42.876342 0.383967-77.497389-34.269076-77.497388-78.42531 0-42.940337 34.237079-78.009345 76.249495-78.393312z" fill="#F6CD49"></path><path d="M459.707981 434.202957c6.591438 2.079823 14.398772 4.57561 22.686065 7.455364 1.631861 0.831929 3.295719 2.46379 4.92758 4.127648-1.631861 1.247894-3.295719 3.711683-4.92758 3.711683-13.214873 1.247894-26.397748 2.46379-39.580623 2.879755a271.656824 271.656824 0 0 1-83.672862-11.519018c-18.558417-5.791506-36.700869-13.24687-54.011392-21.470168a242.795287 242.795287 0 0 1-39.580623-24.349923 374.688034 374.688034 0 0 1-38.33273-33.853112c-25.949786-27.229677-44.508203-59.418931-56.859149-95.351865a88.856419 88.856419 0 0 1-2.079823-52.795496c4.543612-16.958553 9.919154-33.437147 25.565819-44.156233 9.887157-7.039399 20.606242-9.919154 32.957188-7.455364 20.222275 4.159645 39.996588 9.503189 61.018795 7.0394 41.212484-4.543612 64.730478-26.429745 77.497388-63.162612 4.127648-12.382944 8.639263-24.765887 18.142452-34.237079 13.59884-13.630837 30.077434-12.798908 46.588026-7.455364 17.278526 5.759509 33.373153 13.630837 47.387957 25.597816 11.13505 9.503189 9.055227 14.846733 1.663858 22.718062-24.317925 25.981783-39.164659 56.955141-47.035987 91.608185a258.313963 258.313963 0 0 1-6.55944 23.933958c-1.663858 6.175473-6.20747 9.087225-12.382944 7.839331-3.711683-0.831929-7.839331-1.247894-11.519017-2.46379-29.277502-8.67126-58.555005-10.751083-87.80051-0.831929-20.222275 7.007402-35.037011 20.638239-37.948762 42.90834-2.46379 17.758485 4.159645 33.437147 13.214872 47.867916 13.59884 21.054204 31.741292 37.148831 51.93157 50.779668a563.951888 563.951888 0 0 0 118.709872 60.666824z" fill="#EB5651"></path><path d="M202.001967 49.531774C214.384911 12.830905 260.940939-10.303121 301.353491 4.57561c39.548626 14.430769 61.434759 60.666824 47.803922 99.031551-14.846733 40.028585-59.770901 60.25086-100.983385 44.988162-39.996588-14.846733-61.018794-59.418931-46.172061-99.063549z" fill="#EB5651"></path><path d="M564.915006 936.784081c0.831929 64.378508-51.93157 100.695409-102.199281 82.552957-33.40515-12.382944-50.715673-45.436124-47.00399-82.136993 2.879754-28.061606 16.06263-50.779668 42.044413-63.546579 25.565819-12.382944 51.099641-9.087225 73.785705 7.839332 21.438171 16.094627 32.957188 38.396724 33.40515 55.291283z" fill="#5EC0F9"></path><path d="M1024.043837 656.264012c0.415965 26.781715-9.919154 48.667848-31.357325 64.346511-31.29333 23.134026-77.881356 16.094627-101.783317-15.262698-14.430769-18.974381-19.390346-40.028585-14.846733-63.99454 4.543612-23.485996 16.06263-41.244481 36.668871-52.379532 34.653044-18.558417 78.329318-10.335118 99.351524 21.854136 8.639263 13.214873 11.966979 26.013781 11.96698 45.436123z" fill="#9AD850"></path><path d="M384.802372 628.650368c21.438171-17.758485 45.340132-35.900937 67.610232-55.707247 13.59884-12.382944 25.117857-26.84571 37.916765-40.44455 1.215896-1.279891 3.295719-1.663858 4.92758-2.879754 0.831929 2.46379 2.495787 4.92758 1.663858 6.591438-1.663858 7.839331-3.711683 15.678662-6.591438 23.102029a289.831274 289.831274 0 0 1-48.635851 87.480536c-25.149854 30.973358-56.059217 54.491351-91.512193 71.833872a244.299158 244.299158 0 0 1-94.00798 23.102029c-21.822138 0.831929-43.676274 1.215896-64.314513-6.623435-23.485996-9.055227-42.012416-23.933958-53.56343-47.451951-7.423367-15.262698-5.759509-29.3095 3.295719-43.324304 8.639263-13.630837 18.142452-27.645641 23.901961-42.90834 15.262698-39.228653 4.159645-73.913694-27.19768-102.775232a165.74586 165.74586 0 0 1-18.558417-19.390345c-14.814736-18.558417-13.182875-38.812689 2.495787-56.539177 11.103053-12.798908 24.317925-22.718062 38.716697-30.973358 11.966979-7.007402 16.510591-4.127648 23.102029 7.423367 8.639263 15.294695 18.558417 30.557393 29.693467 44.156233 9.471192 11.583012 21.022207 21.470168 32.125259 31.805287 6.20747 5.759509 13.59884 10.719086 20.606242 15.678662 10.719086 7.423367 11.966979 14.430769 3.327717 24.317925-17.726488 21.086201-29.693467 45.020159-33.821115 72.249837-2.46379 14.846733-0.831929 30.141429 6.175473 43.324304 9.503189 17.758485 25.981783 25.597816 45.372129 28.061606 17.278526 2.079823 33.789117-1.215896 49.435783-7.423367 16.510591-6.175473 30.94136-14.430769 47.835919-22.718062z" fill="#2B67D3"></path><path d="M13.730029 606.700241c-14.846733-22.2701-17.726488-46.204058-8.255296-71.38591C19.521535 498.997429 62.397877 479.959053 99.450716 493.621888c22.2701 8.255296 37.532798 23.517994 46.588025 46.236055 8.639263 22.2701 8.639263 43.324304-2.879754 63.962544-19.390346 34.237079-60.60283 50.747671-95.639841 34.653043-13.59884-6.591438-23.485996-15.262698-33.789117-31.773289z" fill="#2B67D3"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/alpine-linux.svg b/crates/nyaterm-app/assets/color/os/alpine-linux.svg
new file mode 100644
index 00000000..e5411687
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/alpine-linux.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1182 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M786.407187 63.635197H311.067472L73.472803 475.263598l237.592813 411.628402H786.405331L1024 475.263598 786.407187 63.635197zM346.678825 548.41335l72.110112-72.186229v100.139525c-25.302217-0.542098-49.536948-12.145213-72.110112-27.953296z m283.310943 19.630614c-44.084412-45.450795-100.85799-102.371036-162.506733-163.702319l-165.113258 163.32545c-26.026252 18.32364-69.470171 5.526796-103.629742-19.324292l269.413196-266.370395c85.239269 89.661448 173.712558 178.58401 265.546109 266.741694-44.29234 31.74798-84.247899 33.994343-103.709572 19.329862z m157.458915 0l-132.401755-131.956196-13.208987 13.20713-61.819541-61.141919 75.058232-75.076797c80.028078 80.629583 158.660069 159.985609 236.079766 235.63792-38.186316 27.379639-80.538615 36.77909-103.707715 19.329862z" fill="#0F7EA8"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/android.svg b/crates/nyaterm-app/assets/color/os/android.svg
new file mode 100644
index 00000000..f04349ec
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/android.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1754 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M1753.985003 1023.998287H0c18.855928-167.231595 76.518274-317.964253 163.778329-447.155109l-2.249076 3.506366c69.118419-105.732287 158.735465-192.33629 263.809986-255.911668l33.599112-18.855928-147.608274-249.231243a37.266494 37.266494 0 0 1 12.278279-51.084697l0.171293-0.109628a36.584748 36.584748 0 0 1 50.317304 12.990858l0.109627 0.171293 151.988236 255.796902c101.347187-41.656733 218.974057-65.829594 342.243315-65.829594 4.056217 0 8.050769 0 12.113838 0.054814h-0.602951c3.234011-0.054814 7.070973-0.054814 10.853121-0.054814a888.643848 888.643848 0 0 1 342.191928 68.022144l-5.919885-2.19255 151.284222-255.80718A36.612155 36.612155 0 0 1 1409.929407 0.164904a36.243875 36.243875 0 0 1 19.732948 5.810257l-0.171293-0.109628a37.285337 37.285337 0 0 1 11.620514 51.303952l0.109628-0.171293-147.603136 249.948961 36.559054 20.445526c108.085852 68.022144 196.986893 156.707356 263.261849 261.178927l2.028109 3.398452c80.243896 123.159632 136.371457 269.291361 157.968072 426.382413l0.602951 5.536189z m-548.120314-327.392217a73.078712 73.078712 0 0 0 73.065008 73.065008 73.078712 73.078712 0 0 0 73.065009-73.065008 73.078712 73.078712 0 0 0-73.065009-73.065008 73.078712 73.078712 0 0 0-73.065008 73.065008z m-803.927493 0A73.078712 73.078712 0 0 0 474.995353 769.671078a73.078712 73.078712 0 0 0 73.065008-73.065008 73.078712 73.078712 0 0 0-73.065008-73.063295 73.078712 73.078712 0 0 0-73.065009 73.065008z" fill="#3DDC84"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/anolisos.svg b/crates/nyaterm-app/assets/color/os/anolisos.svg
new file mode 100644
index 00000000..70efddc8
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/anolisos.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M513.2288 51.2c-122.368 0-239.7696 48.9472-326.2976 136.2944a467.8144 467.8144 0 0 0-135.168 329.2672c0 4.352 0.512 8.6528 0.5632 12.9024l-1.024 319.744c-0.8192 20.7872 3.9424 41.472 13.7728 59.904 9.728 18.3808 21.504 32.256 41.984 44.8512 20.2752 12.544 37.7856 16.9472 58.5216 17.3568a115.712 115.712 0 0 0 59.2384-14.848 118.1696 118.1696 0 0 0 60.0064-102.2976v-35.4816l1.4336-168.192V519.168a98.5088 98.5088 0 0 0-24.5248-66.4064 73.8816 73.8816 0 0 1 5.3248-102.144 72.192 72.192 0 0 1 101.376 2.56 73.8816 73.8816 0 0 1 0.3072 102.2464 93.9008 93.9008 0 0 0-24.5248 64.7168v27.7504s12.2368 103.0656 85.0944 10.3424l46.08-75.8784c12.6464-20.8384 17.2544-45.7728 12.8-69.7856a73.216 73.216 0 0 1 56.32-85.3504 72.704 72.704 0 0 1 85.8624 54.9376 73.3696 73.3696 0 0 1-52.3264 87.9104c-22.7328 6.656-41.984 21.76-54.016 42.1376l-48.7936 80.0768s-24.9344 47.5136 32.512 47.5136l66.048-2.0992c23.7056-0.3072 46.3872-9.728 63.4368-26.2656a72.0384 72.0384 0 0 1 101.376-2.1504c28.7744 27.136 30.7712 72.4992 4.608 102.1952a71.9872 71.9872 0 0 1-101.2224 7.168 96.9216 96.9216 0 0 0-66.3552-23.8592s-66.6624-1.024-111.0528 49.9712a139.3664 139.3664 0 0 0-22.1696 149.248c1.1776 2.56 2.56 5.0688 3.7888 7.936l1.536 2.304c0.9728 1.7408 2.048 3.3792 3.072 5.0176l1.8432 2.816c1.024 1.536 2.048 2.8672 3.2256 4.3008l2.304 2.9184c1.1264 1.4336 2.2528 2.7648 3.4304 3.9936l2.7136 2.9696 3.6864 3.7376 3.072 2.7648 4.096 3.584 3.4304 2.56 4.5568 3.3792a48.896 48.896 0 0 0 3.584 2.4064 48.9984 48.9984 0 0 0 5.12 3.072l3.8912 2.3552c1.8432 1.024 3.7376 1.9968 5.5808 2.8672l4.1984 2.048 6.5536 2.6624 4.1472 1.7408 7.936 2.7136 3.4304 1.1264c4.0448 1.28 7.8848 2.304 12.4416 3.328l2.4576 0.512c3.6352 0.768 7.3216 1.536 10.9568 2.1504l5.12 0.768c3.0208 0.4608 6.0416 0.9216 9.2672 1.2288l6.144 0.6144 8.3456 0.6144c8.8576 0.5632 17.8176 0.3072 26.624-0.5632C839.168 921.6 994.816 704.512 970.24 468.224 945.7152 231.8848 748.7488 52.224 513.28 51.2h-0.0512z" fill="#59AB2D"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/apple.svg b/crates/nyaterm-app/assets/color/os/apple.svg
new file mode 100644
index 00000000..942531cf
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/apple.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M901.957 349.127c-60.072-87.975-153.764-100.092-187.17-101.5-79.699-8.106-155.6 46.931-196.003 46.931-40.404 0-102.78-45.822-168.868-44.627-86.908 1.28-166.99 50.515-211.788 128.421-90.322 156.666-23.125 388.763 64.85 515.819 43.05 62.248 94.332 132.133 161.615 129.616 64.85-2.56 89.425-41.983 167.673-41.983 78.418 0 100.433 41.983 169.038 40.703 69.8-1.28 114-63.4 156.666-125.819 49.406-72.189 69.714-141.989 70.909-145.573-1.579-0.725-135.973-52.221-137.381-207.095-1.28-129.573 105.68-191.779 110.502-194.893zM715.853 0.043c-51.497 2.133-113.83 34.302-150.82 77.48-33.108 38.398-58.707 99.622-50.9 158.414 57.513 4.48 112.72-29.183 148.474-72.53C698.317 120.23 722.423 60.029 715.853 0.043z" fill="#6B7280" opacity=".9"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/archlinux.svg b/crates/nyaterm-app/assets/color/os/archlinux.svg
new file mode 100644
index 00000000..cd0c1527
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/archlinux.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M485.984 25.824c-43.296 106.08-69.376 175.52-117.536 278.464 29.568 31.36 65.824 67.808 124.704 108.96-63.328-26.048-106.496-52.192-138.784-79.328C292.704 462.592 196.064 645.888 0 998.176c154.112-88.96 273.568-143.776 384.896-164.768a283.936 283.936 0 0 1-7.328-66.016l0.16-4.928c2.464-98.752 53.824-174.688 114.624-169.504 60.832 5.12 108.096 89.408 105.728 188.128a276.288 276.288 0 0 1-6.24 53.024c110.112 21.536 228.352 76.256 380.352 164-29.952-55.168-56.736-104.896-82.272-152.288-40.256-31.2-82.208-71.808-167.808-115.744 58.848 15.296 100.992 32.928 133.824 52.64C596.096 299.104 575.136 234.816 486.016 25.792zM976.96 911.36v-26.592h-9.952v-3.584h23.968v3.584h-10.016v26.592h-4z m18.144 0v-30.176h6.048l7.136 21.376 1.44 4.512c0.352-1.088 0.864-2.72 1.632-4.864l7.2-21.056h5.408v30.176h-3.872v-25.312l-8.8 25.312h-3.584l-8.736-25.696v25.696h-3.872z" fill="#1793D1"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/aws.svg b/crates/nyaterm-app/assets/color/os/aws.svg
new file mode 100644
index 00000000..ca0b8e39
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/aws.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1710 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M486.118681 373.591209c0 20.817582 2.250549 37.696703 6.189011 50.074725 4.501099 12.378022 10.127473 25.881319 18.004396 40.50989 2.813187 4.501099 3.938462 9.002198 3.938461 12.94066 0 5.626374-3.375824 11.252747-10.690109 16.87912L468.114286 517.626374c-5.063736 3.375824-10.127473 5.063736-14.628572 5.063736-5.626374 0-11.252747-2.813187-16.879121-7.876923-7.876923-8.43956-14.628571-17.441758-20.254945-26.443956-5.626374-9.564835-11.252747-20.254945-17.441758-33.195605-43.885714 51.762637-99.024176 77.643956-165.415385 77.643956-47.261538 0-84.958242-13.503297-112.527472-40.50989-27.569231-27.006593-41.635165-63.015385-41.635165-108.026373 0-47.824176 16.879121-86.646154 51.2-115.903297 34.320879-29.257143 79.894505-43.885714 137.846154-43.885714 19.12967 0 38.821978 1.687912 59.63956 4.501099 20.817582 2.813187 42.197802 7.314286 64.703297 12.378022v-41.072528c0-42.76044-9.002198-72.58022-26.443956-90.021978-18.004396-17.441758-48.386813-25.881319-91.70989-25.881319-19.692308 0-39.947253 2.250549-60.764835 7.314286-20.817582 5.063736-41.072527 11.252747-60.764835 19.12967-9.002198 3.938462-15.753846 6.189011-19.692308 7.314286-3.938462 1.125275-6.751648 1.687912-9.002198 1.687912-7.876923 0-11.815385-5.626374-11.815384-17.441758v-27.569231c0-9.002198 1.125275-15.753846 3.938461-19.692307 2.813187-3.938462 7.876923-7.876923 15.753846-11.815385 19.692308-10.127473 43.323077-18.567033 70.892308-25.318681C230.681319 10.69011 259.938462 7.314286 290.883516 7.314286c66.953846 0 115.903297 15.191209 147.410989 45.573626 30.945055 30.382418 46.698901 76.518681 46.698902 138.408791v182.294506zM257.687912 459.112088c18.567033 0 37.696703-3.375824 57.951648-10.127473 20.254945-6.751648 38.259341-19.12967 53.45055-36.008791 9.002198-10.69011 15.753846-22.505495 19.12967-36.008791 3.375824-13.503297 5.626374-29.81978 5.626374-48.949451v-23.630769c-16.316484-3.938462-33.758242-7.314286-51.762638-9.564835-18.004396-2.250549-35.446154-3.375824-52.887912-3.375824-37.696703 0-65.265934 7.314286-83.832967 22.505494-18.567033 15.191209-27.569231 36.571429-27.56923 64.703297 0 26.443956 6.751648 46.136264 20.817582 59.63956 13.503297 14.065934 33.195604 20.817582 59.076923 20.817583z m451.797802 60.764835c-10.127473 0-16.879121-1.687912-21.380219-5.626374-4.501099-3.375824-8.43956-11.252747-11.815385-21.942857L544.07033 57.389011c-3.375824-11.252747-5.063736-18.567033-5.063737-22.505495 0-9.002198 4.501099-14.065934 13.503297-14.065934h55.138462c10.69011 0 18.004396 1.687912 21.942857 5.626374 4.501099 3.375824 7.876923 11.252747 11.252747 21.942857l94.523077 372.465934 87.771429-372.465934c2.813187-11.252747 6.189011-18.567033 10.690109-21.942857 4.501099-3.375824 12.378022-5.626374 22.505495-5.626374h45.010989c10.69011 0 18.004396 1.687912 22.505494 5.626374 4.501099 3.375824 8.43956 11.252747 10.69011 21.942857l88.896704 376.967033 97.336263-376.967033c3.375824-11.252747 7.314286-18.567033 11.252748-21.942857 4.501099-3.375824 11.815385-5.626374 21.942857-5.626374h52.325274c9.002198 0 14.065934 4.501099 14.065935 14.065934 0 2.813187-0.562637 5.626374-1.125275 9.002198-0.562637 3.375824-1.687912 7.876923-3.938462 14.065934l-135.595604 434.918682c-3.375824 11.252747-7.314286 18.567033-11.815385 21.942857-4.501099 3.375824-11.815385 5.626374-21.380219 5.626373h-48.386814c-10.69011 0-18.004396-1.687912-22.505494-5.626373-4.501099-3.938462-8.43956-11.252747-10.69011-22.505495L877.714286 129.406593l-86.646154 362.338462c-2.813187 11.252747-6.189011 18.567033-10.69011 22.505494-4.501099 3.938462-12.378022 5.626374-22.505495 5.626374h-48.386813z m722.989011 15.191209c-29.257143 0-58.514286-3.375824-86.646154-10.127473-28.131868-6.751648-50.074725-14.065934-64.703296-22.505494-9.002198-5.063736-15.191209-10.69011-17.441759-15.753846-2.250549-5.063736-3.375824-10.69011-3.375824-15.753846v-28.694506c0-11.815385 4.501099-17.441758 12.94066-17.441758 3.375824 0 6.751648 0.562637 10.127472 1.687912 3.375824 1.125275 8.43956 3.375824 14.065934 5.626374 19.12967 8.43956 39.947253 15.191209 61.89011 19.692307 22.505495 4.501099 44.448352 6.751648 66.953846 6.751649 35.446154 0 63.015385-6.189011 82.145055-18.567033 19.12967-12.378022 29.257143-30.382418 29.257143-53.45055 0-15.753846-5.063736-28.694505-15.191209-39.384615-10.127473-10.69011-29.257143-20.254945-56.826373-29.257143L1384.087912 292.571429c-41.072527-12.940659-71.454945-32.07033-90.021978-57.389011-18.567033-24.756044-28.131868-52.325275-28.131868-81.582418 0-23.630769 5.063736-44.448352 15.191209-62.452747 10.127473-18.004396 23.630769-33.758242 40.50989-46.136264 16.879121-12.940659 36.008791-22.505495 58.514286-29.257143 22.505495-6.751648 46.136264-9.564835 70.892307-9.564835 12.378022 0 25.318681 0.562637 37.696704 2.250549 12.940659 1.687912 24.756044 3.938462 36.571428 6.189011 11.252747 2.813187 21.942857 5.626374 32.07033 9.002198 10.127473 3.375824 18.004396 6.751648 23.630769 10.127473 7.876923 4.501099 13.503297 9.002198 16.879121 14.065934 3.375824 4.501099 5.063736 10.69011 5.063736 18.567033v26.443956c0 11.815385-4.501099 18.004396-12.940659 18.004395-4.501099 0-11.815385-2.250549-21.38022-6.751648-32.07033-14.628571-68.079121-21.942857-108.026374-21.942857-32.07033 0-57.389011 5.063736-74.830769 15.753846-17.441758 10.69011-26.443956 27.006593-26.443956 50.074725 0 15.753846 5.626374 29.257143 16.879121 39.947253 11.252747 10.69011 32.07033 21.38022 61.89011 30.945055l79.894505 25.318681c40.50989 12.940659 69.767033 30.945055 87.208792 54.013187 17.441758 23.068132 25.881319 49.512088 25.881318 78.769231 0 24.193407-5.063736 46.136264-14.628571 65.265934-10.127473 19.12967-23.630769 36.008791-41.072528 49.512088-17.441758 14.065934-38.259341 24.193407-62.452747 31.507692-25.318681 7.876923-51.762637 11.815385-80.457143 11.815385z" fill="#5B6675"></path><path d="M1538.813187 808.50989c-185.107692 136.720879-454.048352 209.301099-685.292308 209.301099-324.079121 0-616.087912-119.841758-836.641758-319.015385-17.441758-15.753846-1.687912-37.134066 19.12967-24.756044 238.558242 138.408791 532.817582 222.241758 837.204396 222.241759 205.362637 0 430.98022-42.76044 638.593406-130.531868 30.945055-14.065934 57.389011 20.254945 27.006594 42.760439z" fill="#FF9900"></path><path d="M1615.894505 720.738462c-23.630769-30.382418-156.413187-14.628571-216.615384-7.314286-18.004396 2.250549-20.817582-13.503297-4.501099-25.318681 105.775824-74.268132 279.630769-52.887912 299.885714-28.131869 20.254945 25.318681-5.626374 199.173626-104.650549 282.443956-15.191209 12.940659-29.81978 6.189011-23.068132-10.690109 22.505495-55.701099 72.58022-181.169231 48.94945-210.989011z" fill="#FF9900"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/centos.svg b/crates/nyaterm-app/assets/color/os/centos.svg
new file mode 100644
index 00000000..d60ad8ac
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/centos.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M153.650377 358.349623v112.005247h-3.694326v-108.310921l3.694326-3.694326z" fill="#932279"></path><path d="M453.058708 512l-29.554608 29.554608H137.86553v108.310922L0 512l137.86553-137.86553v108.310922h285.63857l29.554608 29.554608zM738.529354 226.529354L553.64513 411.413578V149.956051h108.310921l3.694326 3.694326 72.878977 72.878977z" fill="#932279"></path><path d="M649.86553 137.86553h-108.310922v285.63857l-29.554608 29.554608-29.554608-29.554608V137.86553h-108.310922L512 0l137.86553 137.86553zM874.043949 553.64513v108.310921l-3.694326 3.694326-72.878977 72.878977-184.884224-184.884224h261.457527z" fill="#EFA724"></path><path d="M886.13447 361.036405v13.098065l-6.04526-6.04526-6.045261-6.045261v108.310921h-3.694326v-125.103312l3.694326 3.694326 6.045261 6.045261 6.04526 6.04526z" fill="#6D6CCF"></path><path d="M886.13447 649.86553v-108.310922H600.4959L570.941292 512l29.554608-29.554608h285.63857v-108.310922l137.86553 137.86553-137.86553 137.86553z" fill="#6D6CCF"></path><path d="M411.413578 470.35487H149.956051v-108.310921l3.694326-3.694326L226.529354 285.470646 411.413578 470.35487zM470.35487 149.956051V411.413578L285.470646 226.529354l72.878977-72.878977 3.694326-3.694326h108.310921z" fill="#9CCD2A"></path><path d="M738.529354 797.470646L553.64513 612.586422v261.457527h108.310921l3.694326-3.694326 72.878977-72.878977z" fill="#EFA724"></path><path d="M649.86553 886.13447h-108.310922V600.4959L512 570.941292l-29.554608 29.554608v285.63857h-108.310922l137.86553 137.86553 137.86553-137.86553z" fill="#9CCD2A"></path><path d="M470.35487 874.043949V612.586422L285.470646 797.470646l72.878977 72.878977 3.694326 3.694326h108.310921z" fill="#6D6CCF"></path><path d="M470.35487 428.541817v41.813053h-41.813053L226.529354 268.342407l-76.573303 76.573303V149.956051h194.959659l-76.573303 76.573303 202.012463 202.012463z" fill="#9CCD2A"></path><path d="M880.08921 143.91079v224.17842l-6.045261-6.045261v108.310921H612.586422L797.470646 285.470646l72.878977 72.878977v-13.098065l3.694326 3.694326v-4.030174l-76.573303-76.573303-202.012463 202.012463h-41.813053v-41.813053L755.657593 226.529354l-82.618564-82.618564h207.050181z" fill="#932279"></path><path d="M666.993768 137.86553l12.090522 12.090521h194.959659v212.087898l6.045261 6.045261 6.04526 6.04526V137.86553z" fill="#FFFFFF"></path><path d="M874.043949 679.08429v194.959659H679.08429L755.657593 797.470646 553.64513 595.458183v-41.813053h41.813053L797.470646 755.657593l76.573303-76.573303z" fill="#EFA724"></path><path d="M411.413578 553.64513L226.529354 738.529354l-72.878977-72.878977-3.694326-3.694326v-108.310921H411.413578z" fill="#6D6CCF"></path><path d="M470.35487 595.458183L268.342407 797.470646l76.573303 76.573303H149.956051V679.08429L226.529354 755.657593l202.012463-202.012463h41.813053v41.813053z" fill="#6D6CCF"></path><path d="M874.043949 344.91571v4.030174l-3.694326-3.694326v13.098065l3.694326 3.694326 6.045261 6.045261 6.04526 6.04526v-16.792391z" fill="#FFFFFF"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/cmd.svg b/crates/nyaterm-app/assets/color/os/cmd.svg
new file mode 100644
index 00000000..3bf17788
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/cmd.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M871.6016935 130.57230523H152.3983065A87.28612962 87.28612962 0 0 0 65.11217689 217.85843484v588.28313032a87.28612962 87.28612962 0 0 0 87.28612961 87.28612961h719.203387A87.28612962 87.28612962 0 0 0 958.88782311 806.14156516v-588.28313032a87.28612962 87.28612962 0 0 0-87.28612961-87.28612961z m-17.87551292 696.96624891H170.27381942a39.32612843 39.32612843 0 0 1-39.32612843-39.32612842V354.89211692h762.05099145v433.37393531a39.32612843 39.32612843 0 0 1-39.27250186 39.27250191zM650.35647004 244.90408589a35.268387 35.268387 0 1 1-35.268387-35.26838701 35.268387 35.268387 0 0 1 35.268387 35.26838701z m217.45561472 0a35.268387 35.268387 0 1 1-35.26838701-35.26838701 35.268387 35.268387 0 0 1 35.26838701 35.26838701z m-108.73674513 0a35.268387 35.268387 0 1 1-35.26838699-35.26838701 35.268387 35.268387 0 0 1 35.28626252 35.26838701z m-548.49223855 503.19568881a32.74793968 32.74793968 0 0 0 41.25668382 0L397.59671728 623.16781487a22.71977693 22.71977693 0 0 0 0-35.51864417l-145.68543033-124.94983534a32.74793968 32.74793968 0 0 0-41.25668384 0c-11.36882623 9.74215455-11.36882623 25.61561002 0 35.37564005l125.12859048 107.25307759-125.12859048 107.25307755c-11.36882623 9.74215455-11.36882623 25.61561002 0 35.37564005z m58.00603942 9.54552389l462.06413359 7.23958274H476.4456048a29.79848003 29.79848003 0 1 1 0-59.59696007h254.22554479a29.79848003 29.79848003 0 0 1 0 59.59696007z" fill="#737373"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/debian.svg b/crates/nyaterm-app/assets/color/os/debian.svg
new file mode 100644
index 00000000..edf539ef
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/debian.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M915.382444 375.247426a554.905528 554.905528 0 0 0-22.329301-114.653604l13.308007 4.414675a430.142957 430.142957 0 0 0-153.553933-199.172248c-8.70139-5.118464-35.125462 4.926522-26.616016-12.156353S688.698449 45.490353 669.440227 48.945316C643.208096 53.16805 639.433229 19.770069 594.198799 12.796161c-25.592322-3.582925-31.990403 18.426472-44.786564 13.308008-23.225032-9.085274-20.473858-27.319804-57.582725-9.085275-18.426472 9.021294 11.580526-26.104169-49.137259-4.606618L437.82971 0c-108.76737 41.587524-139.030291 76.20114-169.549135 79.272218-6.973908 0-34.101769 32.758173-53.551935 53.040088-17.082875 17.082875-26.296111 36.53304-49.137259 39.604119l-17.018894 70.378886a136.215135 136.215135 0 0 0-49.009297 97.250825 66.540038 66.540038 0 0 1 4.478656-52.848145c-17.082875 6.845946-45.874238 17.082875-29.687094 96.86694 12.796161 63.149055-5.310407 135.127462 10.044987 204.738578 4.79856 20.985704 0 40.115965 6.39808 51.184645 107.615715 235.705288 208.769369 391.946416 472.306308 383.884834l4.414676-8.893332c-28.151555-6.781965-55.087474-17.018894-111.518544-30.646806-18.618414-4.478656-23.03309-34.16575-40.243927-44.210737-9.405178-5.438368-28.343497-4.094772-37.172848-9.917025s4.222733-21.625512-19.962012-14.3317c-8.573428 2.559232-13.819854-10.876737-20.153954-17.018894s0-23.736879-23.352994-24.760572-18.426472-29.687094-19.770069-44.786564c-12.156353 1.535539-1.215635-1.535539-13.308007 4.414675a63.980806 63.980806 0 0 1-23.928822-31.990402c-10.236929-48.945316-10.556833-21.497551-14.971508-32.374288a325.53434 325.53434 0 0 0-19.194242-42.163351l26.743977 8.893332H255.100529l4.478656-13.308008-26.616015-8.701389h31.222633c-7.677697 14.011796 2.047386 5.310407-13.49995 8.893332v13.308007l22.329301-8.893332v-13.308007c-20.601819-10.236929-28.663401-13.308008-49.073278-22.009398l9.021294 8.893332v4.414676h-49.457163c-22.009397-14.843547-14.011796-31.990403-17.914626-53.040088 17.082875 0 9.213236 6.398081 17.082875-12.796161l-17.082875 8.829351 13.308008-33.909827L165.5274 627.011896c-29.175247-38.708387-16.187144-97.69869-11.900429-151.954413a180.169949 180.169949 0 0 1 37.684694-102.369289c8.829351-10.044987 5.118464-25.208437 5.438369-37.172849l31.222633-26.424072h17.914626c7.677697 17.018894 4.73458 5.438368 0 22.009397l8.829351 4.414675c7.16585-8.70139 6.398081-5.950215 8.893332-22.009397-10.044987-10.556833-6.973908-9.853044-26.616016-13.308007A119.324203 119.324203 0 0 1 348.640467 243.127062l4.414675-13.308008-17.914625 9.021294-4.414676-13.116065A109.215235 109.215235 0 0 1 406.799019 198.340498c6.398081 0 6.973908-17.082875 12.796161-19.194242a281.195641 281.195641 0 0 1 371.088674 147.155853 326.302109 326.302109 0 0 1 8.189543 34.10177c17.082875 57.006898-7.16585 121.563531 9.725082 155.601319-7.869639 35.957213-36.661002 13.819854-40.243927 30.838749a106.528042 106.528042 0 0 1-40.755773 78.824353 202.371289 202.371289 0 0 1-30.710787 22.329301 84.326702 84.326702 0 0 0 22.329301-39.732081c-106.272118 111.518544-262.321304 63.980806-289.961011-105.952214A101.153654 101.153654 0 0 1 464.253783 409.477157a142.549235 142.549235 0 0 1 205.69829-20.473858l-8.829351-30.710787c-32.950115-24.376687-17.082875-19.770069-9.085275-57.582725v-4.286714l-17.914625-12.796161c2.559232 10.044987 1.023693 5.246426 9.085274 17.018894-4.478656 16.059182 0 9.085274-8.893332 17.082875-15.035489 9.725082-23.672898 7.293812-44.786564 4.414676l4.670599-13.627912-13.435969-13.308007c0 11.772468-4.094772 2.751175 0 17.082875-126.042187 9.853044-217.982605 79.976007-178.506448 260.081975a220.989703 220.989703 0 0 0 8.829351 44.210737l-8.829351 8.70139-4.478657-26.424073h-13.435969l-4.414675 13.308007c-12.796161-25.592322-0.895731 10.684795 40.243926 52.848146a132.184345 132.184345 0 0 0 12.796162 12.796161 205.954214 205.954214 0 0 0 201.219634 49.137259h9.085274v-4.606618l-102.369289-13.308008-4.286714-8.701389a278.380486 278.380486 0 0 0 236.728981-48.43347c13.180046-17.082875 11.452564-24.056783 22.20134-9.085275 19.194242-17.018894 3.902829-26.743977 13.49995-43.954813 6.398081-11.772468 32.56623-17.082875 44.786564-35.317405l40.115965-136.471059h-17.594722c3.071079-14.3317 22.521244-34.101769-4.414675-48.43347-2.559232-1.535539 9.021294-1.343597 8.829351-4.286714a145.556333 145.556333 0 0 0-22.137359-66.348095c33.078077 21.689493 36.341098 68.26752 53.551935 105.760272v8.893332h4.414675v-47.409777zM433.415034 595.021494l-9.597121-26.488054 62.445267 57.582725z m-307.107867-383.884835l-23.161052-3.902829v39.73208c16.762971-10.556833 19.194242-10.428871 22.393282-35.317405z m574.867539 176.906928a57.19884 57.19884 0 0 0-17.018894 44.146756l13.435969 8.701389a37.812656 37.812656 0 0 0 4.414676-52.848145z m147.155854 167.629711a78.376487 78.376487 0 0 0 35.829251-97.058882l-35.829251 96.86694zM674.430729 476.209137c-15.739278 11.772468-19.83405 13.308008-22.393282 39.732081l13.308008 8.893332 17.914626-8.893332a59.886034 59.886034 0 0 0 4.414675-48.43347c-8.317505 13.435969-2.495251 20.601819-13.244027 8.701389M607.378845 555.673298c15.86724-10.940718 11.90043-14.843547 17.914626-22.137359v-4.79856a291.048685 291.048685 0 0 1-62.445267 0c-12.796161-14.011796-13.308008-29.36719-31.222633-39.604119 17.082875 35.189443 3.263021 38.388483 31.222633 61.741478a159.952014 159.952014 0 0 0 40.115965 4.478656c1.535539 0-6.845946-1.023693 4.414676 0zM187.920682 520.355893h-13.435969l-8.957313 8.70139c9.53314 10.236929 5.438368 7.16585 13.308008-4.414676l13.49995 22.137359 4.414676-17.018894-8.829352-8.70139z m17.082876 57.582725l4.414675-8.893332c-10.044987-8.70139 0-3.582925-13.308007 0l-13.308008-17.274817 4.478656 17.018894v8.893332h17.722684z" fill="#CE0C48"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/deepin.svg b/crates/nyaterm-app/assets/color/os/deepin.svg
new file mode 100644
index 00000000..a76c9f87
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/deepin.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M687.179771 29.735301C613.521867 2.891336 538.201966-4.436654 465.028061 2.411337c-84.821889 6.847991-126.159835 32.987957-123.665838 28.315963-138.829818 49.499935-255.967665 155.979796-310.297594 305.3076-96.659874 265.983652 40.315947 560.091267 305.7876 656.911141 265.631652 96.819873 559.419268-40.315947 656.079142-306.2996S952.617423 126.559174 687.145771 29.737301zM354.386206 944.792104c-27.677964-10.173987-54.329929-23.16597-79.671895-38.49195 123.825838 9.503988 285.309627-19.005975 394.127484-120.975842 0 0 207.655728-165.803783 57.497925-438.123426 0 0 24.157968 109.811856-6.655992 199.975738 0 0-29.499961 122.833839-160.29979 158.315793-192.647748 52.665931-412.269461-82.325892-504.09934-147.659807-6.845991-67.159912-0.829999-136.495821 23.839968-204.295733 36.505952-100.307869 105.137862-178.633766 188.967753-231.139697-20.989973 146.477808-4.319994 281.469632 19.325975 337.973558 31.995958 75.831901 87.475886 164.299785 195.815744 175.65977 108.499858 11.325985 168.13978-90.005882 168.13978-90.005883 55.671927-84.499889 64.311916-205.799731 63.479917-208.805726-0.831999-2.847996-14.845981-10.847986-14.845981-10.847986-37.339951 151.309802-98.99587 201.959736-98.99587 201.959736-97.333873 93.813877-166.315782 28.667962-166.315783 28.667962-74.007903-79.477896-22.173971-208.805727-22.173971-208.805727 28.987962-87.989885 113.489851-216.805716 209.319726-282.45963 15.995979 3.997995 31.993958 6.493992 47.831938 12.157984a456.833402 456.833402 0 0 1 151.469801 92.147879c-70.007908 25.659966-182.985761 79.669896-182.98576 79.669896-179.145766 75.479901-191.30375 189.639752-191.30375 189.639752-18.653976 117.649846 74.839902 67.831911 74.839902 67.831911 95.987874-46.839939 143.309812-192.647748 143.309813-192.647748-30.011961-5.821992-53.65793 3.327996-53.65793 3.327996-38.33195 94.835876-116.657847 133.647825-116.657847 133.647825-30.84396 16.317979-38.01195-12.509984-38.011951-12.509983-5.149993-21.661972 22.333971-25.339967 22.333971-25.339967 42.649944-16.511978 70.007908-61.33992 76.149901-79.671896 6.143992-18.333976 17.501977-19.837974 17.501977-19.837974a567.215258 567.215258 0 0 1 111.827853-22.84397c72.501905-8.831988 183.46376 25.819966 183.46376 25.819966 24.989967 10.013987 48.825936 17.499977 70.007909 23.485969 40.827947 101.649867 47.161938 217.475715 6.847991 328.47157-86.997886 239.299687-351.28554 362.803525-590.423228 275.64564z" fill="#31BFF7"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/fedora.svg b/crates/nyaterm-app/assets/color/os/fedora.svg
new file mode 100644
index 00000000..19b74712
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/fedora.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M421.6832 56.9344c-92.16 21.0944-168.6016 62.976-233.5744 128-48.128 48.0256-78.1312 93.184-103.168 155.2384C54.6816 415.232 51.3536 448.3584 51.2 676.7104c-0.1024 208.3328 0.2048 213.5552 14.1824 241.3056 10.4448 20.6336 22.016 32.256 42.8544 42.9056 28.5184 14.592 28.928 14.592 260.352 12.3392l231.7312-2.2528 50.7904-17.5104c80.5888-27.8016 127.6928-57.344 187.4432-117.6576C930.5088 743.168 972.8 640.8704 972.8 511.3856c0-129.4336-42.2912-231.7312-134.2464-324.4544-60.5184-61.0816-112.7936-93.6448-189.5424-118.1696-61.44-19.6096-168.8576-25.1904-227.328-11.776z m138.24 189.7472c47.4624-18.0224 121.5488 0.768 159.0784 40.3456 50.1248 52.736 49.3056 154.5216-1.2288 154.5216-21.0944 0-38.0928-22.528-38.0928-50.4832 0-35.1744-10.8544-55.1424-36.6592-67.328-30.72-14.6432-63.4368-8.448-85.5552 16.128-16.8448 18.6368-17.4592 21.9648-17.4592 89.088V498.688h40.8064c46.336 0 60.7744 9.0624 60.7744 38.0928 0 28.928-14.4896 38.0928-59.9552 38.0928h-39.9872l-2.9184 68.3008c-3.328 78.0288-15.2576 112.896-50.8928 148.5824-35.7888 35.7376-64.3584 46.592-122.4192 46.592-44.032 0-54.784-2.304-80.4864-17.408-101.632-59.7504-117.2992-185.6-33.6384-269.312 37.6832-37.6832 77.312-52.9408 137.472-52.9408h36.9664v76.1856h-30.8224c-59.6992 0-102.912 26.2656-116.224 70.5536-19.968 66.8672 33.1776 127.488 103.5776 118.0672 34.4064-4.608 55.0912-19.8656 69.2224-50.9952 10.8032-23.808 12.0832-43.52 12.288-194.7648 0.256-150.0672 1.5872-171.008 12.1344-194.2528 13.312-29.2352 51.968-64.6144 83.968-76.8z" fill="#51A2DA"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/gentoo.svg b/crates/nyaterm-app/assets/color/os/gentoo.svg
new file mode 100644
index 00000000..08ea42af
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/gentoo.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M424.079944 0.032A312.677354 312.677354 0 0 0 368.405237 5.289972l1.935989-0.289998C185.006202 38.903795 54.588888 199.325951 43.491947 304.970395c-5.384972 51.842727 22.581881 90.681523 37.9688 107.778432 41.677781 46.290756 124.744343 81.64657 178.099063 110.969416-77.193594 65.808654-112.614407 97.937484-147.485224 134.550292C59.847861 713.077247 23.169054 773.367929 23.040055 816.567702c0 13.899927-2.289988 58.291693 15.838916 93.324509 6.806964 13.161931 26.161862 57.0657 84.485555 89.969526 37.290804 21.064889 90.420524 28.806848 142.357251 21.387887C426.65993 998.281745 642.212795 861.795464 795.956986 734.696133c98.034484-81.033573 169.680107-159.51916 190.357998-198.164957 16.677912-31.193836 18.548902-87.130541 8.870953-122.292356-27.516855-99.711475-251.198678-303.9734-434.039715-386.167968C521.69443 10.322946 475.661672 0 427.176927 0c-1.099994 0-2.193988 0-3.289982 0.032h0.160999z m-0.322999 2.899985c1.099994 0 2.386987-0.032 3.677981-0.032a314.317346 314.317346 0 0 1 140.808259 33.071826l-1.838991-0.838996c147.648223 72.549618 397.13591 276.553544 415.523813 379.104005 22.80688 126.808333-423.74977 470.072526-695.36734 523.622243-105.389445 20.677891-195.228972 26.354861-236.229756-84.936553-35.516813-96.485492 33.387824-167.067121 134.84129-259.778632 42.161778-38.484797 75.710601-67.259646 126.228336-109.937421 2.804985-2.936985-243.455719-87.844538-251.262678-185.298025C52.006902 197.744959 210.624067 12.838932 413.691998 3.289983c3.354982-0.160999 6.677965-0.289998 10.032947-0.354998z m-4.773975 22.193883c-7.806959 0.128999-15.29092 0.612997-22.67788 1.418992l1.099994-0.099999c-99.743475 10.483945-118.840374 23.354877-209.198899 91.711517C157.915345 141.092257 102.172638 196.834964 87.946713 262.933616c-5.451971 25.193867 0.999995 46.936753 19.099899 62.194673 58.059694 48.813743 155.259183 88.427535 235.063763 126.750332 23.354877 11.193941 7.899958 31.516834-29.774843 64.162663C217.270032 598.332851 88.750709 698.496323 79.783756 774.851921c-4.225978 35.968811 8.099957 84.807554 51.742727 109.840422 50.999732 29.193846 156.874174 10.161947 227.584803-16.161915 103.324456-38.484797 239.004742-123.389351 346.748174-206.841911 111.99941-86.807543 216.164862-196.998963 221.326835-214.971868 6.322967-22.064884 5.67797-42.484776-6.548965-65.936653-19.128899-36.774806-44.774764-64.129662-72.29162-94.743502-73.899611-77.83959-151.9992-146.29323-245.520707-198.712954-61.194678-34.322819-115.711391-63.226667-183.842033-62.193672z m45.871759 154.587186c23.322877 0 50.194736 7.354961 79.065584 21.322888 72.033621 34.834817 146.035231 126.324335-0.644997 178.971058-39.87079 14.322925-166.422124-35.194815-162.551144-102.71146 3.83898-66.999647 36.419808-97.646486 84.130557-97.582486z m12.161936 58.323693c-13.548929-0.099999-24.548871 3.354982-29.645844 11.193941-23.741875 36.774806-12.899932 62.839669 9.064952 79.485582 8.160957-19.516897 91.969516 1.80699 91.614518 20.128894a12.599934 12.599934 0 0 0 2.354988-1.386993c72.678617-54.710712-20.129894-109.066426-73.420614-109.421424z" fill="#7568A5"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/git.svg b/crates/nyaterm-app/assets/color/os/git.svg
new file mode 100644
index 00000000..a2665c53
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/git.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg" viewBox="148 7 1025 1025" preserveAspectRatio="xMidYMid meet"><path d="M343.29098432 718.62775664c-50.67996267-50.67391147-100.64889387-100.5429952-150.50284905-150.52705493-32.58948587-32.67117867-32.40491947-67.3392992 0.48410667-100.27068479 60.9309312-61.012624 121.93447787-121.9556576 182.93802558-182.89869228 3.48859733-3.48254507 7.2555552-6.68975467 11.76077656-10.82281919 4.74122453 4.40537493 8.83495467 7.97869013 12.67453012 11.81221333 59.56938027 59.5209696 119.14481067 119.03891307 178.6415744 178.63552426 33.8058048 33.8632928 34.06298667 69.653936 0.65051947 103.14507093-60.89764907 61.04590613-121.91632427 121.97381227-182.91079467 182.92289707-3.16485013 3.16182507-6.5657024 6.08764693-11.9877024 11.09210348-13.8968992-14.35074987-27.44282133-28.34144533-41.74818668-43.08855789z" fill="#82B4FF" /><path d="M904.9369246 740.93601692c-57.05504853-57.05807467-113.3718336-113.3476288-169.65231147-169.66743895-36.13557013-36.15674987-36.18700693-69.99886293-0.55974825-106.08904746 4.91368747-4.97722667 8.58079893-11.18589973 14.8590624-19.5216192 16.97400533 17.67898667 31.2188576 31.71506667 44.27159572 46.77987521 2.5929984 2.99541227 1.67319467 10.17532587 0.59908161 15.03152533-8.51120853 38.51677227 13.14955947 77.4087264 49.78436586 88.65816639 39.0946752 12.00888213 79.23320533-7.41591573 93.56882667-45.28216853 20.02388053-52.88870187-22.2477472-106.35228053-79.65982507-99.55662719-12.54745067 1.48862933-20.5079872-1.3797056-28.54416533-10.43856-10.64127893-11.9877024-22.6017504-22.80144533-32.88297495-33.01913069l133.8677184-133.87679571c1.1194976 0.93795733 4.25409173 3.1951072 6.95298775 5.8909792 63.82952213 63.738752 127.68627627 127.45027413 191.36754134 191.34333439 31.74532373 31.8512224 31.53655253 67.2001184-0.45385069 99.26918932-62.28340587 62.43468907-124.69994027 124.73624853-187.08016745 187.07714028-2.82900053 2.82597547-5.82441387 5.4855392-12.85001814 12.08149867-7.6852-9.39772907-15.2584512-18.6623296-23.58509331-28.68032106z" fill="#8FD460" /><path d="M605.17175129 777.25615345c26.19322027 26.76204587 56.6798656 34.2112448 85.63249599 21.56394559 31.33080747-13.68510293 48.66184107-40.4925344 46.77987519-73.92618133-1.31919147-23.4065792-11.34626027-42.9403008-31.01916374-56.00514133-8.78351787-5.8395424-11.47938987-12.29329493-11.15564265-22.30220907 0.66564693-20.61085973 0.19969387-41.26105387 0.19969386-58.67983359l207.28861334 207.27953705c-1.1134464 1.21934507-4.5929664 5.34938347-8.39623255 9.15567574a180674.6795136 180674.6795136 0 0 1-182.90474346 182.89264001c-32.24758507 32.18404587-67.11539947 32.35348373-99.09975038 0.43267092-64.24101333-64.10788373-128.14617813-128.5546432-192.78052909-192.26313919-10.18742933-10.0391712-9.39772907-15.53983787 0.29954134-25.1070048 61.0065728-60.20779627 121.2930368-121.14175253 182.16950614-181.47965227 8.2479744-8.178384 18.46263467-14.3719296 27.76354241-21.48225387 1.56427093 0.8471872 3.12854187 1.70042667 4.6897877 2.55064001v51.93561599c0 5.54605227-0.45082453 11.134464 0.09077014 16.6290784 1.3222176 13.4491008-2.28740587 21.90887253-15.10414185 30.43218346-36.35341867 24.17509867-42.00536853 72.3740128-14.45362239 108.37342828z" fill="#FFE782" /><path d="M615.65872088 225.39825372l-89.0363744-88.7852448c3.17695253-4.00901227 5.29189547-7.2737088 7.97566506-9.975632 25.93906453-26.0752192 51.75407573-52.2775168 78.03806615-78.00175787 28.47154987-27.866416 64.70394133-28.46247253 92.67322879-0.75641708 65.50574293 64.88245547 130.491072 130.29137707 195.66701652 195.50968215 1.04688213 1.04688213 1.8032992 2.3842272 1.53401493 2.02417279l-134.22777386 134.10977173c-8.99834133-9.1526496-20.74701547-20.55639787-31.66968214-32.70748692-2.05745493-2.2843808-1.59755307-7.67612373-0.95913705-11.40677334 8.75931307-51.4303296-27.5245152-94.28288533-78.36786349-89.26027413-15.890816 1.57032213-25.54572693-2.3902784-34.49263146-13.5489472-1.88196587-2.34489387-4.2389632-4.30552747-7.13452905-7.20109333z" fill="#FF8282" /><path d="M433.2864958 271.56996892c-8.42346347-6.43559893-16.0874848-12.1147808-22.52913491-16.88626135l74.58880319-74.85808746c10.97107733 11.860624 22.5775456 25.00413227 34.83150613 37.51830081 21.50343253 21.951232 43.74210347 43.19748267 64.8279936 65.53902613 3.80931733 4.0362432 5.89400427 12.36288533 4.79871146 17.92709118-6.901552 35.03120107 5.65195093 65.100304 35.98126187 84.42828055 3.68526507 2.35094507 8.2298208 6.9711424 8.35992426 10.68061227 0.78667413 21.96636053 0.39031147 43.96902827 0.39031148 70.83092159-11.6215968-9.13752213-20.76516907-14.992192-28.29908695-22.4686208-57.57546347-57.13976747-114.833232-114.59420373-172.94726504-172.71126292z" fill="#FF8383" /><path d="M704.64971072 402.19114437c8.3690016 7.36145387 15.94527787 13.9362336 24.11458561 21.02235095l-32.23548265 30.0660768v-55.50590508c2.6444352 1.3101152 4.98932907 2.46894613 8.12089704 4.41747733z" fill="#FF8E8E" /></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/h3c.svg b/crates/nyaterm-app/assets/color/os/h3c.svg
new file mode 100644
index 00000000..f5396963
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/h3c.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M734.43 415.7c-33.74 23.28-46.35 59.22-46.35 95.2 0 38.09 14.75 71.93 48.44 95.21C770.26 631.63 848.37 640 918 640a835.89 835.89 0 0 0 103.32-6.38v-38.13c-35.74 4.24-50.59 6.38-88.57 8.47-40.07 2.15-78.11-4.23-105.52-21.13-23.17-16.9-35.73-33.83-35.73-71.93 0-27.51 6.28-50.74 27.41-67.63 27.41-21.19 65.39-27.57 109.7-27.57a403 403 0 0 1 92.71 10.57v-40.13C983.39 384 962.25 384 913.81 384c-71.77 0-145.64 8.42-179.38 31.7z m-373.31-27.51v33.89a744.16 744.16 0 0 1 116-8.47c23.22 0 57 2.09 69.63 8.47a27.69 27.69 0 0 1 14.75 25.53 36.77 36.77 0 0 1-10.5 25.52 71.2 71.2 0 0 1-35.73 12.71 504.28 504.28 0 0 1-69.62 4.16h-52.94v29.65h56.87c33.74 0 61.26 0 76 4.24 19 4.24 29.51 8.48 37.93 16.9 8.63 6 8.63 16.59 8.63 27.31 0 12.71-6.33 23.28-23.13 31.7-14.8 6.38-48.54 8.47-73.86 8.47-38-2.09-78.06-4.23-118.13-8.47v33.84c42.17 2.1 107.61 6.39 122.52 6.39 57 0 122.51-4.29 154-19.1a66.71 66.71 0 0 0 33.43-52.83c0-10.62 0-23.28-8.42-31.75-6.33-10.57-14.8-14.81-29.56-21.19s-23.17-8.37-50.59-12.66c29.46-8.52 40.08-12.81 55-21.18a46 46 0 0 0 23.18-40.23c0-16.89-8.42-31.7-31.65-42.27-25.52-10.61-92.75-14.8-137.11-14.8-27.57-0.02-82.39-0.02-126.7 4.17zM238.6 384v105.72H88.93V384H0.36v256h88.57V519.38h149.82V640h88.62V384z" fill="#E60012"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/huawei.svg b/crates/nyaterm-app/assets/color/os/huawei.svg
new file mode 100644
index 00000000..4f4a1a9c
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/huawei.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M412.08 753.87Q297 855.06 220.14 855.13t-117.27-95.07l309.21-6.24z m202.16 0l309.21 6.19Q883 855.13 806.18 855.13T614.24 753.82zM15.91 489.1q178 95 228.49 125.34t171.89 108.88q-193.1 12-252.75 0.32c-45.49-8.89-80.9-28.29-111.22-58.66Q-8.22 604.44 15.91 489.1z m994.5 0Q1034.56 604.41 974 665c-30.31 30.37-65.72 49.77-111.22 58.66q-59.64 11.7-252.7-0.32 121.27-78.55 171.85-108.88t228.48-125.36zM161.48 228.27q93.08 123.36 127.41 175.94t155 283.38Q205.88 580.55 113 475c-44.49-50.54-44.49-133.46 6-204.23q11-15.4 42.47-42.47z m703.31 0q31.51 27.1 42.47 42.47c50.54 70.77 50.54 153.65 6.06 204.26q-92.88 105.6-331 212.62 120.66-230.8 155-283.43t127.47-175.92zM440.6 84.72q46.51 137.52 52.56 194.1T483.07 659Q280.81 367.83 280.81 236.39T440.6 84.72z m145.21 0Q745.55 105 745.55 236.39T543.34 659q-16.17-323.55-10.09-380.16t52.56-194.1z" fill="#FE0000"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/k8s.svg b/crates/nyaterm-app/assets/color/os/k8s.svg
new file mode 100644
index 00000000..f34657db
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/k8s.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 38.4c-7.68 0-33.28 7.68-33.28 7.68L140.8 209.92s-15.36 7.68-20.48 12.8c-2.56 5.12-5.12 20.48-5.12 20.48L28.16 616.96l-2.56 12.8s-2.56 10.24 2.56 15.36l5.12 10.24 5.12 10.24 245.76 304.64s7.68 10.24 12.8 12.8c5.12 5.12 23.04 2.56 23.04 2.56h386.56s20.48 0 25.6-2.56c7.68-5.12 15.36-17.92 15.36-17.92l232.96-291.84s15.36-20.48 17.92-28.16c2.56-20.48-5.12-40.96-5.12-40.96L913.92 253.44s-5.12-23.04-7.68-30.72c-5.12-5.12-25.6-17.92-25.6-17.92l-332.8-156.16s-25.6-10.24-35.84-10.24z" fill="#316CE4"></path><path d="M849.92 586.24c-17.92-5.12-20.48 0-46.08-5.12-7.68-2.56-20.48-5.12-30.72-17.92 2.56-10.24 2.56-23.04 2.56-33.28 0-51.2-15.36-102.4-43.52-143.36 5.12-10.24 10.24-20.48 20.48-28.16 20.48-15.36 23.04-12.8 38.4-25.6 10.24-7.68 15.36-23.04 7.68-30.72-7.68-7.68-20.48-7.68-33.28 0-15.36 10.24-12.8 15.36-33.28 30.72-7.68 5.12-17.92 12.8-33.28 12.8a256 256 0 0 0-166.4-79.36c-5.12-10.24-10.24-23.04-10.24-33.28 0-25.6 5.12-25.6 5.12-46.08 0-15.36-7.68-25.6-20.48-25.6s-20.48 10.24-20.48 25.6c0 17.92 5.12 20.48 5.12 46.08 0 7.68 0 23.04-10.24 33.28-64 5.12-122.88 35.84-166.4 81.92-10.24-2.56-23.04-5.12-30.72-12.8-17.92-15.36-17.92-20.48-33.28-30.72-10.24-7.68-25.6-10.24-33.28 0-7.68 7.68-2.56 23.04 7.68 30.72 15.36 10.24 17.92 10.24 38.4 25.6 7.68 5.12 15.36 12.8 20.48 28.16-28.16 43.52-43.52 92.16-43.52 143.36 0 12.8 0 23.04 2.56 35.84-7.68 7.68-17.92 12.8-28.16 15.36-23.04 5.12-28.16 0-46.08 5.12-12.8 2.56-23.04 12.8-20.48 25.6s15.36 15.36 28.16 12.8c28.16-7.68 28.16-12.8 51.2-17.92 7.68-2.56 20.48-5.12 33.28 0 20.48 61.44 61.44 112.64 115.2 143.36l-2.56 2.56c0 12.8 0 23.04-5.12 35.84-10.24 20.48-15.36 23.04-23.04 38.4-5.12 12.8-2.56 25.6 7.68 30.72 10.24 5.12 23.04-2.56 28.16-15.36 7.68-15.36 5.12-20.48 15.36-43.52 2.56-7.68 10.24-20.48 23.04-25.6v-2.56c61.44 23.04 128 23.04 186.88 0 7.68 5.12 15.36 15.36 20.48 23.04 10.24 23.04 7.68 25.6 15.36 43.52 5.12 12.8 17.92 20.48 28.16 15.36 10.24-5.12 12.8-17.92 7.68-30.72-7.68-15.36-12.8-17.92-23.04-38.4-5.12-10.24-7.68-20.48-7.68-30.72 53.76-33.28 94.72-84.48 115.2-143.36 10.24-2.56 23.04-5.12 35.84-2.56 23.04 5.12 25.6 10.24 43.52 15.36 12.8 2.56 25.6-2.56 28.16-12.8 0-12.8-7.68-23.04-20.48-25.6z m-189.44-204.8c-35.84 28.16-79.36 56.32-99.84 66.56-2.56-2.56-7.68-5.12-10.24-5.12-5.12-17.92-10.24-71.68-10.24-120.32 43.52 5.12 87.04 25.6 120.32 58.88z m-133.12 115.2l20.48 23.04-5.12 30.72-28.16 15.36-28.16-12.8-7.68-30.72 17.92-25.6h30.72z m-38.4-174.08c0 46.08-5.12 97.28-10.24 120.32-5.12 2.56-7.68 5.12-12.8 7.68-20.48-10.24-61.44-38.4-99.84-66.56 30.72-35.84 74.24-56.32 122.88-61.44z m-186.88 207.36c0-38.4 10.24-76.8 30.72-110.08 35.84 30.72 71.68 64 87.04 84.48 0 2.56-2.56 7.68-2.56 12.8-20.48 10.24-69.12 25.6-115.2 35.84v-23.04z m97.28 176.64c-38.4-25.6-69.12-61.44-84.48-107.52 43.52-10.24 94.72-17.92 117.76-15.36 2.56 2.56 5.12 7.68 7.68 10.24-2.56 15.36-20.48 66.56-40.96 112.64z m112.64 33.28c-23.04 0-46.08-5.12-69.12-12.8 23.04-43.52 48.64-87.04 64-102.4H522.24c15.36 17.92 40.96 61.44 61.44 102.4-25.6 7.68-48.64 12.8-71.68 12.8z m112.64-33.28c-17.92-40.96-35.84-87.04-43.52-112.64 2.56-2.56 5.12-5.12 7.68-10.24 20.48 0 71.68 7.68 120.32 15.36-15.36 43.52-46.08 81.92-84.48 107.52z m94.72-153.6c-46.08-10.24-92.16-25.6-115.2-38.4 0-5.12-2.56-7.68-2.56-10.24 12.8-15.36 51.2-51.2 87.04-84.48 20.48 33.28 30.72 71.68 30.72 110.08 2.56 7.68 2.56 15.36 0 23.04z" fill="#F2F2F2"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/kalilinux.svg b/crates/nyaterm-app/assets/color/os/kalilinux.svg
new file mode 100644
index 00000000..779bba09
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/kalilinux.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M545.194667 253.568s-84.053333-5.546667-227.285334 39.253333c-145.92 45.653333-228.693333 110.378667-228.693333 110.378667s217.514667-121.472 463.018667-128.341333z m313.642666 132.053333l10.965334-0.725333s-62.634667-75.946667-182.528-112.981333c67.413333 27.392 126.037333 63.701333 171.562666 113.706666z m17.92 31.573334c1.664-2.901333 7.082667 9.258667 11.221334 14.378666 0.170667 1.024 0.426667 1.664-1.92 1.152-0.213333-1.066667-0.554667-1.365333-0.554667-1.365333s-5.76-3.413333-7.552-5.845333c-1.749333-2.432-2.090667-6.698667-1.194667-8.32z m147.114667 361.770666s13.312-152.661333-226.56-187.861333a779.818667 779.818667 0 0 0-107.690667-7.978667c-192.256 2.56-199.253333-221.738667-54.4-233.045333 60.032-4.949333 131.712 27.434667 201.813334 60.074667-0.298667 8.704 0.085333 16.426667 5.802666 23.552 5.717333 7.168 27.648 14.933333 34.688 18.986666 6.997333 4.010667 29.482667 18.346667 43.264 36.266667 2.986667-5.589333 27.904-21.845333 27.904-21.845333s-5.973333 0.128-19.84-5.077334c-13.909333-5.205333-30.421333-20.906667-30.805333-21.802666-0.426667-0.938667-0.64-2.346667 2.56-2.986667 2.517333-2.090667-3.072-8.832-5.546667-11.306667-2.474667-2.474667-18.986667-30.549333-19.370666-31.146666-0.384-0.682667-0.512-1.322667-1.706667-2.133334-3.626667-1.152-19.626667 1.706667-19.626667 1.706667s-24.533333-12.074667-33.024-38.101333c0.128 4.565333-4.224 9.557333 0 20.010666-12.8-5.418667-23.808-14.677333-32.512-37.546666-5.12 13.013333 0 21.290667 0 21.290666s-30.165333-8.448-34.986666-36.266666c-5.290667 12.501333 0 20.010667 0 20.010666s-49.194667-25.685333-130.944-26.026666c-54.741333-5.034667-66.133333-101.290667-61.013334-117.504 0 0-78.933333-41.6-234.368-59.989334-155.392-18.346667-282.794667-2.773333-282.794666-2.773333s275.2-13.226667 495.658666 76.074667c7.509333 33.493333 30.037333 89.344 42.197334 116.181333-34.773333 24.021333-73.941333 46.592-80.042667 126.72-6.101333 80.128 62.805333 150.613333 148.224 152.746667 81.066667 4.352 137.130667 4.949333 205.056 40.192 64.853333 35.84 118.016 145.066667 123.306667 243.328 5.632-72.917333-21.717333-229.674667-149.333334-277.248 178.389333 31.232 194.090667 163.498667 194.090667 163.498666zM541.013333 241.621333l-6.4-20.693333s-105.984-18.816-248.405333-8.704C143.786667 222.336 0 272.213333 0 272.213333s294.229333-74.026667 541.013333-30.592z" fill="#4F7A93"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/kylin.svg b/crates/nyaterm-app/assets/color/os/kylin.svg
new file mode 100644
index 00000000..0f8239e2
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/kylin.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M364.089 43.421L247.06 169.041 130.032 238.47 78.019 355.498 0 481.118l73.607 169.04 21.827 134.444 30.186 69.428-99.614 117.029H164.63l8.824-121.44 56.192-86.611 91.255 17.415 99.613-39.242 73.608-43.19 73.84 52.014-86.844 108.437-86.61 82.198h134.444v-56.192l108.205-86.843 39.01 47.834-112.618 164.629h138.623v-82.43l99.846-95.203-52.012-99.845-4.412-134.444 99.846-60.604 60.604 8.591 78.019-34.597 21.594-151.627-121.208 39.01-78.019 112.617-125.852 65.015-177.633-73.607-130.032-95.434 86.61-117.028-34.597-130.032L476.938 0l-121.44 130.032-39.01-8.592z" fill="#00A0E8"></path><path d="M476.938 0l-56.425 99.614 4.412 60.836z m-52.013 160.45l-134.443 73.607 169.04 52.013zM260.063 411.922l-125.62 104.025 169.042 52.013z m242.881 182.044l-199.46-26.006v99.614z m177.633-17.415l-177.633-73.607v91.022z m325.08-216.642l-121.209 39.01 60.604 39.01z" fill="#79C7E8"></path><path d="M316.488 121.44l-26.006 112.617 134.443-73.607zM134.444 238.47l117.028 21.594-4.412-91.022z m-4.412 0v147.447l130.031 26.006z m0 147.447L0 481.117l134.444 34.83z m4.412 130.031L73.607 650.16l86.843 39.01z m82.198 26.007L160.45 689.168 303.485 567.96z m156.27-134.444l-69.427 160.45 199.46-65.016zM567.96 750.005l108.205 95.434 73.84-112.85zM680.577 576.55l-47.601 99.614 112.617-78.019z m125.852-65.015l-60.836 86.61 99.846-60.604z" fill="#0092DB"></path><path d="M884.448 398.919l-39.01 138.623 99.614-99.614z m60.604 39.01l-39.01 108.204 78.02-34.597z m-654.57-203.872l73.607 95.434 95.434-43.421z" fill="#0092DB"></path><path d="M364.089 329.491l8.823 78.02 86.61-121.441z" fill="#86D0EA"></path><path d="M316.488 121.44l-69.428 47.601 43.422 65.016z" fill="#009FE7"></path><path d="M247.06 169.041l13.003 242.881 30.419-177.865zM78.02 355.498L0 481.118l130.032-95.202zM0 481.118l73.607 169.04 60.837-134.21z m95.434 299.305l78.02 69.195-13.004-160.45z m65.016-91.255l69.195 73.84 73.84-95.434z m143.035-21.594l190.636 30.418 8.823-104.026z m329.491 8.591l117.029 56.425-4.412-134.444z m212.463-138.623l60.604 8.591 39.01-108.205zM494.12 697.992l73.84 52.013 65.015-73.84z" fill="#168BD8"></path><path d="M567.728 749.772L528.95 884.448l100.542-80.341z m108.205 95.434l26.238 82.431 99.846-95.202z" fill="#168BD8"></path><path d="M480.885 858.21l-86.378 82.43h134.444z" fill="#2A7FB3"></path><path d="M78.019 910.454l86.61 60.605 8.824-121.44z" fill="#168BD8"></path><path d="M160.45 689.168l13.003 160.45 56.192-86.61z m149.072-20.666l110.991 72.679 73.608-43.19z m171.595 189.94l47.834 26.006 39.01-134.443z m195.048-13.003l125.852-13.004-52.012-99.845z" fill="#2A7FB3"></path><path d="M702.171 1010.068l13.004-95.434-39.01-69.195z m-138.623 0h138.623l-26.006-164.63zM78.02 910.454L26.006 971.06H164.63z" fill="#2A7FB3"></path><path d="M364.089 329.491l-104.026 82.431 112.85-4.412z" fill="#168BD8"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/linux-mint.svg b/crates/nyaterm-app/assets/color/os/linux-mint.svg
new file mode 100644
index 00000000..1ec1f517
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/linux-mint.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M86.016 138.016v152h64q32 0 44 22.016 10.016 16 10.016 52v270.016q0 68 36.992 126.016t99.008 92 138.016 34.016h372q36 0 62.016-20.992t26.016-55.008V392.064q0-68-36-126.016t-99.008-92-136.992-34.016L86.08 138.016zM282.016 232h76v384q0 38.016 22.016 64.992t54.016 27.008h254.016q40 0 67.008-23.008t27.008-56.992V424q0-18.016-12.992-32t-32.992-14.016-32.992 14.016-12.992 32v176h-80v-176q0-18.016-12.992-32t-32-14.016-32.992 14.016-14.016 32v176h-78.016v-176q0-52 36-88.992t87.008-36.992 87.008 36q36-36 87.008-36t88 38.016 36.992 88v218.016q-6.016 56-46.016 96-48 48-112 48h-284q-50.016-4-92-46.016-46.016-46.016-46.016-108v-400z" data-spm-anchor-id="a313x.search_index.0.i32.5afa3a81NBcrWb" class="selected" fill="#30c73a"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/linux.svg b/crates/nyaterm-app/assets/color/os/linux.svg
new file mode 100644
index 00000000..3c600b80
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/linux.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M525.2 198.3c-8.6 5.6-15.2 13.8-18.9 23.4-3.8 12.4-3.2 25.6 1.5 37.7 3.9 12.7 11.7 23.8 22.2 31.8 5.4 3.8 11.6 6.2 18.2 7 6.6 0.8 13.2-0.3 19.1-3.3 7-3.9 12.6-10 15.9-17.3 3.2-7.4 5-15.3 5.2-23.3 0.7-10.2-0.6-20.4-3.8-30.1-3.5-10.6-10.3-19.7-19.5-25.9-4.7-3-9.9-5-15.4-5.8-5.5-0.8-11.1-0.2-16.3 1.8-2.9 1.2-5.7 2.7-8.3 4.5" fill="#FFFFFF"></path><path d="M810.2 606.5c-5.1-28.3-13.1-56-23.8-82.6-7.3-19.8-17.2-38.6-29.5-55.8-12.4-16.5-28.1-30.4-40.2-47.1-6.4-8.7-11.8-18.4-18.5-26.9-2.7-5.6-5.3-11.2-7.9-16.8-8-17.5-15.3-35.4-24.8-52-1.5-2.6-3.1-5.2-4.6-7.7-1.2-16-2.9-32-3.8-48 0.7-32.1-2-64.3-8.1-95.9-4.2-15.1-10.6-29.6-19-42.8-9.8-15.6-22.4-29.2-37.2-40.1-24.1-17.1-52.9-26.3-82.4-26.4-21.7-0.5-43.2 4.4-62.5 14.4-20.3 11.1-36.7 28.2-47 48.9-9.6 20.9-14.7 43.5-15 66.5-0.8 22.6 1.3 45 2.2 67.6 0.9 23.4 0.4 46.9 2.3 70.3 0.6 7.5 1.5 15 1.5 22.6 0 3.8-0.2 7.6-0.3 11.3l-0.3 0.8c-10.2 17.3-21.5 34-33.8 49.9-8.6 10.9-17.2 21.7-25.9 32.4-11.3 12.7-20.9 26.8-28.5 42-5.1 13.2-9.2 26.8-12.4 40.6l-0.3 1.1c-4.8 15.9-10.8 31.3-18 46.2-0.7 1.4-1.4 2.9-2 4.2-4.3 8.9-8.8 17.8-13.5 26.5l-5.4 10.1c-3.4 6.1-6.4 12.4-9 18.8-1.5 3.9-2.7 7.9-3.4 12-1.3 8.7-0.7 17.5 1.6 25.9 0.5 2.1 1.2 4.2 1.9 6.3 2.2 6.2 4.8 12.3 7.9 18.1 1.4 2.7 2.9 5.3 4.3 8l1.3 1.9c1.4 2.5 2.9 5 4.4 7.4l0.2 0.3c1.7 2.8 3.6 5.5 5.4 8.2l0.3 0.4c1.9 2.6 3.8 5.3 5.8 7.9 7.4 28.9 21 55.8 39.7 79-2.9 5.1-5.5 10.1-8.4 15.1-10.2 14.8-18.6 30.7-25.1 47.4-2.7 8.6-3.4 17.7-1.9 26.6 1.4 9 6 17.1 13 23 4.7 3.6 10.1 6.1 15.8 7.3 5.7 1.2 11.6 1.8 17.5 1.5 22.2-1.7 44.2-6.1 65.4-12.9 12.8-3.4 25.6-6.4 38.6-9 13.5-3.1 27.2-5 41-5.6 3.4 0.1 6.8-0.1 10.1-0.3 9.4 1 18.8 1.4 28.3 1l3.5-0.2c2.4 0.3 4.9 0.4 7.4 0.6 16.6 0.9 33.1 2.6 49.5 5.1 14.4 2.2 28.8 5 43 8.5 21.9 6.6 44.4 11 67.3 12.9 6 0.3 12-0.2 18-1.4 5.9-1.2 11.5-3.8 16.3-7.4 7-5.8 11.6-13.9 13.1-22.9 1.5-8.9 0.8-18-1.9-26.6-6.6-16.7-15.1-32.6-25.5-47.3-3.6-6.1-7-12.4-10.6-18.5 15.5-17.3 29.2-36.3 40.7-56.5 7 0.4 13.9-0.4 20.6-2.6 17.5-5.9 32.7-17.3 43.3-32.5 3.2-4.5 5.7-9.5 7.2-14.8 6.9-10.7 11.6-22.7 13.8-35.3 3.2-20.8 2.7-42.1-1.5-62.7h-0.2z m0 0" fill="#374151" stroke="#E5E7EB" stroke-opacity=".55" stroke-width="18"></path><path d="M425.6 323.2c-3.1 4-5.3 8.7-6.4 13.6-1.1 4.9-1.8 10-1.9 15 0.3 10.1-0.5 20.2-2.5 30.1-3.5 10.3-8.8 19.8-15.6 28.3-11.7 14.7-20.9 31.2-27.2 48.8-3.2 10.9-4.3 22.3-3.1 33.7-12.1 17.9-22.6 36.9-31.3 56.7-13.4 29.9-22 61.8-25.5 94.4-4.3 40.1 1.6 80.6 17 117.8 11.3 26.8 28.5 50.8 50.3 70.1 11.2 9.7 23.5 17.9 36.7 24.4 46.7 22.8 101.4 22.3 147.6-1.4 23.1-13.5 44.2-30.2 62.6-49.5 11.9-10.8 22.5-22.9 31.8-36.1 15.5-26.9 24.6-57.1 26.5-88.1 9.6-53.6 3.7-108.8-16.9-159.2-8.1-16.8-18.8-32.2-31.8-45.6a252.5 252.5 0 0 0-20.2-68c-7.2-15.5-15.9-30.3-22.6-46.2-2.7-6.5-5.1-13.1-8.1-19.4-2.9-6.4-6.9-12.3-11.8-17.3-5.3-4.9-11.6-8.6-18.5-10.7-6.9-2.2-14-3.4-21.2-3.6-14.4-0.7-28.9 1.1-43.1 0.6-11.5-0.5-22.8-2.5-34.3-1.8-5.7 0.3-11.4 1.4-16.7 3.5-5.4 2.1-10.1 5.5-13.8 10m4.6-125.1c-5.4 0.4-10.5 2.7-14.4 6.4-3.9 3.7-6.8 8.4-8.4 13.5-2.7 10.4-3.4 21.3-1.9 32 0.2 9.7 1.9 19.4 5.1 28.6 1.8 4.5 4.4 8.7 7.8 12.2 3.4 3.5 7.7 6.1 12.4 7.3 4.5 1.1 9.2 0.9 13.5-0.5 4.3-1.4 8.3-3.8 11.5-7 4.7-4.8 8.1-10.7 9.8-17.1 1.7-6.4 2.5-13.1 2.3-19.8 0-8.3-1.3-16.6-3.8-24.6s-6.8-15.3-12.6-21.4c-2.8-2.9-6-5.4-9.6-7.2-3.7-1.7-7.7-2.6-11.7-2.4m95 0c-8.6 5.6-15.2 13.8-18.9 23.4-3.8 12.4-3.2 25.6 1.5 37.7 3.9 12.7 11.7 23.8 22.2 31.8 5.4 3.8 11.6 6.2 18.2 7 6.6 0.8 13.2-0.3 19.1-3.3 7-3.9 12.6-10 15.9-17.3 3.2-7.4 5-15.3 5.2-23.3 0.7-10.2-0.6-20.4-3.8-30.1-3.5-10.6-10.3-19.7-19.5-25.9-4.7-3-9.9-5-15.4-5.8-5.5-0.8-11.1-0.2-16.3 1.8-2.9 1.2-5.7 2.7-8.3 4.5" fill="#FFFFFF"></path><path d="M544.5 223.6c-3.2 0.2-6.2 1.2-8.9 2.9s-5 4-6.8 6.6c-3.4 5.3-5.3 11.5-5.4 17.9-0.3 4.7 0.4 9.5 1.9 14s4.3 8.5 7.9 11.5c3.8 3.1 8.4 4.9 13.3 5.2 4.9 0.2 9.7-1.1 13.7-3.9 3.2-2.3 5.8-5.2 7.6-8.7 1.8-3.4 2.9-7.2 3.4-11 1-6.8-0.2-13.8-3.2-19.9-3.1-6.2-8.4-10.9-14.8-13.4-2.8-1.1-5.7-1.5-8.7-1.4" fill="#020204"></path><path d="M430.2 198.3c-5.4 0.4-10.5 2.7-14.4 6.4-3.9 3.7-6.8 8.4-8.4 13.5-2.7 10.4-3.4 21.3-1.9 32 0.2 9.7 1.9 19.4 5.1 28.6 1.8 4.6 4.4 8.7 7.8 12.2 3.4 3.5 7.7 6.1 12.4 7.3 4.5 1.1 9.2 0.9 13.5-0.5 4.3-1.4 8.3-3.8 11.5-7 4.7-4.8 8.1-10.7 9.8-17.1 1.7-6.4 2.5-13.1 2.3-19.8 0-8.3-1.3-16.6-3.8-24.6s-6.8-15.3-12.6-21.4c-2.8-2.9-6-5.4-9.6-7.2-3.7-1.7-7.7-2.6-11.7-2.4" fill="#FFFFFF"></path><path d="M417.3 242.8c-1.3 6.7-1 13.7 1.1 20.2 1.6 4.3 4 8.2 7.2 11.5 2 2.2 4.3 4.1 7 5.4 2.7 1.4 5.7 1.8 8.7 1.1 2.7-0.7 5-2.3 6.7-4.5 1.7-2.2 2.9-4.7 3.7-7.3 2.3-7.8 2.1-16.1-0.4-23.9-1.6-5.7-4.7-10.9-9.1-14.8-2.1-1.8-4.7-3.2-7.4-3.9-2.8-0.7-5.7-0.5-8.4 0.7-2.8 1.4-5.1 3.7-6.5 6.5-1.4 2.8-2.3 5.8-2.7 8.9" fill="#020204"></path><path d="M404.6 326.9c0.2 0.9 0.5 1.8 1 2.5 0.9 1.4 2 2.5 3.4 3.4 1.3 0.9 2.6 1.7 3.9 2.5 6.9 4.7 13 10.5 17.9 17.3 6 9.4 13.5 17.8 22 25 6.5 4.5 14.1 7.2 22 7.9 9.2 0.7 18.5-0.4 27.4-3.2 8.2-2.4 16.1-5.8 23.5-10.3 12.7-10.2 26.3-19.2 40.7-26.7 3.4-1.2 6.8-2.1 10-3.6 3.3-1.4 6.1-3.8 7.8-7 1.1-3.2 1.8-6.6 1.9-10 0.5-3.6 1.7-7.1 2.3-10.7 0.8-3.6 0.5-7.3-0.8-10.8-1.4-2.7-3.6-4.9-6.3-6.3-2.7-1.3-5.7-2.1-8.7-2.2-6.1 0.2-12.1 0.8-18 1.8-8 0.7-16-0.3-24 0-9.9 0.3-19.8 2.5-29.8 2.9-11.4 0.6-22.7-1.2-34.1-1.7-4.9-0.3-9.9-0.1-14.8 0.7-4.9 0.7-9.6 2.5-13.7 5.3-3.8 3-7.3 6.2-10.7 9.6-1.8 1.6-3.8 3-5.9 4.1-2.2 1.1-4.5 1.7-7 1.6-1.2-0.2-2.5-0.2-3.7 0-0.7 0.3-1.4 0.7-1.9 1.2l-1.5 1.8c-1 1.5-1.9 3.1-2.6 4.7" fill="#D99A03"></path><path d="M429.7 301.7c-4 2.4-7.9 5-11.8 7.7-2.1 1.3-3.8 3-5.1 5.1-0.7 1.6-1 3.3-0.9 5 0.1 1.7 0.1 3.4 0 5.1-0.1 1.1-0.5 2.3-0.5 3.5 0 0.6 0 1.2 0.2 1.7 0.2 0.6 0.4 1.1 0.8 1.5 0.5 0.5 1.2 0.9 2 1.1 0.7 0.2 1.5 0.3 2.3 0.5 3.5 1 6.7 2.9 9.3 5.4 2.7 2.4 5.1 5.2 8 7.5 8 6 17.7 9.1 27.6 9 9.9-0.2 19.7-1.6 29.2-4.1 7.5-1.6 14.9-3.6 22.1-6.1 11.2-4.2 21.5-10.3 30.4-18.2 3.9-3.8 8-7.2 12.4-10.3 4-2.5 8.7-4.2 12.7-6.6 0.4-0.2 0.7-0.5 1.1-0.7 0.3-0.3 0.6-0.6 0.8-1 0.3-0.7 0.3-1.5 0-2.2-0.2-0.7-0.5-1.3-0.9-1.8-0.5-0.6-1.1-1.2-1.7-1.7-4.6-3.4-10.1-5.3-15.8-5.5-5.8-0.4-11.3 0-16.9-1.1-5.2-1.1-10.3-2.6-15.3-4.4-5.3-1.7-10.7-3-16.3-3.9-13-2.1-26.2-1.8-39.1 1-12.1 2.7-23.8 7.3-34.6 13.5" fill="#604405"></path><path d="M428.4 288.1c-5.8 3.9-11 8.7-15.5 14.1-2.6 3-4.7 6.5-6.1 10.3-0.9 3-1.5 6.1-2 9.2-0.3 1.1-0.5 2.3-0.5 3.5 0 0.6 0.1 1.2 0.3 1.7 0.2 0.6 0.5 1.1 0.9 1.5 0.7 0.7 1.6 1.1 2.6 1.3 0.9 0.2 1.9 0.2 2.9 0.3 4.4 0.7 8.5 2.5 12.1 5.1 3.6 2.5 7 5.4 10.7 7.8 8.4 5 18 7.7 27.8 7.9 9.8 0.2 19.5-0.8 29-2.9 7.6-1.4 15.1-3.5 22.4-6.3 10.9-4.7 21.1-10.8 30.4-18.2 4.3-3.2 8.5-6.6 12.4-10.3 1.3-1.3 2.6-2.6 4-3.8 1.4-1.2 3-2.1 4.7-2.7 2.7-0.7 5.5-0.8 8.3-0.1 2 0.5 4.1 0.7 6.2 0.7 1.1 0 2.1-0.2 3.1-0.5 1-0.4 1.9-1 2.5-1.8 0.9-1.1 1.3-2.4 1.3-3.8s-0.4-2.7-1.1-3.9c-1.5-2.3-3.8-4.1-6.3-5.1-3.5-1.4-7.1-2.5-10.8-3.2-11.3-2.7-22.3-6.7-32.7-11.9-5.2-2.6-10.1-5.4-15.3-8.1-5.2-2.9-10.6-5.4-16.2-7.2-12.9-3.5-26.6-2.9-39.1 1.8-14 4.9-26.5 13.4-36.1 24.7" fill="#F5BD0C"></path><path d="M493.5 272.2c0.7 2.3 4.3 1.9 6.4 2.9 2.1 1 3.3 2.9 5.3 3.1 2.1 0.2 5-0.7 5.3-2.6 0.4-2.6-3.4-4.2-5.8-5.1-3.2-1.5-6.8-1.6-10-0.2-0.7 0.3-1.4 1.2-1.2 1.9z m-34.4-1.2c-2.7-0.9-7.1 3.8-5.8 6.3 0.4 0.7 1.6 1.5 2.4 1.1 0.8-0.4 2.3-3.1 3.6-4 1-0.8 0.8-3.1-0.2-3.4z m0 0" fill="#CD8907"></path><path d="M887.7 829.8c-2 5.2-4.9 10-8.5 14.3-8.4 9-18.6 16.2-29.8 21.2-19 8.8-37.5 18.6-55.5 29.3-11.7 7.8-22.6 16.6-32.7 26.4-8.3 8.7-17.2 16.7-26.6 24.2-9.8 7.2-21.1 12.1-33.1 14-14.7 1.9-29.6-0.4-43.1-6.5-9.7-3.7-18.1-10.2-24-18.8-5-9.2-7.3-19.5-6.8-29.9 0.6-18.3 2.8-36.5 6.6-54.5 2.6-15 5.2-30 6.8-45.1 2.8-27.6 3.1-55.3 1-82.9-0.5-4.6-0.5-9.3 0-13.9 0.6-9.4 8.5-16.6 18-16.5 4.3-0.1 8.6 0.3 12.8 1.1 10 1.2 20 2.9 29.8 5.2 6.1 1.6 12.2 3.8 18.3 5.5 10.2 3 21 3.9 31.6 2.9 11.1-2.6 22.4-4.3 33.8-5.3 4.7 0.2 9.4 1 13.8 2.4 4.6 1.3 8.9 3.6 12.4 6.9 2.5 2.7 4.5 5.8 5.8 9.2 1.9 5.1 3.1 10.4 3.5 15.8 0.2 4.8 0.6 9.6 1.2 14.4 1.7 7.7 5.4 14.9 10.6 20.9 5.3 5.8 11 11.2 17.2 16 5.9 5.2 12.1 10 18.6 14.4 3.1 2.1 6.2 4 9.1 6.3 3 2.2 5.5 5 7.4 8.2 2.4 4.4 3.2 9.5 2 14.4" fill="#F5BD0C"></path><path d="M887.7 829.8c-2 5.2-4.9 10-8.5 14.3-8.4 9-18.6 16.2-29.8 21.2-19 8.8-37.5 18.6-55.5 29.3-11.7 7.8-22.6 16.6-32.7 26.4-8.3 8.7-17.2 16.7-26.6 24.2-9.8 7.2-21.1 12.1-33.1 14-14.7 1.9-29.6-0.4-43.1-6.5-9.7-3.7-18.1-10.2-24-18.8-5-9.2-7.3-19.5-6.8-29.9 0.6-18.3 2.8-36.5 6.6-54.5 2.6-15 5.2-30 6.8-45.1 2.8-27.6 3.1-55.3 1-82.9-0.5-4.6-0.5-9.3 0-13.9 0.6-9.4 8.5-16.6 18-16.5 4.3-0.1 8.6 0.3 12.8 1.1 10 1.2 20 2.9 29.8 5.2 6.1 1.6 12.2 3.8 18.3 5.5 10.2 3 21 3.9 31.6 2.9 11.1-2.6 22.4-4.3 33.8-5.3 4.7 0.2 9.4 1 13.8 2.4 4.6 1.3 8.9 3.6 12.4 6.9 2.5 2.7 4.5 5.8 5.8 9.2 1.9 5.1 3.1 10.4 3.5 15.8 0.2 4.8 0.6 9.6 1.2 14.4 1.7 7.7 5.4 14.9 10.6 20.9 5.3 5.8 11 11.2 17.2 16 5.9 5.2 12.1 10 18.6 14.4 3.1 2.1 6.2 4 9.1 6.3 3 2.2 5.5 5 7.4 8.2 2.4 4.4 3.2 9.5 2 14.4M259.4 676.3c4.9-1.9 10.2-2.4 15.4-1.4 5.2 1 10.1 3.1 14.4 6.1 8.3 6.3 15.5 14.1 21.2 22.8 14.1 19.4 27.6 39.2 39.9 59.8 10 16.7 19.1 33.9 30.6 49.6 7.5 10.2 16 19.7 23.6 29.9 7.9 10 13.9 21.4 17.6 33.5 4.4 16.1 2.6 33.2-4.9 48.1-5.4 10.4-13.5 19.1-23.4 25.1-10 6-21.5 9-33.2 8.7-18.4-2.5-36.2-8.1-52.6-16.6-34.9-13.9-72.8-18.3-108.8-29.1-11.1-3.3-21.9-7.3-33.1-10.3-5-1.2-9.9-2.7-14.7-4.7-4.7-2-8.8-5.4-11.5-9.7-2-3.5-3-7.5-2.9-11.5 0.1-4 0.9-7.9 2.3-11.5 2.7-7.5 7.1-14.2 10-21.6 4.4-12.2 6.1-25.3 5-38.2-0.6-12.9-2.9-25.8-3.6-38.7-0.6-5.8-0.4-11.6 0.6-17.3 1.5-11.4 10.4-20.5 21.9-22.2 5.3-0.9 10.6-1.3 15.9-1 5.3 0.3 10.7 0.3 16 0 5.3-0.3 10.6-1.8 15.3-4.3 4.3-2.6 8.1-6.2 11-10.4 2.9-4.2 5.5-8.5 7.9-13 2.4-4.5 5.1-8.7 8.3-12.7 3-4.1 7.1-7.2 11.8-9.4" fill="#F5BD0C"></path><path d="M259.4 676.4c4.9-1.9 10.2-2.4 15.4-1.4 5.2 1 10.1 3.1 14.4 6.1 8.3 6.3 15.5 14.1 21.2 22.8 14.1 19.4 27.6 39.2 39.9 59.8 10 16.7 19.1 33.9 30.6 49.6 7.5 10.2 16 19.7 23.6 29.9 7.9 10 13.9 21.4 17.6 33.5 4.4 16.1 2.6 33.2-4.9 48.1-5.4 10.4-13.5 19.1-23.4 25.1-10 6-21.5 9-33.2 8.7-18.4-2.5-36.2-8.1-52.6-16.6-34.9-13.9-72.8-18.3-108.8-29.1-11.1-3.3-21.9-7.3-33.1-10.3-5-1.2-9.9-2.7-14.7-4.7-4.7-2-8.8-5.4-11.5-9.7-2-3.5-3-7.5-2.9-11.5 0.1-4 0.9-7.9 2.3-11.5 2.7-7.5 7.1-14.2 10-21.6 4.4-12.2 6.1-25.3 5-38.2-0.6-12.9-2.9-25.7-3.6-38.7-0.6-5.8-0.4-11.6 0.6-17.3 1.5-11.4 10.4-20.5 21.9-22.2 5.3-0.9 10.6-1.3 15.9-1 5.3 0.3 10.7 0.3 16 0 5.3-0.3 10.6-1.8 15.3-4.3 4.3-2.6 8.1-6.2 11-10.4 2.9-4.2 5.5-8.5 7.9-13 2.4-4.5 5.1-8.7 8.3-12.7 3-4.1 7.1-7.3 11.8-9.4" fill="#F5BD0C"></path><path d="M267.1 684.8c4.4-1.7 9.3-2 13.9-0.9s8.9 3.2 12.6 6.2c7.1 6.2 13.1 13.6 17.6 21.9 12 19.4 23.7 39 34.6 59 7.9 15.3 16.8 30.1 26.6 44.2 6.8 9.2 14.6 17.6 21.6 26.6 7.3 8.9 12.8 19 16.2 29.9 4 14.3 2.3 29.6-4.5 42.9-5 9.4-12.5 17.3-21.7 22.6-9.2 5.4-19.8 8-30.4 7.5-16.7-2.6-32.9-7.6-48.2-14.9-30.4-11.1-63.5-12.5-94.7-21.2-11.2-3-22.1-7.1-33.4-9.9-5-1.1-10-2.5-14.8-4.3-4.8-1.8-9-5.2-11.8-9.5-1.8-3.4-2.7-7.2-2.5-11 0.2-3.8 1-7.6 2.4-11.2 2.7-7.1 7-13.6 9.7-20.7 3.8-11 5.1-22.6 3.9-34.2-0.8-11.5-2.9-22.9-3.5-34.5-0.4-5.1-0.2-10.3 0.7-15.4 0.9-5.1 3.3-9.8 6.9-13.6 4.2-3.8 9.4-6.3 15-7 5.6-0.7 11.2-0.7 16.7 0 5.6 0.7 11.2 0.9 16.8 0.8 11 0 21-6.4 25.7-16.4 2.3-4.5 4.3-9.2 5.9-13.9 1.7-4.8 4-9.3 6.7-13.6 2.8-4.3 6.8-7.7 11.5-9.7" fill="#F5BD0C"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/manjaro.svg b/crates/nyaterm-app/assets/color/os/manjaro.svg
new file mode 100644
index 00000000..98118a68
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/manjaro.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M0 0v1024h288V288h368V0H0z m368 368V1024h288V368h-288zM736 0v1024h288V0h-288z" fill="#35BF5C"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/nixos.svg b/crates/nyaterm-app/assets/color/os/nixos.svg
new file mode 100644
index 00000000..a5abcdbc
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/nixos.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M313.685333 67.925333l-58.197333 0.085334L226.986667 117.333333l66.432 115.754667-133.845334-0.341333-56.32 99.84h498.773334l-57.728-99.498667-136.192-0.256-94.464-164.906667z m263.466667 0l-114.645333 1.066667 249.429333 432.085333 57.216-99.84-67.84-117.973333 95.573333-164.266667-29.141333-50.432h-57.002667l-66.986666 115.413334-66.56-116.053334z m293.845333 178.986667l-249.429333 432 115.029333-0.341333 68.309334-117.76 189.994666 0.682666 29.098667-50.474666-28.416-49.365334-133.546667-0.341333L929.194667 345.6l-58.24-98.688zM402.432 345.002667l-115.029333 0.341333-68.309334 117.76-189.994666-0.682667L0 512.853333l28.416 49.365334 133.546667 0.341333-67.2 115.626667 58.24 98.773333L402.432 345.002667zM312.746667 522.666667l-0.256 0.426666-0.085334-0.170666-57.258666 99.84 67.84 117.973333-95.573334 164.266667 29.184 50.432H313.6l0.170667-0.256h0.042666l66.858667-115.114667 66.474667 116.053333 114.688-1.109333-0.170667-0.256h0.426667L312.746667 522.666667z m108.8 167.68l57.770666 99.498666 136.192 0.256 94.506667 164.906667 58.154667-0.085333 28.501333-49.322667-66.432-115.754667 133.845333 0.341334 56.32-99.84H421.589333z" fill="#5277C3" data-spm-anchor-id="a313x.search_index.0.i38.5afa3a81NBcrWb" class=""></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/openeuler.svg b/crates/nyaterm-app/assets/color/os/openeuler.svg
new file mode 100644
index 00000000..faefef8f
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/openeuler.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M886.389379 399.204061c-20.791878 25.270129-74.211011 35.50613-116.754393 22.391253-40.624131-12.475127-53.739008-40.944006-31.667629-63.335259 21.111753-21.431628 68.45326-31.02788 108.117766-21.111754 41.263881 10.236002 60.456384 37.745256 40.304256 61.735885m-187.446778-51.499883c-22.071378 21.751503-69.732761 31.02788-104.279266 20.472003-19.192503-5.757751-29.74838-17.913003-30.38813-28.149004-0.319875-7.677001-12.795002-15.034127-26.229754-18.872628-13.754627-3.838501-29.428504-3.518626-45.422257-1.599375-4.158376 0.319875-12.475127 2.239125-17.913003 3.8385-14.714252 4.798126-27.189379 9.916127-37.745255 18.232878-13.114877 10.555877-17.593128 28.788754-17.273253 35.826006 0.319875 9.596251 9.596251 17.913003 23.990629 23.031003 13.754627 5.118001 31.02788 5.757751 48.301132 3.198751 21.111753-5.437876 44.142757-5.757751 63.015385 0.63975 34.546505 11.515502 43.183132 41.583756 17.273252 67.17376-27.189379 26.549629-79.648887 36.465756-114.515267 22.071378-19.192503-7.996876-26.229754-23.031004-27.189379-36.78563-0.959625-10.555877-10.875752-19.192503-24.630379-24.630379-13.754627-5.437876-29.74838-5.118001-47.661382-3.838501-2.239125 0-13.114877 2.239125-19.512378 3.838501-8.956501 2.239125-27.509254 7.357126-42.863257 21.751503-12.155252 11.515502-17.593128 22.391253-20.791878 29.10863-1.91925 3.838501-3.838501 12.155252-4.158376 15.354002-0.319875 12.155252 6.717376 23.031004 20.791878 30.068255 13.754627 7.037251 31.987505 8.636626 50.540258 6.077626 23.350879-6.077626 47.981257-5.437876 66.853885 3.518625 34.86638 16.313627 39.024756 55.018508 6.077626 87.006013-34.22663 33.58688-92.763764 44.142757-127.310269 23.670754-18.872628-11.195627-24.310504-28.468879-21.751503-48.301132s0-4.798126-0.639751-7.357127c0 0-0.63975-3.838501-3.19875-8.956501-3.518626-6.717376-9.276376-12.475127-17.273253-16.633502-13.434752-7.357126-31.347755-9.276376-49.900507-6.717376-23.350879 6.077626-46.062007 5.118001-60.77626-3.838501-25.590004-15.354002-17.913003-47.661382 14.714253-71.971886 16.953378-12.475127 37.425381-20.791878 56.937758-23.990629 18.552753-3.518626 37.425381-11.515502 52.459508-23.031003 14.714252-11.195627 22.391253-23.350879 23.031004-33.906755s0-5.757751-0.63975-11.515502c-0.63975-9.276376 0-18.232878 8.636626-27.829129 5.437876-6.397501 17.593128-12.475127 30.708005-14.714253 8.956501-1.599375 20.472003-1.2795 27.189379-1.599375 5.757751 0 15.673877-1.2795 19.192503-2.239125 13.114877-3.838501 21.111753-7.996876 31.02788-15.673878 9.916127-7.677001 16.313627-15.673877 17.273252-23.031003 0-1.599375 0.63975-8.636626 0.63975-9.596252-3.19875-17.273253 21.751503-36.145881 56.298009-42.223506 17.273253-3.19875 33.906755-2.239125 46.381882 1.599375h1.2795c12.475127 3.518626 20.472003 9.276376 23.670754 16.313628v0.63975s0.959625 2.559 0.959625 3.8385c2.878875 7.677001 11.515502 14.074502 25.590004 17.913003 13.754627 3.518626 30.068255 3.838501 46.062007 1.2795 19.192503-4.798126 40.624131-5.757751 59.176884-0.959625 33.906755 8.316751 45.422257 31.66763 23.990629 52.779383m-80.288638 384.169934c-33.906755 41.263881-101.720266 53.099258-146.822647 26.229754-42.543381-25.590004-46.381882-74.850761-12.155252-110.037017 32.627255-33.58688 90.844514-44.142757 133.06802-24.630379 44.782507 20.791878 57.897384 69.093011 25.909879 108.117767M951.004139 233.188911L544.442952 8.316751c-20.152128-11.195627-45.102382-11.195627-65.25451 0L72.627255 233.188911C52.475127 244.384537 40 264.85654 40 287.247794v449.424443c0 22.391253 12.475127 42.863257 32.627255 54.058884l406.561187 224.872159c20.152128 11.195627 45.102382 11.195627 65.25451 0l406.561187-224.872159c20.152128-11.195627 32.627255-31.66763 32.627255-54.058884V286.927919c0-22.391253-12.475127-42.863257-32.627255-54.058883" fill="#4F7DFF"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/opensuse.svg b/crates/nyaterm-app/assets/color/os/opensuse.svg
new file mode 100644
index 00000000..9e510aeb
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/opensuse.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 0a512 512 0 1 0 512 512 512 512 0 0 0-512-512m2.432 70.912a441.088 441.088 0 1 1-330.368 733.184c33.216-25.6 88.768-19.52 157.248-11.712 32.832 3.776 70.4 8.064 108.8 8.896a800 800 0 0 0 295.552-50.368 368.832 368.832 0 0 0 94.464-50.56 55.488 55.488 0 0 0 13.76-24.128l2.432-6.4a283.84 283.84 0 0 0 9.216-33.152c0.896-3.968 1.344-8.192-1.472-10.432l-9.984 1.92a422.4 422.4 0 0 1-183.488 56.192c-91.136 1.92-274.88-91.776-294.016-101.632l-1.856-2.24c-4.608-11.008-32-76.224-37.952-89.984A777.792 777.792 0 0 0 662.656 633.6a300.224 300.224 0 0 0 197.44-64.512 112.96 112.96 0 0 1 12.8-8.128l2.112-3.392a745.152 745.152 0 0 0-91.072-229.888 151.872 151.872 0 0 0-34.88-30.336C615.232 219.136 298.048 172.288 283.2 170.112l-2.432 0.768-0.96 1.92-1.28 73.152c-10.88-3.584-44.8-14.656-92.992-27.904a393.216 393.216 0 0 1 328.896-147.2m116.544 233.536h6.784a135.68 135.68 0 0 1 88.064 234.752A134.784 134.784 0 0 1 628.544 576a136.512 136.512 0 0 1-131.072-140.8 135.744 135.744 0 0 1 133.504-130.816M627.2 344.32A94.72 94.72 0 0 0 538.944 435.2a94.656 94.656 0 1 0 97.664-90.88h-9.216m24.896 47.36c23.168 0 41.856 12.8 41.856 28.096S675.456 448 652.288 448s-42.048-12.8-42.048-28.096 18.816-28.096 42.048-28.096" fill="#73BA25"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/powershell.svg b/crates/nyaterm-app/assets/color/os/powershell.svg
new file mode 100644
index 00000000..c960d455
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/powershell.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M989.0992 131.296c24.224 0 39.392 19.744 33.792 44.16l-156.128 681.856c-5.536 24.416-29.728 44.16-53.984 44.16H34.9552c-24.224 0-39.392-19.744-33.792-44.16L157.2912 175.456c5.536-24.416 29.728-44.16 53.984-44.16z m-357.344 398.72c10.72-16.8 9.696-38.624-3.84-53.024l-238.688-253.92c-16.224-17.28-44.256-17.376-62.56-0.16s-19.968 45.088-3.744 62.336l198.912 211.616v4.704l-316.576 229.248c-19.2 13.952-22.752 41.696-7.968 61.984s42.272 25.472 61.44 11.52l351.104-252.128c11.936-8.416 18.688-15.616 21.92-22.176z m-119.296 187.68h-0.256c-21.792 0-39.488 17.6-39.584 39.36 0 21.76 17.824 39.392 39.84 39.392h189.408c21.792 0 39.488-17.6 39.584-39.36a39.616 39.616 0 0 0-39.584-39.392h-0.256z" fill="#5391FE"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/raspberrypi.svg b/crates/nyaterm-app/assets/color/os/raspberrypi.svg
new file mode 100644
index 00000000..4990ba94
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/raspberrypi.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M894.5454904 567.14525911a161.48370043 161.48370043 0 0 0-62.01013687-100.59767845 24.32047326 24.32047326 0 0 1-11.26942859-15.78709789 152.75236773 152.75236773 0 0 0-16.96777204-83.71474527c-22.01568421-41.12563747-69.81531202-64.43511429-69.81531201-64.4351143s-1.09583529-5.40140743 9.36055422-6.55380194a31.23484036 31.23484036 0 0 0 20.64412265-12.44303283c2.75019306-3.85309823 0-8.53337535 5.5003861-10.18773312a34.64253457 34.64253457 0 0 0 20.36839635-10.46345944c6.05183869-7.71326638 7.98192276-18.17672579 11.5592947-20.92691882s15.95677561-7.98899266 20.91277903-19.00390469-2.47446676-12.94499607 8.25764905-20.37546624a24.74466755 24.74466755 0 0 0 11.31184802-20.92691885c0.2757263-4.12882453-2.47446676-6.85073796 0-10.44931961a43.54354498 43.54354498 0 0 0 12.11074729-19.56949709 25.19714147 25.19714147 0 0 0-3.02591933-15.69518912c0-2.20581036 5.2246598-4.9489335 8.80203173-11.8420909a22.10759298 22.10759298 0 0 0 0-18.72817838c-1.92301417-4.68027712-5.5003861-7.43754007-4.94893349-10.73918572s8.80203174-17.07382062-3.03298926-30.29454298a30.99446357 30.99446357 0 0 0-28.89470181-8.53337535c-2.19874046-0.5514526-11.31184801-11.31184801-23.11858939-12.94499609s-21.46423163-0.5514526-24.49015096-1.65435777-5.23172972-7.71326638-15.13666663-8.53337535-15.68811923 0.5514526-17.34247701 0a30.82478587 30.82478587 0 0 0-20.09267005-9.08482793 61.21830752 61.21830752 0 0 0-20.63705273 5.78318229 26.78787009 26.78787009 0 0 0-17.06675071-7.71326636c-11.31184801-0.2757263-19.26549116 7.71326638-23.39431569 7.98899265s-11.55222479-4.68027712-21.20971505-2.75726295a43.31730802 43.31730802 0 0 0-15.9638455 9.08482796c-2.75019306 0.82717888-12.65512997-2.48153666-20.91277904-0.27572631a43.66373338 43.66373338 0 0 0-18.71403856 14.04083136 13.27728161 13.27728161 0 0 1-14.04083139 4.40455082c-5.5003861-1.37863148-27.61504899 12.66926978-45.31809112 41.30945499s-16.60013698 41.57811138-16.60013698 41.57811139H504.93009499s1.10290518-12.94499607-16.60013697-41.57811139-39.81770502-42.68101655-45.31809116-41.30945499a13.27021171 13.27021171 0 0 1-14.03376144-4.40455082 43.67787317 43.67787317 0 0 0-18.71403857-14.04083136c-8.25764905-2.20581036-18.16258598 1.10290518-20.91984893 0.27572631a43.23246916 43.23246916 0 0 0-15.95677563-9.04240854c-9.63628053-1.93008406-17.06675071 3.02591934-21.20971503 2.75726297s-12.1107473-8.26471897-23.3943157-7.98899267a26.75959047 26.75959047 0 0 0-17.0596808 7.71326636 61.23951723 61.23951723 0 0 0-20.64412263-5.78318229 30.83185577 30.83185577 0 0 0-20.09267005 9.08482794c-1.65435778 0.5514526-7.43047017-0.82717888-17.34247701 0s-12.1107473 7.43754007-15.13666664 8.53337535-12.66219987 0-24.49722087 1.65435778-20.91984893 12.39354349-23.11858939 12.94499608a30.99446357 30.99446357 0 0 0-28.85228236 8.51216563c-11.83502099 13.22072237-3.57737195 26.98582743-3.02591935 30.29454298s-3.02591934 6.05890861-4.94893351 10.73918573a22.11466288 22.11466288 0 0 0 0 18.72817839c3.57737195 6.88608749 8.80910165 9.63628053 8.80910164 11.84209089a25.16179195 25.16179195 0 0 0-3.02591934 15.69518913 43.49405564 43.49405564 0 0 0 12.08953757 19.56242718c2.47446676 3.59858164-0.2757263 6.32049508 0 10.4493196a24.74466755 24.74466755 0 0 0 11.31184803 20.92691884c10.73211581 7.43754007 3.30164564 9.36055423 8.25764905 20.37546625s17.34247699 16.26078154 20.91984895 19.00390468 5.507456 13.22072237 11.5592947 20.92691885a34.64253457 34.64253457 0 0 0 20.36839634 10.4634594c5.507456 1.65435778 2.75019306 6.36291451 5.50745601 10.18773315a31.20656074 31.20656074 0 0 0 20.64412263 12.44303281c10.45638951 1.15239452 9.35348433 6.55380194 9.35348433 6.55380196s-47.79255789 23.33068654-69.81531201 64.43511429a152.79478717 152.79478717 0 0 0-16.96777204 83.71474526 24.30633343 24.30633343 0 0 1-11.26235869 15.78709791 161.47663052 161.47663052 0 0 0-62.08083592 100.58353863 141.10116427 141.10116427 0 0 0 32.19634743 114.95665552c11.31184801 11.38254708 7.77689552 19.79573404 11.09975087 34.50820638s16.51529811 35.2505464 17.97876846 40.39036734a167.76177607 167.76177607 0 0 0 12.01883853 48.07535409c12.01883853 30.47836052 55.8522496 70.5010928 75.70454288 77.83965421s32.66296116 20.19871862 54.31101032 33.36995167 53.94337524 23.54278369 58.68021162 27.2191343 27.89077527 27.53728002 56.14211572 40.01566239a264.91641077 264.91641077 0 0 0 69.28506912 16.15473295 264.88106126 264.88106126 0 0 0 69.28506914-16.15473295c28.27962006-12.47838235 51.37699974-36.34638169 56.14211573-40.01566239s37.06751199-14.04790125 58.71556113-27.2191343 34.49406656-26.02432035 54.31101032-33.36995167 63.69984417-47.36836359 75.69747298-77.83965421a167.60623817 167.60623817 0 0 0 12.01883853-48.07535409c1.47054025-5.13982094 14.68419271-25.69910474 17.98583836-40.39036734s-0.19088743-23.12565931 11.09268097-34.50820638a141.07288464 141.07288464 0 0 0 32.14685809-114.95665552z" fill=""></path><path d="M301.74809478 48.15060193c8.6040744 3.5349525 33.15078462 12.93085628 36.84127503 14.05497118l3.49253308-13.28435152c5.81853183 3.796539 26.01018054 16.39510973 29.60876221 18.38175302l6.47603299-13.43281952c5.06205199 4.77925579 22.03689393 19.01804449 24.92141518 20.89156933a70.37383452 70.37383452 0 0 0 6.29221547-14.89628986l29.79964962 31.66610454 7.77689551-13.72268562c8.42025687 11.7077627 17.12330994 22.10759298 23.8326498 33.63153814a104.92446032 104.92446032 0 0 1 17.30712748 59.02663697 46.27959823 46.27959823 0 0 1-28.30082977 39.64802731 10.35034094 10.35034094 0 0 1-8.93635994-1.87352483c-52.96772836-42.27803199-113.21745889-71.17980368-176.59208746-94.36909213a14.06911098 14.06911098 0 0 0-9.65042033-0.37470497c2.36841819 1.49881986 4.68027712 3.08954849 7.06990503 4.44697026A739.45550523 739.45550523 0 0 1 410.61049219 210.8220464a237.54880848 237.54880848 0 0 1 20.1492293 19.39274945A10.97956249 10.97956249 0 0 1 433.12813966 243.34360946a60.42647814 60.42647814 0 0 1-30.00467687 33.12250499A183.06812043 183.06812043 0 0 1 320.99237622 293.53993506l8.22936945-12.50666196-49.4893351-7.16888368 12.90964655-10.39983028-44.66765987-15.17201616 15.7941678-7.49409932L220.71991343 216.47797041l17.49801491-5.65592401-34.18299075-26.02432035a63.74933351 63.74933351 0 0 0 16.31734078-7.40219055l-29.69360108-24.59619955a183.55594387 183.55594387 0 0 1 18.82008716-6.22858631 322.14022195 322.14022195 0 0 0-28.51999682-30.54198965l22.36917946-1.03220614-15.9355659-35.55455231h43.88997033L220.01292291 63.84579106c14.09032069 1.92301417 46.44220604 5.33777829 50.50740143 5.38726763l-1.37156157-13.48937876a351.47325786 351.47325786 0 0 0 36.13428453 7.02748558 95.59925559 95.59925559 0 0 1-3.53495252-14.61349367m410.64836284 0c-8.65356373 3.5349525-33.22855357 12.93085628-36.84127503 14.05497117l-3.50667287-13.29142142c-5.81853183 3.796539-26.01018054 16.39510973-29.60169231 18.38175302l-6.53259223-13.43281952q-12.01883853 10.91593334-24.87192584 20.89156933a70.52937243 70.52937243 0 0 1-6.29221546-14.89628986l-29.79257973 31.66610454-7.77689551-13.72268562c-8.42025687 11.7077627-17.12330994 22.10759298-23.88213914 33.63153814a104.91032049 104.91032049 0 0 0-17.30712747 59.02663697 46.32908755 46.32908755 0 0 0 28.37152881 39.67630694 10.23015254 10.23015254 0 0 0 8.89394051-1.87352484c53.02428761-42.29924169 113.26694822-71.2010134 176.64157678-94.39030185a14.05497118 14.05497118 0 0 1 9.64335044-0.37470495c-2.36134827 1.49881986-4.72976645 3.08954849-7.14060407 4.44697025A739.20098865 739.20098865 0 0 0 603.51992042 210.8220464a237.54880848 237.54880848 0 0 0-20.14215941 19.39274945 10.97956249 10.97956249 0 0 0-2.36841817 13.12881361 60.40526845 60.40526845 0 0 0 30.0329565 33.11543509 183.49231473 183.49231473 0 0 0 82.05331759 17.08089051l-8.17988011-12.50666196 49.48933511-7.16888368-12.9591359-10.39983028 44.6888696-15.12959673-15.79416781-7.49409932L793.38221956 216.47797041l-17.4980149-5.65592401 34.23954997-26.04553007a65.20573393 65.20573393 0 0 1-16.3597602-7.40219055l29.69360107-24.59619954a183.48524482 183.48524482 0 0 0-18.82715707-6.22858633 331.47956649 331.47956649 0 0 1 28.56948617-30.54198965l-22.36917947-1.03220613 15.88607657-35.55455232h-43.83341109l11.25528878-15.59621046c-14.13981003 1.92301417-46.44220604 5.33777829-50.50740141 5.38726762l1.32207223-13.48937876a357.88566171 357.88566171 0 0 1-36.05651556 7.02748558 95.57804589 95.57804589 0 0 0 3.5349525-14.61349366" fill="#7CC331"></path><path d="M393.72755903 410.02369008c47.48148208 0.16967772 86.5851267 31.94183085 92.48849739 84.30154739 6.27807566 55.33614655-30.64096833 113.03364137-83.735955 133.14045122-65.41783109 24.64568887-128.93385775-15.62449008-132.263783-83.95512204-3.04712907-63.28271978 45.67158638-122.30935675 109.42798983-132.35569177 4.65906741-0.7069905 9.37469405-0.78475946 14.08325078-1.15239452M378.78177982 804.69406757c1.04634594 37.67552381-17.03140117 56.77133727-51.3345803 51.31337061a170.38471083 170.38471083 0 0 1-17.46266539-3.60565158C243.34360946 834.45836768 200.84641043 768.72239087 213.31772287 703.07125292c4.84995485-25.69910474 23.33068654-38.00073946 50.00543816-32.8184991a123.51831051 123.51831051 0 0 1 62.99285368 36.43122055 203.06888172 203.06888172 0 0 1 40.05808181 55.06042024 130.68719419 130.68719419 0 0 1 12.37233377 42.9920924m-163.62588163-166.61645147a72.4735963 72.4735963 0 0 1-13.31970105 19.79573405c-6.94971664 7.53651875-12.72582902 6.84366804-19.79573405-0.70699051a115.74141498 115.74141498 0 0 1 8.63942393-166.77198937 121.07919327 121.07919327 0 0 1 13.249002-10.10996417c13.43281952-8.78082203 23.33068654-7.16888368 25.69203481 8.78082202 9.94735635 66.8459519-0.38177487 116.13025975-14.46502564 148.99824818m9.70697956-210.0963673c0.62215164-76.142877 75.64798365-134.61806137 152.20091515-118.67542557 10.18066322 2.1209715 12.01883853 4.24194301 5.89630079 12.72582902a209.44593603 209.44593603 0 0 1-30.64096833 35.59697176c-24.21442467 21.26627429-49.43277586 41.47206281-75.16723011 60.97793074a188.76646387 188.76646387 0 0 1-35.96460681 19.60484659c-14.03376145 6.36291451-16.36683011 4.53180912-16.22543201-10.26550207m385.45829129-76.74381892c0 32.08322896-66.8459519 50.76191799-103.22061322 50.76191799S403.83045328 383.32772875 403.83045328 351.21622017s46.24424869-65.41783109 103.22061322-65.41783109 103.22061322 33.33460214 103.22061319 65.41783109m-212.09715042 542.79195745c0-28.38566863 72.45945648-41.14684718 108.94723628-41.14684718s108.87653721 12.76117855 108.8765372 41.14684718-51.85775328 61.6212921-108.94723625 61.6212921-108.94723628-33.19320404-108.94723628-61.57887266m222.99187405-173.73584582c0 56.26937401-56.23402447 101.84905163-114.03756788 101.84905162s-114.03756788-45.57967763-114.03756787-101.84905162 56.28351381-101.8066322 114.03756787-101.8066322 114.08705722 45.58674753 114.08705722 101.84198173m-0.62215165-310.32641069c-47.53097141 0.18381754-86.59219662 31.94183085-92.53798672 84.3227571-6.23565622 55.33614655 30.64096833 113.03364137 83.77837442 133.14045122 65.41783109 24.64568887 128.93385775-15.62449008 132.26378299-83.95512204 3.04712907-63.28271978-45.67158638-122.30935675-109.42091989-132.35569176-4.66613731-0.7069905-9.37469405-0.78475946-14.0832508-1.15239452m14.88921996 394.66330759c-0.99685661 37.67552381 17.08089052 56.77133727 51.38406964 51.3133706a170.33522149 170.33522149 0 0 0 17.46266539-3.60565157c66.60557514-17.93634902 109.13812371-83.67232583 96.67388117-149.32346378-4.89944418-25.69910474-23.40845551-38.00073946-50.0549275-32.8184991a123.18602496 123.18602496 0 0 0-62.92215463 36.43122055 203.21027981 203.21027981 0 0 0-40.05808181 55.06042024 129.85294539 129.85294539 0 0 0-12.41475321 42.9920924m163.55518259-166.61645147a74.29763179 74.29763179 0 0 0 13.36919039 19.79573405c6.94971664 7.53651875 12.72582902 6.84366804 19.79573405-0.70699051a115.74141498 115.74141498 0 0 0-8.63942394-166.77198937 121.17110204 121.17110204 0 0 0-13.24900199-10.10996417c-13.43281952-8.78082203-23.33068654-7.16888368-25.69203483 8.78082202-9.98977578 66.8459519 0.38177487 116.13025975 14.46502567 148.99824818m-9.75646893-210.11050712c-0.52317298-76.09338767-75.64798365-134.61806137-152.10193647-118.62593623-10.18066322 2.1209715-12.01883853 4.24194301-5.89630077 12.72582904a211.47499877 211.47499877 0 0 0 30.591479 35.59697174c24.26391401 21.26627429 49.48933509 41.46499291 75.1743 60.97793074a190.18044487 190.18044487 0 0 0 35.96460681 19.60484661c14.08325079 6.36291451 16.36683011 4.53180912 16.26078153-10.26550208" fill="#DA0039"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/rocky-linux.svg b/crates/nyaterm-app/assets/color/os/rocky-linux.svg
new file mode 100644
index 00000000..b8569dfb
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/rocky-linux.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M996.191734 680.847793c18.470529-52.862604 28.512759-109.683178 28.512759-168.847793C1024.704493 229.22926 795.308716 0 512.345842 0S0 229.22926 0 512c0 139.912339 56.167317 266.721105 147.187831 359.137796l519.710998-519.365155 128.307415 128.230561z m-93.582307 162.917243L666.898829 608.220955 297.795657 977.080757c65.261683 30.11388 137.939758 46.919243 214.550185 46.919243 156.320624 0 296.284199-69.949765 390.263585-180.234964z" fill="#10B981"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/tencentos.svg b/crates/nyaterm-app/assets/color/os/tencentos.svg
new file mode 100644
index 00000000..3677bedb
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/tencentos.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M998.4 102.4H179.2L25.6 921.6h819.2l153.6-819.2zM382.4 793.6l67.2-358.4H307.2L256 345.6h210.4l24-128 290.4 217.6h-216l-48 256h161.6l89.6 102.4H382.4z" fill="#3B82F6"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/ubuntu.svg b/crates/nyaterm-app/assets/color/os/ubuntu.svg
new file mode 100644
index 00000000..4875ee3f
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/ubuntu.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#DD4814"></path><path d="M251.716267 512c0 36.932267-29.5936 66.833067-66.116267 66.833067S119.466667 548.9152 119.466667 512c0-36.9152 29.610667-66.833067 66.133333-66.833067 36.5056 0 66.116267 29.917867 66.116267 66.833067zM627.882667 836.983467a65.7408 65.7408 0 0 0 90.333866 24.439466c31.573333-18.432 42.4448-59.306667 24.1664-91.2896a65.706667 65.706667 0 0 0-90.282666-24.439466c-31.624533 18.466133-42.461867 59.323733-24.2176 91.2896z m114.517333-583.133867c18.261333-31.9488 7.441067-72.823467-24.183467-91.2896a65.757867 65.757867 0 0 0-90.333866 24.456533c-18.261333 31.965867-7.406933 72.8576 24.200533 91.306667a65.6896 65.6896 0 0 0 90.299733-24.4736z m-223.7952 67.549867c98.542933 0 179.370667 76.356267 187.835733 173.704533L802.133333 493.602133a287.607467 287.607467 0 0 0-83.4048-185.429333c-25.361067 9.898667-54.7328 8.533333-80.0768-6.263467a93.917867 93.917867 0 0 1-45.431466-67.037866 281.770667 281.770667 0 0 0-74.581334-10.001067c-45.226667 0-88.0128 10.683733-126.0032 29.730133l46.557867 84.514134a186.026667 186.026667 0 0 1 79.428267-17.7152zM330.069333 512c0-64.494933 31.6928-121.480533 80.1792-155.989333l-49.134933-82.9952a287.505067 287.505067 0 0 0-117.1968 165.717333A94.242133 94.242133 0 0 1 278.6304 512a94.242133 94.242133 0 0 1-34.7136 73.2672 287.573333 287.573333 0 0 0 117.1968 165.717333l49.134933-82.9952A190.976 190.976 0 0 1 330.069333 512zM518.621867 702.634667a186.368 186.368 0 0 1-79.428267-17.698134l-46.557867 84.514134a280.405333 280.405333 0 0 0 125.986134 29.713066 281.258667 281.258667 0 0 0 74.5984-10.001066 93.9008 93.9008 0 0 1 45.431466-67.037867 91.989333 91.989333 0 0 1 80.0768-6.263467A287.744 287.744 0 0 0 802.133333 530.414933l-95.675733-1.536c-8.448 97.3824-89.2928 173.738667-187.835733 173.738667z" fill="#FFFFFF"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/uos.svg b/crates/nyaterm-app/assets/color/os/uos.svg
new file mode 100644
index 00000000..b1fdafeb
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/uos.svg
@@ -0,0 +1,53 @@
+<svg width="32" height="32"
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 64 64"
+  role="img"
+  aria-label="UOS"
+><defs><linearGradient id="uos-bg" x1="8" y1="6" x2="56" y2="58"><stop offset="0%" stop-color="#3B8CFF" /><stop offset="100%" stop-color="#1357D8" /></linearGradient><linearGradient id="uos-line" x1="16" y1="0" x2="48" y2="0"><stop offset="0%" stop-color="#73E6FF" /><stop offset="100%" stop-color="#9BFFD1" /></linearGradient><filter
+      id="uos-shadow"
+      x="-20%"
+      y="-20%"
+      width="140%"
+      height="140%"
+    ><feDropShadow
+        dx="0"
+        dy="1.5"
+        stdDeviation="1.5"
+        flood-color="#07347F"
+        flood-opacity="0.28"
+      /></filter></defs><rect
+    x="4"
+    y="4"
+    width="56"
+    height="56"
+    rx="14"
+    fill="url(#uos-bg)"
+  /><rect
+    x="7"
+    y="7"
+    width="50"
+    height="50"
+    rx="11"
+    fill="none"
+    stroke="#FFFFFF"
+    stroke-opacity="0.16"
+    stroke-width="1"
+  /><g filter="url(#uos-shadow)"><text
+      x="32"
+      y="39.5"
+      text-anchor="middle"
+      font-family="Arial, Helvetica, sans-serif"
+      font-size="23"
+      font-weight="800"
+      letter-spacing="0.8"
+      fill="#FFFFFF"
+    >
+      UOS
+    </text></g><rect
+    x="16"
+    y="45.5"
+    width="32"
+    height="3.2"
+    rx="1.6"
+    fill="url(#uos-line)"
+  /></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/color/os/windows.svg b/crates/nyaterm-app/assets/color/os/windows.svg
new file mode 100644
index 00000000..9199d0a0
--- /dev/null
+++ b/crates/nyaterm-app/assets/color/os/windows.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M0 139.392L409.429333 81.92l0.170667 407.210667-409.216 2.389333L0 139.392z m409.301333 395.818667L409.6 942.08 0 884.181333V532.48l409.301333 2.730667z m41.258667-454.186667L1024 0v487.125333l-573.44 4.394667V81.024zM1024 533.333333L1023.872 1024l-572.501333-79.274667-0.810667-412.245333 573.44 0.896z" fill="#0078D7"></path></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/ai.svg b/crates/nyaterm-app/assets/icons/ai.svg
index 7df01597..b7d5cd1a 100644
--- a/crates/nyaterm-app/assets/icons/ai.svg
+++ b/crates/nyaterm-app/assets/icons/ai.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M12 3.5 13.6 8 18 9.6 13.6 11.2 12 15.5 10.4 11.2 6 9.6 10.4 8 12 3.5Z"/><path d="M18.5 14.5 19.4 17l2.1.8-2.1.8-.9 2.4-.9-2.4-2.1-.8 2.1-.8.9-2.5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="m19 9 1.25-2.75L23 5l-2.75-1.25L19 1l-1.25 2.75L15 5l2.75 1.25L19 9zm-7.5.5L9 4 6.5 9.5 1 12l5.5 2.5L9 20l2.5-5.5L17 12l-5.5-2.5zM19 15l-1.25 2.75L15 19l2.75 1.25L19 23l1.25-2.75L23 19l-2.75-1.25L19 15z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/ai/exec-auto.svg b/crates/nyaterm-app/assets/icons/ai/exec-auto.svg
index 423f03f2..05fbc02c 100644
--- a/crates/nyaterm-app/assets/icons/ai/exec-auto.svg
+++ b/crates/nyaterm-app/assets/icons/ai/exec-auto.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M1 21h22L12 2 1 21Zm12-3h-2v-2h2v2Zm0-4h-2v-4h2v4Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 5.99 19.53 19H4.47L12 5.99M12 2 1 21h22L12 2z"/><path d="M13 16h-2v2h2zm0-6h-2v5h2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/ai/exec-confirm.svg b/crates/nyaterm-app/assets/icons/ai/exec-confirm.svg
index 215fe171..8a87c75c 100644
--- a/crates/nyaterm-app/assets/icons/ai/exec-confirm.svg
+++ b/crates/nyaterm-app/assets/icons/ai/exec-confirm.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 6h16v2H4V6Zm0 5h16v2H4v-2Zm0 5h10v2H4v-2Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16.54 11 13 7.46l1.41-1.41 2.12 2.12 4.24-4.24 1.41 1.41L16.54 11zM11 7H2v2h9V7zm10 6.41L19.59 12 17 14.59 14.41 12 13 13.41 15.59 16 13 18.59 14.41 20 17 17.41 19.59 20 21 18.59 18.41 16 21 13.41zM11 15H2v2h9v-2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/ai/exec-smart.svg b/crates/nyaterm-app/assets/icons/ai/exec-smart.svg
index f7bcb4ec..f8510015 100644
--- a/crates/nyaterm-app/assets/icons/ai/exec-smart.svg
+++ b/crates/nyaterm-app/assets/icons/ai/exec-smart.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 2a7 7 0 0 0-4 12.7V17h8v-2.3A7 7 0 0 0 12 2Zm-2 17h4v2h-4v-2Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19.03 3.56c-1.67-1.39-3.74-2.3-6.03-2.51v2.01c1.73.19 3.31.88 4.61 1.92l1.42-1.42zM11 3.06V1.05c-2.29.2-4.36 1.12-6.03 2.51l1.42 1.42A8.928 8.928 0 0 1 11 3.06zM4.98 6.39 3.56 4.97C2.17 6.64 1.26 8.71 1.05 11h2.01c.19-1.73.88-3.31 1.92-4.61zM20.94 11h2.01c-.21-2.29-1.12-4.36-2.51-6.03l-1.42 1.42A8.928 8.928 0 0 1 20.94 11zM7 12l3.44 1.56L12 17l1.56-3.44L17 12l-3.44-1.56L12 7l-1.56 3.44z"/><path d="M12 21a8.96 8.96 0 0 1-7.46-4H7v-2H1v6h2v-2.7c1.99 2.84 5.27 4.7 9 4.7 4.87 0 9-3.17 10.44-7.56l-1.96-.45C19.25 18.48 15.92 21 12 21z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/ai/history.svg b/crates/nyaterm-app/assets/icons/ai/history.svg
index 31af58cb..f8f018c8 100644
--- a/crates/nyaterm-app/assets/icons/ai/history.svg
+++ b/crates/nyaterm-app/assets/icons/ai/history.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 4a8 8 0 1 1-5.3 14l1.3-1.5A6 6 0 1 0 12 6v2.5L8 5l4-3.5V4Zm-1 4h2v4.2l3 1.8-.9 1.5L11 13V8Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13 3a9 9 0 0 0-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42A8.954 8.954 0 0 0 13 21a9 9 0 0 0 0-18zm-1 5v5l4.28 2.54.72-1.21-3.5-2.08V8H12z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/ai/new.svg b/crates/nyaterm-app/assets/icons/ai/new.svg
index 09320265..58f73e96 100644
--- a/crates/nyaterm-app/assets/icons/ai/new.svg
+++ b/crates/nyaterm-app/assets/icons/ai/new.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M11 5h2v6h6v2h-6v6h-2v-6H5v-2h6V5Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/ai/search.svg b/crates/nyaterm-app/assets/icons/ai/search.svg
index 79c57799..cd9fd53c 100644
--- a/crates/nyaterm-app/assets/icons/ai/search.svg
+++ b/crates/nyaterm-app/assets/icons/ai/search.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M10 4a6 6 0 1 1 0 12 6 6 0 0 1 0-12Zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8Zm6.3 9.9 4.4 4.4-1.4 1.4-4.4-4.4 1.4-1.4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15.5 14h-.79l-.28-.27A6.471 6.471 0 0 0 16 9.5 6.5 6.5 0 1 0 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/ai/send.svg b/crates/nyaterm-app/assets/icons/ai/send.svg
index 87daad06..b6786781 100644
--- a/crates/nyaterm-app/assets/icons/ai/send.svg
+++ b/crates/nyaterm-app/assets/icons/ai/send.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M3.4 11.2 20 4l-3.8 16.2-4.7-5.4-4.3 2.3.9-5.1L3.4 11.2Zm4.8.4-.4 2.3 1.9-1 4.7-5.4-6.2 4.1Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M2.01 21 23 12 2.01 3 2 10l15 2-15 2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/ai/settings.svg b/crates/nyaterm-app/assets/icons/ai/settings.svg
index bc4c7907..b36758ca 100644
--- a/crates/nyaterm-app/assets/icons/ai/settings.svg
+++ b/crates/nyaterm-app/assets/icons/ai/settings.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M19.1 12.9a7.3 7.3 0 0 0 .1-.9 7.3 7.3 0 0 0-.1-.9l2-1.5-1.9-3.3-2.3.9a7.4 7.4 0 0 0-1.6-.9L14.8 2h-3.6l-.5 2.3c-.6.2-1.1.5-1.6.9l-2.3-.9L5 9.6l2 1.5a7.3 7.3 0 0 0-.1.9c0 .3 0 .6.1.9L5 14.4 6.9 17.7l2.3-.9c.5.4 1 .7 1.6.9l.5 2.3h3.6l.5-2.3c.6-.2 1.1-.5 1.6-.9l2.3.9 1.9-3.3-2-1.5ZM12 15.5A3.5 3.5 0 1 1 12 8.5a3.5 3.5 0 0 1 0 7Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19.43 12.98c.04-.32.07-.64.07-.98 0-.34-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46a.5.5 0 0 0-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65A.488.488 0 0 0 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1a.566.566 0 0 0-.18-.03c-.17 0-.34.09-.43.25l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98 0 .33.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46a.5.5 0 0 0 .61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.06.02.12.03.18.03.17 0 .34-.09.43-.25l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zm-1.98-1.71c.04.31.05.52.05.73 0 .21-.02.43-.05.73l-.14 1.13.89.7 1.08.84-.7 1.21-1.27-.51-1.04-.42-.9.68c-.43.32-.84.56-1.25.73l-1.06.43-.16 1.13-.2 1.35h-1.4l-.19-1.35-.16-1.13-1.06-.43c-.43-.18-.83-.41-1.23-.71l-.91-.7-1.06.43-1.27.51-.7-1.21 1.08-.84.89-.7-.14-1.13c-.03-.31-.05-.54-.05-.74s.02-.43.05-.73l.14-1.13-.89-.7-1.08-.84.7-1.21 1.27.51 1.04.42.9-.68c.43-.32.84-.56 1.25-.73l1.06-.43.16-1.13.2-1.35h1.39l.19 1.35.16 1.13 1.06.43c.43.18.83.41 1.23.71l.91.7 1.06-.43 1.27-.51.7 1.21-1.07.85-.89.7.14 1.13zM12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/ai/stop.svg b/crates/nyaterm-app/assets/icons/ai/stop.svg
index e41cba83..48d3f2d7 100644
--- a/crates/nyaterm-app/assets/icons/ai/stop.svg
+++ b/crates/nyaterm-app/assets/icons/ai/stop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M7 7h10v10H7V7Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 6h12v12H6z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/arrow-down.svg b/crates/nyaterm-app/assets/icons/arrow-down.svg
new file mode 100644
index 00000000..b6f2de90
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/arrow-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="m20 12-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/auth.svg b/crates/nyaterm-app/assets/icons/auth.svg
index 3a130f71..f1868021 100644
--- a/crates/nyaterm-app/assets/icons/auth.svg
+++ b/crates/nyaterm-app/assets/icons/auth.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="4.5" y="10" width="15" height="11" rx="2"/><path d="M8 10V7a4 4 0 0 1 8 0v3"/><path d="M12 14.5v3"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12.65 10A5.99 5.99 0 0 0 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6a5.99 5.99 0 0 0 5.65-4H17v4h4v-4h2v-4H12.65zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/apple.svg b/crates/nyaterm-app/assets/icons/brand/apple.svg
new file mode 100644
index 00000000..de4b0d17
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/apple.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Apple</title><path d="M12.152 6.896c-.948 0-2.415-1.078-3.96-1.04-2.04.027-3.91 1.183-4.961 3.014-2.117 3.675-.546 9.103 1.519 12.09 1.013 1.454 2.208 3.09 3.792 3.039 1.52-.065 2.09-.987 3.935-.987 1.831 0 2.35.987 3.96.948 1.637-.026 2.676-1.48 3.676-2.948 1.156-1.688 1.636-3.325 1.662-3.415-.039-.013-3.182-1.221-3.22-4.857-.026-3.04 2.48-4.494 2.597-4.559-1.429-2.09-3.623-2.324-4.39-2.376-2-.156-3.675 1.09-4.61 1.09zM15.53 3.83c.843-1.012 1.4-2.427 1.245-3.83-1.207.052-2.662.805-3.532 1.818-.78.896-1.454 2.338-1.273 3.714 1.338.104 2.715-.688 3.559-1.701"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/aws.svg b/crates/nyaterm-app/assets/icons/brand/aws.svg
new file mode 100644
index 00000000..e7483bad
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/aws.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><!--! Font Awesome Free 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2026 Fonticons, Inc. --><path fill="currentColor" d="M180.4 203c-.7 22.6 10.6 32.7 10.9 39-.1 1.3-.6 2.5-1.3 3.6s-1.7 2-2.8 2.6l-12.8 9c-1.7 1.2-3.6 1.8-5.6 1.9-.4 0-8.2 1.8-20.5-25.6-7.5 9.4-17 16.9-27.9 22s-22.7 7.7-34.7 7.5c-16.3 .9-60.4-9.2-58.1-56.2-1.6-38.3 34.1-62.1 70.9-60 7.1 0 21.6 .4 47 6.3l0-15.6c2.7-26.5-14.7-47-44.8-43.9-2.4 0-19.4-.5-45.8 10.1-7.4 3.4-8.3 2.8-10.8 2.8-7.4 0-4.4-21.5-2.9-24.2 5.2-6.4 35.9-18.4 65.9-18.2 20.1-1.8 40.1 4.4 55.7 17.3 6.3 7.1 11.2 15.4 14.2 24.4s4.2 18.5 3.5 28l0 69.3zM94 235.4c32.4-.5 46.2-20 49.3-30.5 2.5-10.1 2.1-16.4 2.1-27.4-9.7-2.3-23.6-4.9-39.6-4.9-15.2-1.1-42.8 5.6-41.7 32.3-1.2 16.8 11.1 31.4 30 30.5zm170.9 23.1c-7.9 .7-11.5-4.9-12.7-10.4L202.4 83.4c-1-2.8-1.6-5.6-1.9-8.6-.2-1.2 .1-2.4 .8-3.4s1.8-1.6 3-1.8c.2 0-2.1 0 22.2 0 8.8-.9 11.6 6 12.6 10.4L274.9 220.8 308.1 80c.5-3.2 2.9-11.1 12.8-10.2l17.2 0c2.2-.2 11.1-.5 12.7 10.4L384.1 222.7 421 80.1c.5-2.2 2.7-11.4 12.7-10.4l19.7 0c.9-.1 6.2-.8 5.3 8.6-.4 1.8 3.4-10.7-52.8 169.9-1.1 5.5-4.8 11.1-12.7 10.4l-18.7 0c-10.9 1.2-12.5-9.7-12.7-10.7l-33.2-137.1-32.8 137c-.2 1.1-1.7 11.9-12.7 10.7l-18.3 0 0 0zm273.5 5.6c-5.9 0-33.9-.3-57.4-12.3-2.3-1-4.3-2.6-5.7-4.8s-2.1-4.6-2.1-7.1l0-10.7c0-8.5 6.2-6.9 8.8-5.9 10 4.1 16.5 7.1 28.8 9.6 36.7 7.5 52.8-2.3 56.7-4.5 13.2-7.8 14.2-25.7 5.3-34.9-10.5-8.8-15.5-9.1-53.1-21-4.6-1.3-43.7-13.6-43.8-52.4-.6-28.2 25-56.2 69.5-56 12.7 0 46.4 4.1 55.6 15.6 1.4 2.1 2 4.6 1.9 7l0 10.1c0 4.4-1.6 6.7-4.9 6.7-7.7-.9-21.4-11.2-49.2-10.8-6.9-.4-39.9 .9-38.4 25-.4 19 26.6 26.1 29.7 26.9 36.5 11 48.6 12.8 63.1 29.6 17.1 22.2 7.9 48.3 4.3 55.4-19.1 37.5-68.4 34.4-69.3 34.4zm40.2 104.9c-70 51.7-171.7 79.2-258.5 79.2-117.1 .8-230.3-42.3-317.3-120.7-6.5-5.9-.8-14 7.2-9.5 96.5 55.2 205.7 84.2 316.9 84.1 83-.4 165.1-17.3 241.6-49.5 11.8-5 21.8 7.8 10.1 16.4zm29.2-33.3c-9-11.5-59.3-5.4-81.8-2.7-6.8 .8-7.9-5.1-1.8-9.5 40.1-28.2 105.9-20.1 113.4-10.6 7.5 9.5-2.1 75.4-39.6 106.9-5.8 4.9-11.3 2.3-8.7-4.1 8.4-21.3 27.4-68.5 18.4-80z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/baidu.svg b/crates/nyaterm-app/assets/icons/brand/baidu.svg
new file mode 100644
index 00000000..d3e65969
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/baidu.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Baidu</title><path d="M9.154 0C7.71 0 6.54 1.658 6.54 3.707c0 2.051 1.171 3.71 2.615 3.71 1.446 0 2.614-1.659 2.614-3.71C11.768 1.658 10.6 0 9.154 0zm7.025.594C14.86.58 13.347 2.589 13.2 3.927c-.187 1.745.25 3.487 2.179 3.735 1.933.25 3.175-1.806 3.422-3.364.252-1.555-.995-3.364-2.362-3.674a1.218 1.218 0 0 0-.261-.03zM3.582 5.535a2.811 2.811 0 0 0-.156.008c-2.118.19-2.428 3.24-2.428 3.24-.287 1.41.686 4.425 3.297 3.864 2.617-.561 2.262-3.68 2.183-4.362-.125-1.018-1.292-2.773-2.896-2.75zm16.534 1.753c-2.308 0-2.617 2.119-2.617 3.616 0 1.43.121 3.425 2.988 3.362 2.867-.063 2.553-3.238 2.553-3.988 0-.745-.62-2.99-2.924-2.99zm-8.264 2.478c-1.424.014-2.708.925-3.323 1.947-1.118 1.868-2.863 3.05-3.112 3.363-.25.309-3.61 2.116-2.864 5.42.746 3.301 3.365 3.237 3.365 3.237s1.93.19 4.171-.31c2.24-.495 4.17.123 4.17.123s5.233 1.748 6.665-1.616c1.43-3.364-.808-5.109-.808-5.109s-2.99-2.306-4.736-4.798c-1.072-1.665-2.348-2.268-3.528-2.257zm-2.234 3.84l1.542.024v8.197H7.758c-1.47-.291-2.055-1.292-2.13-1.462-.072-.173-.488-.976-.268-2.343.635-2.049 2.447-2.196 2.447-2.196h1.81zm3.964 2.39v3.881c.096.413.612.488.612.488h1.614v-4.343h1.689v5.782h-3.915c-1.517-.39-1.59-1.465-1.59-1.465v-4.317zm-5.458 1.147c-.66.197-.978.708-1.05.928-.076.22-.247.78-.1 1.269.294 1.095 1.248 1.144 1.248 1.144h1.37v-3.34z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/bilibili.svg b/crates/nyaterm-app/assets/icons/brand/bilibili.svg
new file mode 100644
index 00000000..6c114c71
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/bilibili.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Bilibili</title><path d="M17.813 4.653h.854c1.51.054 2.769.578 3.773 1.574 1.004.995 1.524 2.249 1.56 3.76v7.36c-.036 1.51-.556 2.769-1.56 3.773s-2.262 1.524-3.773 1.56H5.333c-1.51-.036-2.769-.556-3.773-1.56S.036 18.858 0 17.347v-7.36c.036-1.511.556-2.765 1.56-3.76 1.004-.996 2.262-1.52 3.773-1.574h.774l-1.174-1.12a1.234 1.234 0 0 1-.373-.906c0-.356.124-.658.373-.907l.027-.027c.267-.249.573-.373.92-.373.347 0 .653.124.92.373L9.653 4.44c.071.071.134.142.187.213h4.267a.836.836 0 0 1 .16-.213l2.853-2.747c.267-.249.573-.373.92-.373.347 0 .662.151.929.4.267.249.391.551.391.907 0 .355-.124.657-.373.906zM5.333 7.24c-.746.018-1.373.276-1.88.773-.506.498-.769 1.13-.786 1.894v7.52c.017.764.28 1.395.786 1.893.507.498 1.134.756 1.88.773h13.334c.746-.017 1.373-.275 1.88-.773.506-.498.769-1.129.786-1.893v-7.52c-.017-.765-.28-1.396-.786-1.894-.507-.497-1.134-.755-1.88-.773zM8 11.107c.373 0 .684.124.933.373.25.249.383.569.4.96v1.173c-.017.391-.15.711-.4.96-.249.25-.56.374-.933.374s-.684-.125-.933-.374c-.25-.249-.383-.569-.4-.96V12.44c0-.373.129-.689.386-.947.258-.257.574-.386.947-.386zm8 0c.373 0 .684.124.933.373.25.249.383.569.4.96v1.173c-.017.391-.15.711-.4.96-.249.25-.56.374-.933.374s-.684-.125-.933-.374c-.25-.249-.383-.569-.4-.96V12.44c.017-.391.15-.711.4-.96.249-.249.56-.373.933-.373Z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/bing.svg b/crates/nyaterm-app/assets/icons/brand/bing.svg
new file mode 100644
index 00000000..b455b9e4
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/bing.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2026 Fonticons, Inc. --><path fill="currentColor" d="M0 32l214.6 0 0 214.6-214.6 0 0-214.6zm233.4 0l214.6 0 0 214.6-214.6 0 0-214.6zM0 265.4l214.6 0 0 214.6-214.6 0 0-214.6zm233.4 0l214.6 0 0 214.6-214.6 0 0-214.6z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/centos.svg b/crates/nyaterm-app/assets/icons/brand/centos.svg
new file mode 100644
index 00000000..3f16a9e0
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/centos.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>CentOS</title><path d="M12.076.066L8.883 3.28H3.348v5.434L0 12.01l3.349 3.298v5.39h5.374l3.285 3.236 3.285-3.236h5.43v-5.374L24 12.026l-3.232-3.252V3.321H15.31zm0 .749l2.49 2.506h-1.69v6.441l-.8.805-.81-.815V3.28H9.627zm-8.2 2.991h4.483L6.485 5.692l4.253 4.279v.654H9.94L5.674 6.423l-1.798 1.77zm5.227 0h1.635v5.415l-3.509-3.53zm4.302.043h1.687l1.83 1.842-3.517 3.539zm2.431 0h4.404v4.394l-1.83-1.842-4.241 4.267h-.764v-.69l4.261-4.287zm2.574 3.3l1.83 1.843v1.676h-5.327zm-12.735.013l3.515 3.462H3.876v-1.69zM3.348 9.454v1.697h6.377l.871.858-.782.77H3.35v1.786L.753 12.01zm17.42.068l2.488 2.503-2.533 2.55v-1.796h-6.41l-.75-.754.825-.83h6.38zm-9.502.978l.81.815.186-.188.614-.618v.686h.768l-.825.83.75.754h-.719v.808l-.842-.83-.741.73v-.707h-.7l.781-.77-.188-.186-.682-.672h.788zm-7.39 2.807h5.402l-3.603 3.55-1.798-1.772zm6.154 0h.708v.7l-4.404 4.338 1.852 1.824h-4.31v-4.342l1.798 1.77zm3.348 0h.715l4.317 4.343.186-.187 1.599-1.61v4.316h-4.366l1.853-1.825-.188-.185-4.116-4.054zm1.46 0h5.357v1.798l-1.785 1.796zm-2.83.191l.842.829v6.37h1.691l-2.532 2.495-2.533-2.495h1.79V14.23zm-1.27 1.251v5.42H8.939l-1.852-1.823zm2.64.097l3.552 3.499-1.853 1.825h-1.7z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/claude.svg b/crates/nyaterm-app/assets/icons/brand/claude.svg
new file mode 100644
index 00000000..1beee861
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/claude.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Claude</title><path d="m4.7144 15.9555 4.7174-2.6471.079-.2307-.079-.1275h-.2307l-.7893-.0486-2.6956-.0729-2.3375-.0971-2.2646-.1214-.5707-.1215-.5343-.7042.0546-.3522.4797-.3218.686.0608 1.5179.1032 2.2767.1578 1.6514.0972 2.4468.255h.3886l.0546-.1579-.1336-.0971-.1032-.0972L6.973 9.8356l-2.55-1.6879-1.3356-.9714-.7225-.4918-.3643-.4614-.1578-1.0078.6557-.7225.8803.0607.2246.0607.8925.686 1.9064 1.4754 2.4893 1.8336.3643.3035.1457-.1032.0182-.0728-.164-.2733-1.3539-2.4467-1.445-2.4893-.6435-1.032-.17-.6194c-.0607-.255-.1032-.4674-.1032-.7285L6.287.1335 6.6997 0l.9957.1336.419.3642.6192 1.4147 1.0018 2.2282 1.5543 3.0296.4553.8985.2429.8318.091.255h.1579v-.1457l.1275-1.706.2368-2.0947.2307-2.6957.0789-.7589.3764-.9107.7468-.4918.5828.2793.4797.686-.0668.4433-.2853 1.8517-.5586 2.9021-.3643 1.9429h.2125l.2429-.2429.9835-1.3053 1.6514-2.0643.7286-.8196.85-.9046.5464-.4311h1.0321l.759 1.1293-.34 1.1657-1.0625 1.3478-.8804 1.1414-1.2628 1.7-.7893 1.36.0729.1093.1882-.0183 2.8535-.607 1.5421-.2794 1.8396-.3157.8318.3886.091.3946-.3278.8075-1.967.4857-2.3072.4614-3.4364.8136-.0425.0304.0486.0607 1.5482.1457.6618.0364h1.621l3.0175.2247.7892.522.4736.6376-.079.4857-1.2142.6193-1.6393-.3886-3.825-.9107-1.3113-.3279h-.1822v.1093l1.0929 1.0686 2.0035 1.8092 2.5075 2.3314.1275.5768-.3218.4554-.34-.0486-2.2039-1.6575-.85-.7468-1.9246-1.621h-.1275v.17l.4432.6496 2.3436 3.5214.1214 1.0807-.17.3521-.6071.2125-.6679-.1214-1.3721-1.9246L14.38 17.959l-1.1414-1.9428-.1397.079-.674 7.2552-.3156.3703-.7286.2793-.6071-.4614-.3218-.7468.3218-1.4753.3886-1.9246.3157-1.53.2853-1.9004.17-.6314-.0121-.0425-.1397.0182-1.4328 1.9672-2.1796 2.9446-1.7243 1.8456-.4128.164-.7164-.3704.0667-.6618.4008-.5889 2.386-3.0357 1.4389-1.882.929-1.0868-.0062-.1579h-.0546l-6.3385 4.1164-1.1293.1457-.4857-.4554.0608-.7467.2307-.2429 1.9064-1.3114Z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/css.svg b/crates/nyaterm-app/assets/icons/brand/css.svg
new file mode 100644
index 00000000..59bb2437
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/css.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>CSS</title><path d="M0 0v20.16A3.84 3.84 0 0 0 3.84 24h16.32A3.84 3.84 0 0 0 24 20.16V3.84A3.84 3.84 0 0 0 20.16 0Zm14.256 13.08c1.56 0 2.28 1.08 2.304 2.64h-1.608c.024-.288-.048-.6-.144-.84-.096-.192-.288-.264-.552-.264-.456 0-.696.264-.696.84-.024.576.288.888.768 1.08.72.288 1.608.744 1.92 1.296q.432.648.432 1.656c0 1.608-.912 2.592-2.496 2.592-1.656 0-2.4-1.032-2.424-2.688h1.68c0 .792.264 1.176.792 1.176.264 0 .456-.072.552-.24.192-.312.24-1.176-.048-1.512-.312-.408-.912-.6-1.32-.816q-.828-.396-1.224-.936c-.24-.36-.36-.888-.36-1.536 0-1.44.936-2.472 2.424-2.448m5.4 0c1.584 0 2.304 1.08 2.328 2.64h-1.608c0-.288-.048-.6-.168-.84-.096-.192-.264-.264-.528-.264-.48 0-.72.264-.72.84s.288.888.792 1.08c.696.288 1.608.744 1.92 1.296.264.432.408.984.408 1.656.024 1.608-.888 2.592-2.472 2.592-1.68 0-2.424-1.056-2.448-2.688h1.68c0 .744.264 1.176.792 1.176.264 0 .456-.072.552-.24.216-.312.264-1.176-.048-1.512-.288-.408-.888-.6-1.32-.816-.552-.264-.96-.576-1.2-.936s-.36-.888-.36-1.536c-.024-1.44.912-2.472 2.4-2.448m-11.031.018c.711-.006 1.419.198 1.839.63.432.432.672 1.128.648 1.992H9.336c.024-.456-.096-.792-.432-.96-.312-.144-.768-.048-.888.24-.12.264-.192.576-.168.864v3.504c0 .744.264 1.128.768 1.128a.65.65 0 0 0 .552-.264c.168-.24.192-.552.168-.84h1.776c.096 1.632-.984 2.712-2.568 2.688-1.536 0-2.496-.864-2.472-2.472v-4.032c0-.816.24-1.44.696-1.848.432-.408 1.146-.624 1.857-.63"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/debian.svg b/crates/nyaterm-app/assets/icons/brand/debian.svg
new file mode 100644
index 00000000..6e4be6a7
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/debian.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Debian</title><path d="M13.88 12.685c-.4 0 .08.2.601.28.14-.1.27-.22.39-.33a3.001 3.001 0 01-.99.05m2.14-.53c.23-.33.4-.69.47-1.06-.06.27-.2.5-.33.73-.75.47-.07-.27 0-.56-.8 1.01-.11.6-.14.89m.781-2.05c.05-.721-.14-.501-.2-.221.07.04.13.5.2.22M12.38.31c.2.04.45.07.42.12.23-.05.28-.1-.43-.12m.43.12l-.15.03.14-.01V.43m6.633 9.944c.02.64-.2.95-.38 1.5l-.35.181c-.28.54.03.35-.17.78-.44.39-1.34 1.22-1.62 1.301-.201 0 .14-.25.19-.34-.591.4-.481.6-1.371.85l-.03-.06c-2.221 1.04-5.303-1.02-5.253-3.842-.03.17-.07.13-.12.2a3.551 3.552 0 012.001-3.501 3.361 3.362 0 013.732.48 3.341 3.342 0 00-2.721-1.3c-1.18.01-2.281.76-2.651 1.57-.6.38-.67 1.47-.93 1.661-.361 2.601.66 3.722 2.38 5.042.27.19.08.21.12.35a4.702 4.702 0 01-1.53-1.16c.23.33.47.66.8.91-.55-.18-1.27-1.3-1.48-1.35.93 1.66 3.78 2.921 5.261 2.3a6.203 6.203 0 01-2.33-.28c-.33-.16-.77-.51-.7-.57a5.802 5.803 0 005.902-.84c.44-.35.93-.94 1.07-.95-.2.32.04.16-.12.44.44-.72-.2-.3.46-1.24l.24.33c-.09-.6.74-1.321.66-2.262.19-.3.2.3 0 .97.29-.74.08-.85.15-1.46.08.2.18.42.23.63-.18-.7.2-1.2.28-1.6-.09-.05-.28.3-.32-.53 0-.37.1-.2.14-.28-.08-.05-.26-.32-.38-.861.08-.13.22.33.34.34-.08-.42-.2-.75-.2-1.08-.34-.68-.12.1-.4-.3-.34-1.091.3-.25.34-.74.54.77.84 1.96.981 2.46-.1-.6-.28-1.2-.49-1.76.16.07-.26-1.241.21-.37A7.823 7.824 0 0017.702 1.6c.18.17.42.39.33.42-.75-.45-.62-.48-.73-.67-.61-.25-.65.02-1.06 0C15.082.73 14.862.8 13.8.4l.05.23c-.77-.25-.9.1-1.73 0-.05-.04.27-.14.53-.18-.741.1-.701-.14-1.431.03.17-.13.36-.21.55-.32-.6.04-1.44.35-1.18.07C9.6.68 7.847 1.3 6.867 2.22L6.838 2c-.45.54-1.96 1.611-2.08 2.311l-.131.03c-.23.4-.38.85-.57 1.261-.3.52-.45.2-.4.28-.6 1.22-.9 2.251-1.16 3.102.18.27 0 1.65.07 2.76-.3 5.463 3.84 10.776 8.363 12.006.67.23 1.65.23 2.49.25-.99-.28-1.12-.15-2.08-.49-.7-.32-.85-.7-1.34-1.13l.2.35c-.971-.34-.57-.42-1.361-.67l.21-.27c-.31-.03-.83-.53-.97-.81l-.34.01c-.41-.501-.63-.871-.61-1.161l-.111.2c-.13-.21-1.52-1.901-.8-1.511-.13-.12-.31-.2-.5-.55l.14-.17c-.35-.44-.64-1.02-.62-1.2.2.24.32.3.45.33-.88-2.172-.93-.12-1.601-2.202l.15-.02c-.1-.16-.18-.34-.26-.51l.06-.6c-.63-.74-.18-3.102-.09-4.402.07-.54.53-1.1.88-1.981l-.21-.04c.4-.71 2.341-2.872 3.241-2.761.43-.55-.09 0-.18-.14.96-.991 1.26-.7 1.901-.88.7-.401-.6.16-.27-.151 1.2-.3.85-.7 2.421-.85.16.1-.39.14-.52.26 1-.49 3.151-.37 4.562.27 1.63.77 3.461 3.011 3.531 5.132l.08.02c-.04.85.13 1.821-.17 2.711l.2-.42M9.54 13.236l-.05.28c.26.35.47.73.8 1.01-.24-.47-.42-.66-.75-1.3m.62-.02c-.14-.15-.22-.34-.31-.52.08.32.26.6.43.88l-.12-.36m10.945-2.382l-.07.15c-.1.76-.34 1.511-.69 2.212.4-.73.65-1.541.75-2.362M12.45.12c.27-.1.66-.05.95-.12-.37.03-.74.05-1.1.1l.15.02M3.006 5.142c.07.57-.43.8.11.42.3-.66-.11-.18-.1-.42m-.64 2.661c.12-.39.15-.62.2-.84-.35.44-.17.53-.2.83"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/docker.svg b/crates/nyaterm-app/assets/icons/brand/docker.svg
new file mode 100644
index 00000000..0021a8a7
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/docker.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Docker</title><path d="M13.983 11.078h2.119a.186.186 0 00.186-.185V9.006a.186.186 0 00-.186-.186h-2.119a.185.185 0 00-.185.185v1.888c0 .102.083.185.185.185m-2.954-5.43h2.118a.186.186 0 00.186-.186V3.574a.186.186 0 00-.186-.185h-2.118a.185.185 0 00-.185.185v1.888c0 .102.082.185.185.185m0 2.716h2.118a.187.187 0 00.186-.186V6.29a.186.186 0 00-.186-.185h-2.118a.185.185 0 00-.185.185v1.887c0 .102.082.185.185.186m-2.93 0h2.12a.186.186 0 00.184-.186V6.29a.185.185 0 00-.185-.185H8.1a.185.185 0 00-.185.185v1.887c0 .102.083.185.185.186m-2.964 0h2.119a.186.186 0 00.185-.186V6.29a.185.185 0 00-.185-.185H5.136a.186.186 0 00-.186.185v1.887c0 .102.084.185.186.186m5.893 2.715h2.118a.186.186 0 00.186-.185V9.006a.186.186 0 00-.186-.186h-2.118a.185.185 0 00-.185.185v1.888c0 .102.082.185.185.185m-2.93 0h2.12a.185.185 0 00.184-.185V9.006a.185.185 0 00-.184-.186h-2.12a.185.185 0 00-.184.185v1.888c0 .102.083.185.185.185m-2.964 0h2.119a.185.185 0 00.185-.185V9.006a.185.185 0 00-.184-.186h-2.12a.186.186 0 00-.186.186v1.887c0 .102.084.185.186.185m-2.92 0h2.12a.185.185 0 00.184-.185V9.006a.185.185 0 00-.184-.186h-2.12a.185.185 0 00-.184.185v1.888c0 .102.082.185.185.185M23.763 9.89c-.065-.051-.672-.51-1.954-.51-.338.001-.676.03-1.01.087-.248-1.7-1.653-2.53-1.716-2.566l-.344-.199-.226.327c-.284.438-.49.922-.612 1.43-.23.97-.09 1.882.403 2.661-.595.332-1.55.413-1.744.42H.751a.751.751 0 00-.75.748 11.376 11.376 0 00.692 4.062c.545 1.428 1.355 2.48 2.41 3.124 1.18.723 3.1 1.137 5.275 1.137.983.003 1.963-.086 2.93-.266a12.248 12.248 0 003.823-1.389c.98-.567 1.86-1.288 2.61-2.136 1.252-1.418 1.998-2.997 2.553-4.4h.221c1.372 0 2.215-.549 2.68-1.009.309-.293.55-.65.707-1.046l.098-.288Z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/duckduckgo.svg b/crates/nyaterm-app/assets/icons/brand/duckduckgo.svg
new file mode 100644
index 00000000..7b51a80e
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/duckduckgo.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>DuckDuckGo</title><path d="M12 0C5.37 0 0 5.37 0 12s5.37 12 12 12 12-5.37 12-12S18.63 0 12 0zm0 .984C18.083.984 23.016 5.916 23.016 12S18.084 23.016 12 23.016.984 18.084.984 12C.984 5.917 5.916.984 12 .984zm0 .938C6.434 1.922 1.922 6.434 1.922 12c0 4.437 2.867 8.205 6.85 9.55-.237-.82-.776-2.753-1.6-6.052-1.184-4.741-2.064-8.606 2.379-9.813.047-.011.064-.064.03-.093-.514-.467-1.382-.548-2.233-.38a.06.06 0 0 1-.07-.058c0-.011 0-.023.011-.035.205-.286.572-.507.822-.64a1.843 1.843 0 0 0-.607-.335c-.059-.022-.059-.12-.006-.144.006-.006.012-.012.024-.012 1.749-.233 3.586.292 4.49 1.448.011.011.023.017.035.023 2.968.635 3.509 4.837 3.328 5.998a9.607 9.607 0 0 0 2.346-.576c.746-.286 1.008-.222 1.101-.053.1.193-.018.513-.28.81-.496.567-1.393 1.01-2.974 1.137-.546.044-1.029.024-1.445.006-.789-.035-1.339-.059-1.633.39-.192.298-.041.998 1.487 1.22 1.09.157 2.078.047 2.798-.034.643-.07 1.073-.118 1.172.069.21.402-.996 1.207-3.066 1.224-.158 0-.315-.006-.467-.011-1.283-.065-2.227-.414-2.816-.735a.094.094 0 0 1-.035-.017c-.105-.059-.31.045-.188.267.07.134.444.478 1.004.776-.058.466.087 1.184.338 2l.088-.016c.041-.009.087-.019.134-.025.507-.082.775.012.926.175.717-.536 1.913-1.294 2.03-1.154.583.694.66 2.332.53 2.99-.004.012-.017.024-.04.035-.274.117-1.783-.296-1.783-.511-.059-1.075-.26-1.173-.493-1.225h-.156c.006.006.012.018.018.03l.052.12c.093.257.24 1.063.13 1.26-.112.199-.835.297-1.284.303-.443.006-.543-.158-.637-.408-.07-.204-.103-.675-.103-.95a.857.857 0 0 1 .012-.216c-.134.058-.333.193-.397.281-.017.262-.017.682.123 1.149.07.221-1.518 1.164-1.74.99-.227-.181-.634-1.952-.459-2.67-.187.017-.338.075-.42.191-.367.508.093 2.933.582 3.248.257.169 1.54-.553 2.176-1.095.105.145.305.158.553.158.326-.012.782-.06 1.103-.158.192.45.423.972.613 1.388 4.47-1.032 7.803-5.037 7.803-9.82 0-5.566-4.512-10.078-10.078-10.078zm1.791 5.646c-.42 0-.678.146-.795.332-.023.047.047.094.094.07.14-.075.357-.161.701-.156.328.006.516.09.67.159l.023.01c.041.017.088-.03.059-.065-.134-.18-.332-.35-.752-.35zm-5.078.198a1.24 1.24 0 0 0-.522.082c-.454.169-.67.526-.67.76 0 .051.112.057.141.011.081-.123.21-.31.617-.478.408-.17.73-.146.951-.094.047.012.083-.041.041-.07a.989.989 0 0 0-.558-.211zm5.434 1.423a.651.651 0 0 0-.655.647.652.652 0 0 0 1.307 0 .646.646 0 0 0-.652-.647zm.283.262h.008a.17.17 0 0 1 .17.17c0 .093-.077.17-.17.17a.17.17 0 0 1-.17-.17c0-.09.072-.165.162-.17zm-5.358.076a.752.752 0 0 0-.758.758c0 .42.338.758.758.758s.758-.337.758-.758a.756.756 0 0 0-.758-.758zm.328.303h.01c.112 0 .2.089.2.2 0 .11-.088.197-.2.197a.195.195 0 0 1-.197-.198c0-.107.082-.194.187-.199z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/fedora.svg b/crates/nyaterm-app/assets/icons/brand/fedora.svg
new file mode 100644
index 00000000..7f461d0e
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/fedora.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Fedora</title><path d="M12.001 0C5.376 0 .008 5.369.004 11.992H.002v9.287h.002A2.726 2.726 0 0 0 2.73 24h9.275c6.626-.004 11.993-5.372 11.993-11.997C23.998 5.375 18.628 0 12 0zm2.431 4.94c2.015 0 3.917 1.543 3.917 3.671 0 .197.001.395-.03.619a1.002 1.002 0 0 1-1.137.893 1.002 1.002 0 0 1-.842-1.175 2.61 2.61 0 0 0 .013-.337c0-1.207-.987-1.672-1.92-1.672-.934 0-1.775.784-1.777 1.672.016 1.027 0 2.046 0 3.07l1.732-.012c1.352-.028 1.368 2.009.016 1.998l-1.748.013c-.004.826.006.677.002 1.093 0 0 .015 1.01-.016 1.776-.209 2.25-2.124 4.046-4.424 4.046-2.438 0-4.448-1.993-4.448-4.437.073-2.515 2.078-4.492 4.603-4.469l1.409-.01v1.996l-1.409.013h-.007c-1.388.04-2.577.984-2.6 2.47a2.438 2.438 0 0 0 2.452 2.439c1.356 0 2.441-.987 2.441-2.437l-.001-7.557c0-.14.005-.252.02-.407.23-1.848 1.883-3.256 3.754-3.256z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/gemini.svg b/crates/nyaterm-app/assets/icons/brand/gemini.svg
new file mode 100644
index 00000000..765adb08
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/gemini.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Google Gemini</title><path d="M11.04 19.32Q12 21.51 12 24q0-2.49.93-4.68.96-2.19 2.58-3.81t3.81-2.55Q21.51 12 24 12q-2.49 0-4.68-.93a12.3 12.3 0 0 1-3.81-2.58 12.3 12.3 0 0 1-2.58-3.81Q12 2.49 12 0q0 2.49-.96 4.68-.93 2.19-2.55 3.81a12.3 12.3 0 0 1-3.81 2.58Q2.49 12 0 12q2.49 0 4.68.96 2.19.93 3.81 2.55t2.55 3.81"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/github.svg b/crates/nyaterm-app/assets/icons/brand/github.svg
new file mode 100644
index 00000000..538ec5bf
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/github.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/gitlab.svg b/crates/nyaterm-app/assets/icons/brand/gitlab.svg
new file mode 100644
index 00000000..e4a29630
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/gitlab.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitLab</title><path d="m23.6004 9.5927-.0337-.0862L20.3.9814a.851.851 0 0 0-.3362-.405.8748.8748 0 0 0-.9997.0539.8748.8748 0 0 0-.29.4399l-2.2055 6.748H7.5375l-2.2057-6.748a.8573.8573 0 0 0-.29-.4412.8748.8748 0 0 0-.9997-.0537.8585.8585 0 0 0-.3362.4049L.4332 9.5015l-.0325.0862a6.0657 6.0657 0 0 0 2.0119 7.0105l.0113.0087.03.0213 4.976 3.7264 2.462 1.8633 1.4995 1.1321a1.0085 1.0085 0 0 0 1.2197 0l1.4995-1.1321 2.4619-1.8633 5.006-3.7489.0125-.01a6.0682 6.0682 0 0 0 2.0094-7.003z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/go.svg b/crates/nyaterm-app/assets/icons/brand/go.svg
new file mode 100644
index 00000000..0cadd56b
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/go.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Go</title><path d="M1.811 10.231c-.047 0-.058-.023-.035-.059l.246-.315c.023-.035.081-.058.128-.058h4.172c.046 0 .058.035.035.07l-.199.303c-.023.036-.082.07-.117.07zM.047 11.306c-.047 0-.059-.023-.035-.058l.245-.316c.023-.035.082-.058.129-.058h5.328c.047 0 .07.035.058.07l-.093.28c-.012.047-.058.07-.105.07zm2.828 1.075c-.047 0-.059-.035-.035-.07l.163-.292c.023-.035.07-.07.117-.07h2.337c.047 0 .07.035.07.082l-.023.28c0 .047-.047.082-.082.082zm12.129-2.36c-.736.187-1.239.327-1.963.514-.176.046-.187.058-.34-.117-.174-.199-.303-.327-.548-.444-.737-.362-1.45-.257-2.115.175-.795.514-1.204 1.274-1.192 2.22.011.935.654 1.706 1.577 1.835.795.105 1.46-.175 1.987-.77.105-.13.198-.27.315-.434H10.47c-.245 0-.304-.152-.222-.35.152-.362.432-.97.596-1.274a.315.315 0 01.292-.187h4.253c-.023.316-.023.631-.07.947a4.983 4.983 0 01-.958 2.29c-.841 1.11-1.94 1.8-3.33 1.986-1.145.152-2.209-.07-3.143-.77-.865-.655-1.356-1.52-1.484-2.595-.152-1.274.222-2.419.993-3.424.83-1.086 1.928-1.776 3.272-2.02 1.098-.2 2.15-.07 3.096.571.62.41 1.063.97 1.356 1.648.07.105.023.164-.117.2m3.868 6.461c-1.064-.024-2.034-.328-2.852-1.029a3.665 3.665 0 01-1.262-2.255c-.21-1.32.152-2.489.947-3.529.853-1.122 1.881-1.706 3.272-1.95 1.192-.21 2.314-.095 3.33.595.923.63 1.496 1.484 1.648 2.605.198 1.578-.257 2.863-1.344 3.962-.771.783-1.718 1.273-2.805 1.495-.315.06-.63.07-.934.106zm2.78-4.72c-.011-.153-.011-.27-.034-.387-.21-1.157-1.274-1.81-2.384-1.554-1.087.245-1.788.935-2.045 2.033-.21.912.234 1.835 1.075 2.21.643.28 1.285.244 1.905-.07.923-.48 1.425-1.228 1.484-2.233z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/google.svg b/crates/nyaterm-app/assets/icons/brand/google.svg
new file mode 100644
index 00000000..2eaf9155
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/google.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Google</title><path d="M12.48 10.92v3.28h7.84c-.24 1.84-.853 3.187-1.787 4.133-1.147 1.147-2.933 2.4-6.053 2.4-4.827 0-8.6-3.893-8.6-8.72s3.773-8.72 8.6-8.72c2.6 0 4.507 1.027 5.907 2.347l2.307-2.307C18.747 1.44 16.133 0 12.48 0 5.867 0 .307 5.387.307 12s5.56 12 12.173 12c3.573 0 6.267-1.173 8.373-3.36 2.16-2.16 2.84-5.213 2.84-7.667 0-.76-.053-1.467-.173-2.053H12.48z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/googlecloud.svg b/crates/nyaterm-app/assets/icons/brand/googlecloud.svg
new file mode 100644
index 00000000..b7b4dcc0
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/googlecloud.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Google Cloud</title><path d="M12.19 2.38a9.344 9.344 0 0 0-9.234 6.893c.053-.02-.055.013 0 0-3.875 2.551-3.922 8.11-.247 10.941l.006-.007-.007.03a6.717 6.717 0 0 0 4.077 1.356h5.173l.03.03h5.192c6.687.053 9.376-8.605 3.835-12.35a9.365 9.365 0 0 0-2.821-4.552l-.043.043.006-.05A9.344 9.344 0 0 0 12.19 2.38zm-.358 4.146c1.244-.04 2.518.368 3.486 1.15a5.186 5.186 0 0 1 1.862 4.078v.518c3.53-.07 3.53 5.262 0 5.193h-5.193l-.008.009v-.04H6.785a2.59 2.59 0 0 1-1.067-.23h.001a2.597 2.597 0 1 1 3.437-3.437l3.013-3.012A6.747 6.747 0 0 0 8.11 8.24c.018-.01.04-.026.054-.023a5.186 5.186 0 0 1 3.67-1.69z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/html5.svg b/crates/nyaterm-app/assets/icons/brand/html5.svg
new file mode 100644
index 00000000..e8b1e371
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/html5.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>HTML5</title><path d="M1.5 0h21l-1.91 21.563L11.977 24l-8.564-2.438L1.5 0zm7.031 9.75l-.232-2.718 10.059.003.23-2.622L5.412 4.41l.698 8.01h9.126l-.326 3.426-2.91.804-2.955-.81-.188-2.11H6.248l.33 4.171L12 19.351l5.379-1.443.744-8.157H8.531z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/javascript.svg b/crates/nyaterm-app/assets/icons/brand/javascript.svg
new file mode 100644
index 00000000..91e51623
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/javascript.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>JavaScript</title><path d="M0 0h24v24H0V0zm22.034 18.276c-.175-1.095-.888-2.015-3.003-2.873-.736-.345-1.554-.585-1.797-1.14-.091-.33-.105-.51-.046-.705.15-.646.915-.84 1.515-.66.39.12.75.42.976.9 1.034-.676 1.034-.676 1.755-1.125-.27-.42-.404-.601-.586-.78-.63-.705-1.469-1.065-2.834-1.034l-.705.089c-.676.165-1.32.525-1.71 1.005-1.14 1.291-.811 3.541.569 4.471 1.365 1.02 3.361 1.244 3.616 2.205.24 1.17-.87 1.545-1.966 1.41-.811-.18-1.26-.586-1.755-1.336l-1.83 1.051c.21.48.45.689.81 1.109 1.74 1.756 6.09 1.666 6.871-1.004.029-.09.24-.705.074-1.65l.046.067zm-8.983-7.245h-2.248c0 1.938-.009 3.864-.009 5.805 0 1.232.063 2.363-.138 2.711-.33.689-1.18.601-1.566.48-.396-.196-.597-.466-.83-.855-.063-.105-.11-.196-.127-.196l-1.825 1.125c.305.63.75 1.172 1.324 1.517.855.51 2.004.675 3.207.405.783-.226 1.458-.691 1.811-1.411.51-.93.402-2.07.397-3.346.012-2.054 0-4.109 0-6.179l.004-.056z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/kubernetes.svg b/crates/nyaterm-app/assets/icons/brand/kubernetes.svg
new file mode 100644
index 00000000..667f2d47
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/kubernetes.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Kubernetes</title><path d="M10.204 14.35l.007.01-.999 2.413a5.171 5.171 0 0 1-2.075-2.597l2.578-.437.004.005a.44.44 0 0 1 .484.606zm-.833-2.129a.44.44 0 0 0 .173-.756l.002-.011L7.585 9.7a5.143 5.143 0 0 0-.73 3.255l2.514-.725.002-.009zm1.145-1.98a.44.44 0 0 0 .699-.337l.01-.005.15-2.62a5.144 5.144 0 0 0-3.01 1.442l2.147 1.523.004-.002zm.76 2.75l.723.349.722-.347.18-.78-.5-.623h-.804l-.5.623.179.779zm1.5-3.095a.44.44 0 0 0 .7.336l.008.003 2.134-1.513a5.188 5.188 0 0 0-2.992-1.442l.148 2.615.002.001zm10.876 5.97l-5.773 7.181a1.6 1.6 0 0 1-1.248.594l-9.261.003a1.6 1.6 0 0 1-1.247-.596l-5.776-7.18a1.583 1.583 0 0 1-.307-1.34L2.1 5.573c.108-.47.425-.864.863-1.073L11.305.513a1.606 1.606 0 0 1 1.385 0l8.345 3.985c.438.209.755.604.863 1.073l2.062 8.955c.108.47-.005.963-.308 1.34zm-3.289-2.057c-.042-.01-.103-.026-.145-.034-.174-.033-.315-.025-.479-.038-.35-.037-.638-.067-.895-.148-.105-.04-.18-.165-.216-.216l-.201-.059a6.45 6.45 0 0 0-.105-2.332 6.465 6.465 0 0 0-.936-2.163c.052-.047.15-.133.177-.159.008-.09.001-.183.094-.282.197-.185.444-.338.743-.522.142-.084.273-.137.415-.242.032-.024.076-.062.11-.089.24-.191.295-.52.123-.736-.172-.216-.506-.236-.745-.045-.034.027-.08.062-.111.088-.134.116-.217.23-.33.35-.246.25-.45.458-.673.609-.097.056-.239.037-.303.033l-.19.135a6.545 6.545 0 0 0-4.146-2.003l-.012-.223c-.065-.062-.143-.115-.163-.25-.022-.268.015-.557.057-.905.023-.163.061-.298.068-.475.001-.04-.001-.099-.001-.142 0-.306-.224-.555-.5-.555-.275 0-.499.249-.499.555l.001.014c0 .041-.002.092 0 .128.006.177.044.312.067.475.042.348.078.637.056.906a.545.545 0 0 1-.162.258l-.012.211a6.424 6.424 0 0 0-4.166 2.003 8.373 8.373 0 0 1-.18-.128c-.09.012-.18.04-.297-.029-.223-.15-.427-.358-.673-.608-.113-.12-.195-.234-.329-.349-.03-.026-.077-.062-.111-.088a.594.594 0 0 0-.348-.132.481.481 0 0 0-.398.176c-.172.216-.117.546.123.737l.007.005.104.083c.142.105.272.159.414.242.299.185.546.338.743.522.076.082.09.226.1.288l.16.143a6.462 6.462 0 0 0-1.02 4.506l-.208.06c-.055.072-.133.184-.215.217-.257.081-.546.11-.895.147-.164.014-.305.006-.48.039-.037.007-.09.02-.133.03l-.004.002-.007.002c-.295.071-.484.342-.423.608.061.267.349.429.645.365l.007-.001.01-.003.129-.029c.17-.046.294-.113.448-.172.33-.118.604-.217.87-.256.112-.009.23.069.288.101l.217-.037a6.5 6.5 0 0 0 2.88 3.596l-.09.218c.033.084.069.199.044.282-.097.252-.263.517-.452.813-.091.136-.185.242-.268.399-.02.037-.045.095-.064.134-.128.275-.034.591.213.71.248.12.556-.007.69-.282v-.002c.02-.039.046-.09.062-.127.07-.162.094-.301.144-.458.132-.332.205-.68.387-.897.05-.06.13-.082.215-.105l.113-.205a6.453 6.453 0 0 0 4.609.012l.106.192c.086.028.18.042.256.155.136.232.229.507.342.84.05.156.074.295.145.457.016.037.043.09.062.129.133.276.442.402.69.282.247-.118.341-.435.213-.71-.02-.039-.045-.096-.065-.134-.083-.156-.177-.261-.268-.398-.19-.296-.346-.541-.443-.793-.04-.13.007-.21.038-.294-.018-.022-.059-.144-.083-.202a6.499 6.499 0 0 0 2.88-3.622c.064.01.176.03.213.038.075-.05.144-.114.28-.104.266.039.54.138.87.256.154.06.277.128.448.173.036.01.088.019.13.028l.009.003.007.001c.297.064.584-.098.645-.365.06-.266-.128-.537-.423-.608zM16.4 9.701l-1.95 1.746v.005a.44.44 0 0 0 .173.757l.003.01 2.526.728a5.199 5.199 0 0 0-.108-1.674A5.208 5.208 0 0 0 16.4 9.7zm-4.013 5.325a.437.437 0 0 0-.404-.232.44.44 0 0 0-.372.233h-.002l-1.268 2.292a5.164 5.164 0 0 0 3.326.003l-1.27-2.296h-.01zm1.888-1.293a.44.44 0 0 0-.27.036.44.44 0 0 0-.214.572l-.003.004 1.01 2.438a5.15 5.15 0 0 0 2.081-2.615l-2.6-.44-.004.005z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/linux.svg b/crates/nyaterm-app/assets/icons/brand/linux.svg
new file mode 100644
index 00000000..381d3d8a
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/linux.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Linux</title><path d="M12.504 0c-.155 0-.315.008-.48.021-4.226.333-3.105 4.807-3.17 6.298-.076 1.092-.3 1.953-1.05 3.02-.885 1.051-2.127 2.75-2.716 4.521-.278.832-.41 1.684-.287 2.489a.424.424 0 00-.11.135c-.26.268-.45.6-.663.839-.199.199-.485.267-.797.4-.313.136-.658.269-.864.68-.09.189-.136.394-.132.602 0 .199.027.4.055.536.058.399.116.728.04.97-.249.68-.28 1.145-.106 1.484.174.334.535.47.94.601.81.2 1.91.135 2.774.6.926.466 1.866.67 2.616.47.526-.116.97-.464 1.208-.946.587-.003 1.23-.269 2.26-.334.699-.058 1.574.267 2.577.2.025.134.063.198.114.333l.003.003c.391.778 1.113 1.132 1.884 1.071.771-.06 1.592-.536 2.257-1.306.631-.765 1.683-1.084 2.378-1.503.348-.199.629-.469.649-.853.023-.4-.2-.811-.714-1.376v-.097l-.003-.003c-.17-.2-.25-.535-.338-.926-.085-.401-.182-.786-.492-1.046h-.003c-.059-.054-.123-.067-.188-.135a.357.357 0 00-.19-.064c.431-1.278.264-2.55-.173-3.694-.533-1.41-1.465-2.638-2.175-3.483-.796-1.005-1.576-1.957-1.56-3.368.026-2.152.236-6.133-3.544-6.139zm.529 3.405h.013c.213 0 .396.062.584.198.19.135.33.332.438.533.105.259.158.459.166.724 0-.02.006-.04.006-.06v.105a.086.086 0 01-.004-.021l-.004-.024a1.807 1.807 0 01-.15.706.953.953 0 01-.213.335.71.71 0 00-.088-.042c-.104-.045-.198-.064-.284-.133a1.312 1.312 0 00-.22-.066c.05-.06.146-.133.183-.198.053-.128.082-.264.088-.402v-.02a1.21 1.21 0 00-.061-.4c-.045-.134-.101-.2-.183-.333-.084-.066-.167-.132-.267-.132h-.016c-.093 0-.176.03-.262.132a.8.8 0 00-.205.334 1.18 1.18 0 00-.09.4v.019c.002.089.008.179.02.267-.193-.067-.438-.135-.607-.202a1.635 1.635 0 01-.018-.2v-.02a1.772 1.772 0 01.15-.768c.082-.22.232-.406.43-.533a.985.985 0 01.594-.2zm-2.962.059h.036c.142 0 .27.048.399.135.146.129.264.288.344.465.09.199.14.4.153.667v.004c.007.134.006.2-.002.266v.08c-.03.007-.056.018-.083.024-.152.055-.274.135-.393.2.012-.09.013-.18.003-.267v-.015c-.012-.133-.04-.2-.082-.333a.613.613 0 00-.166-.267.248.248 0 00-.183-.064h-.021c-.071.006-.13.04-.186.132a.552.552 0 00-.12.27.944.944 0 00-.023.33v.015c.012.135.037.2.08.334.046.134.098.2.166.268.01.009.02.018.034.024-.07.057-.117.07-.176.136a.304.304 0 01-.131.068 2.62 2.62 0 01-.275-.402 1.772 1.772 0 01-.155-.667 1.759 1.759 0 01.08-.668 1.43 1.43 0 01.283-.535c.128-.133.26-.2.418-.2zm1.37 1.706c.332 0 .733.065 1.216.399.293.2.523.269 1.052.468h.003c.255.136.405.266.478.399v-.131a.571.571 0 01.016.47c-.123.31-.516.643-1.063.842v.002c-.268.135-.501.333-.775.465-.276.135-.588.292-1.012.267a1.139 1.139 0 01-.448-.067 3.566 3.566 0 01-.322-.198c-.195-.135-.363-.332-.612-.465v-.005h-.005c-.4-.246-.616-.512-.686-.71-.07-.268-.005-.47.193-.6.224-.135.38-.271.483-.336.104-.074.143-.102.176-.131h.002v-.003c.169-.202.436-.47.839-.601.139-.036.294-.065.466-.065zm2.8 2.142c.358 1.417 1.196 3.475 1.735 4.473.286.534.855 1.659 1.102 3.024.156-.005.33.018.513.064.646-1.671-.546-3.467-1.089-3.966-.22-.2-.232-.335-.123-.335.59.534 1.365 1.572 1.646 2.757.13.535.16 1.104.021 1.67.067.028.135.06.205.067 1.032.534 1.413.938 1.23 1.537v-.043c-.06-.003-.12 0-.18 0h-.016c.151-.467-.182-.825-1.065-1.224-.915-.4-1.646-.336-1.77.465-.008.043-.013.066-.018.135-.068.023-.139.053-.209.064-.43.268-.662.669-.793 1.187-.13.533-.17 1.156-.205 1.869v.003c-.02.334-.17.838-.319 1.35-1.5 1.072-3.58 1.538-5.348.334a2.645 2.645 0 00-.402-.533 1.45 1.45 0 00-.275-.333c.182 0 .338-.03.465-.067a.615.615 0 00.314-.334c.108-.267 0-.697-.345-1.163-.345-.467-.931-.995-1.788-1.521-.63-.4-.986-.87-1.15-1.396-.165-.534-.143-1.085-.015-1.645.245-1.07.873-2.11 1.274-2.763.107-.065.037.135-.408.974-.396.751-1.14 2.497-.122 3.854a8.123 8.123 0 01.647-2.876c.564-1.278 1.743-3.504 1.836-5.268.048.036.217.135.289.202.218.133.38.333.59.465.21.201.477.335.876.335.039.003.075.006.11.006.412 0 .73-.134.997-.268.29-.134.52-.334.74-.4h.005c.467-.135.835-.402 1.044-.7zm2.185 8.958c.037.6.343 1.245.882 1.377.588.134 1.434-.333 1.791-.765l.211-.01c.315-.007.577.01.847.268l.003.003c.208.199.305.53.391.876.085.4.154.78.409 1.066.486.527.645.906.636 1.14l.003-.007v.018l-.003-.012c-.015.262-.185.396-.498.595-.63.401-1.746.712-2.457 1.57-.618.737-1.37 1.14-2.036 1.191-.664.053-1.237-.2-1.574-.898l-.005-.003c-.21-.4-.12-1.025.056-1.69.176-.668.428-1.344.463-1.897.037-.714.076-1.335.195-1.814.12-.465.308-.797.641-.984l.045-.022zm-10.814.049h.01c.053 0 .105.005.157.014.376.055.706.333 1.023.752l.91 1.664.003.003c.243.533.754 1.064 1.189 1.637.434.598.77 1.131.729 1.57v.006c-.057.744-.48 1.148-1.125 1.294-.645.135-1.52.002-2.395-.464-.968-.536-2.118-.469-2.857-.602-.369-.066-.61-.2-.723-.4-.11-.2-.113-.602.123-1.23v-.004l.002-.003c.117-.334.03-.752-.027-1.118-.055-.401-.083-.71.043-.94.16-.334.396-.4.69-.533.294-.135.64-.202.915-.47h.002v-.002c.256-.268.445-.601.668-.838.19-.201.38-.336.663-.336zm7.159-9.074c-.435.201-.945.535-1.488.535-.542 0-.97-.267-1.28-.466-.154-.134-.28-.268-.373-.335-.164-.134-.144-.333-.074-.333.109.016.129.134.199.2.096.066.215.2.36.333.292.2.68.467 1.167.467.485 0 1.053-.267 1.398-.466.195-.135.445-.334.648-.467.156-.136.149-.267.279-.267.128.016.034.134-.147.332a8.097 8.097 0 01-.69.468zm-1.082-1.583V5.64c-.006-.02.013-.042.029-.05.074-.043.18-.027.26.004.063 0 .16.067.15.135-.006.049-.085.066-.135.066-.055 0-.092-.043-.141-.068-.052-.018-.146-.008-.163-.065zm-.551 0c-.02.058-.113.049-.166.066-.047.025-.086.068-.14.068-.05 0-.13-.02-.136-.068-.01-.066.088-.133.15-.133.08-.031.184-.047.259-.005.019.009.036.03.03.05v.02h.003z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/mongodb.svg b/crates/nyaterm-app/assets/icons/brand/mongodb.svg
new file mode 100644
index 00000000..a4c81748
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/mongodb.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>MongoDB</title><path d="M17.193 9.555c-1.264-5.58-4.252-7.414-4.573-8.115-.28-.394-.53-.954-.735-1.44-.036.495-.055.685-.523 1.184-.723.566-4.438 3.682-4.74 10.02-.282 5.912 4.27 9.435 4.888 9.884l.07.05A73.49 73.49 0 0111.91 24h.481c.114-1.032.284-2.056.51-3.07.417-.296.604-.463.85-.693a11.342 11.342 0 003.639-8.464c.01-.814-.103-1.662-.197-2.218zm-5.336 8.195s0-8.291.275-8.29c.213 0 .49 10.695.49 10.695-.381-.045-.765-1.76-.765-2.405z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/mysql.svg b/crates/nyaterm-app/assets/icons/brand/mysql.svg
new file mode 100644
index 00000000..195caada
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/mysql.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>MySQL</title><path d="M16.405 5.501c-.115 0-.193.014-.274.033v.013h.014c.054.104.146.18.214.273.054.107.1.214.154.32l.014-.015c.094-.066.14-.172.14-.333-.04-.047-.046-.094-.08-.14-.04-.067-.126-.1-.18-.153zM5.77 18.695h-.927a50.854 50.854 0 00-.27-4.41h-.008l-1.41 4.41H2.45l-1.4-4.41h-.01a72.892 72.892 0 00-.195 4.41H0c.055-1.966.192-3.81.41-5.53h1.15l1.335 4.064h.008l1.347-4.064h1.095c.242 2.015.384 3.86.428 5.53zm4.017-4.08c-.378 2.045-.876 3.533-1.492 4.46-.482.716-1.01 1.073-1.583 1.073-.153 0-.34-.046-.566-.138v-.494c.11.017.24.026.386.026.268 0 .483-.075.647-.222.197-.18.295-.382.295-.605 0-.155-.077-.47-.23-.944L6.23 14.615h.91l.727 2.36c.164.536.233.91.205 1.123.4-1.064.678-2.227.835-3.483zm12.325 4.08h-2.63v-5.53h.885v4.85h1.745zm-3.32.135l-1.016-.5c.09-.076.177-.158.255-.25.433-.506.648-1.258.648-2.253 0-1.83-.718-2.746-2.155-2.746-.704 0-1.254.232-1.65.697-.43.508-.646 1.256-.646 2.245 0 .972.19 1.686.574 2.14.35.41.877.615 1.583.615.264 0 .506-.033.725-.098l1.325.772.36-.622zM15.5 17.588c-.225-.36-.337-.94-.337-1.736 0-1.393.424-2.09 1.27-2.09.443 0 .77.167.977.5.224.362.336.936.336 1.723 0 1.404-.424 2.108-1.27 2.108-.445 0-.77-.167-.978-.5zm-1.658-.425c0 .47-.172.856-.516 1.156-.344.3-.803.45-1.384.45-.543 0-1.064-.172-1.573-.515l.237-.476c.438.22.833.328 1.19.328.332 0 .593-.073.783-.22a.754.754 0 00.3-.615c0-.33-.23-.61-.648-.845-.388-.213-1.163-.657-1.163-.657-.422-.307-.632-.636-.632-1.177 0-.45.157-.81.47-1.085.315-.278.72-.415 1.22-.415.512 0 .98.136 1.4.41l-.213.476a2.726 2.726 0 00-1.064-.23c-.283 0-.502.068-.654.206a.685.685 0 00-.248.524c0 .328.234.61.666.85.393.215 1.187.67 1.187.67.433.305.648.63.648 1.168zm9.382-5.852c-.535-.014-.95.04-1.297.188-.1.04-.26.04-.274.167.055.053.063.14.11.214.08.134.218.313.346.407.14.11.28.216.427.31.26.16.555.255.81.416.145.094.293.213.44.313.073.05.12.14.214.172v-.02c-.046-.06-.06-.147-.105-.214-.067-.067-.134-.127-.2-.193a3.223 3.223 0 00-.695-.675c-.214-.146-.682-.35-.77-.595l-.013-.014c.146-.013.32-.066.46-.106.227-.06.435-.047.67-.106.106-.027.213-.06.32-.094v-.06c-.12-.12-.21-.283-.334-.395a8.867 8.867 0 00-1.104-.823c-.21-.134-.476-.22-.697-.334-.08-.04-.214-.06-.26-.127-.12-.146-.19-.34-.275-.514a17.69 17.69 0 01-.547-1.163c-.12-.262-.193-.523-.34-.763-.69-1.137-1.437-1.826-2.586-2.5-.247-.14-.543-.2-.856-.274-.167-.008-.334-.02-.5-.027-.11-.047-.216-.174-.31-.235-.38-.24-1.364-.76-1.644-.072-.18.434.267.862.422 1.082.115.153.26.328.34.5.047.116.06.235.107.356.106.294.207.622.347.897.073.14.153.287.247.413.054.073.146.107.167.227-.094.136-.1.334-.154.5-.24.757-.146 1.693.194 2.25.107.166.362.534.703.393.3-.12.234-.5.32-.835.02-.08.007-.133.048-.187v.015c.094.188.188.367.274.555.206.328.566.668.867.895.16.12.287.328.487.402v-.02h-.015c-.043-.058-.1-.086-.154-.133a3.445 3.445 0 01-.35-.4 8.76 8.76 0 01-.747-1.218c-.11-.21-.202-.436-.29-.643-.04-.08-.04-.2-.107-.24-.1.146-.247.273-.32.453-.127.288-.14.642-.188 1.01-.027.007-.014 0-.027.014-.214-.052-.287-.274-.367-.46-.2-.475-.233-1.238-.06-1.785.047-.14.247-.582.167-.716-.042-.127-.174-.2-.247-.303a2.478 2.478 0 01-.24-.427c-.16-.374-.24-.788-.414-1.162-.08-.173-.22-.354-.334-.513-.127-.18-.267-.307-.368-.52-.033-.073-.08-.194-.027-.274.014-.054.042-.075.094-.09.088-.072.335.022.422.062.247.1.455.194.662.334.094.066.195.193.315.226h.14c.214.047.455.014.655.073.355.114.675.28.962.46a5.953 5.953 0 012.085 2.286c.08.154.115.295.188.455.14.33.313.663.455.982.14.315.275.636.476.897.1.14.502.213.682.286.133.06.34.115.46.188.23.14.454.3.67.454.11.076.443.243.463.378z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/nginx.svg b/crates/nyaterm-app/assets/icons/brand/nginx.svg
new file mode 100644
index 00000000..5875410b
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/nginx.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>NGINX</title><path d="M12 0L1.605 6v12L12 24l10.395-6V6L12 0zm6 16.59c0 .705-.646 1.29-1.529 1.29-.631 0-1.351-.255-1.801-.81l-6-7.141v6.66c0 .721-.57 1.29-1.274 1.29H7.32c-.721 0-1.29-.6-1.29-1.29V7.41c0-.705.63-1.29 1.5-1.29.646 0 1.38.255 1.83.81l5.97 7.141V7.41c0-.721.6-1.29 1.29-1.29h.075c.72 0 1.29.6 1.29 1.29v9.18H18z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/nodedotjs.svg b/crates/nyaterm-app/assets/icons/brand/nodedotjs.svg
new file mode 100644
index 00000000..281c8296
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/nodedotjs.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Node.js</title><path d="M11.998,24c-0.321,0-0.641-0.084-0.922-0.247l-2.936-1.737c-0.438-0.245-0.224-0.332-0.08-0.383 c0.585-0.203,0.703-0.25,1.328-0.604c0.065-0.037,0.151-0.023,0.218,0.017l2.256,1.339c0.082,0.045,0.197,0.045,0.272,0l8.795-5.076 c0.082-0.047,0.134-0.141,0.134-0.238V6.921c0-0.099-0.053-0.192-0.137-0.242l-8.791-5.072c-0.081-0.047-0.189-0.047-0.271,0 L3.075,6.68C2.99,6.729,2.936,6.825,2.936,6.921v10.15c0,0.097,0.054,0.189,0.139,0.235l2.409,1.392 c1.307,0.654,2.108-0.116,2.108-0.89V7.787c0-0.142,0.114-0.253,0.256-0.253h1.115c0.139,0,0.255,0.112,0.255,0.253v10.021 c0,1.745-0.95,2.745-2.604,2.745c-0.508,0-0.909,0-2.026-0.551L2.28,18.675c-0.57-0.329-0.922-0.945-0.922-1.604V6.921 c0-0.659,0.353-1.275,0.922-1.603l8.795-5.082c0.557-0.315,1.296-0.315,1.848,0l8.794,5.082c0.57,0.329,0.924,0.944,0.924,1.603 v10.15c0,0.659-0.354,1.273-0.924,1.604l-8.794,5.078C12.643,23.916,12.324,24,11.998,24z M19.099,13.993 c0-1.9-1.284-2.406-3.987-2.763c-2.731-0.361-3.009-0.548-3.009-1.187c0-0.528,0.235-1.233,2.258-1.233 c1.807,0,2.473,0.389,2.747,1.607c0.024,0.115,0.129,0.199,0.247,0.199h1.141c0.071,0,0.138-0.031,0.186-0.081 c0.048-0.054,0.074-0.123,0.067-0.196c-0.177-2.098-1.571-3.076-4.388-3.076c-2.508,0-4.004,1.058-4.004,2.833 c0,1.925,1.488,2.457,3.895,2.695c2.88,0.282,3.103,0.703,3.103,1.269c0,0.983-0.789,1.402-2.642,1.402 c-2.327,0-2.839-0.584-3.011-1.742c-0.02-0.124-0.126-0.215-0.253-0.215h-1.137c-0.141,0-0.254,0.112-0.254,0.253 c0,1.482,0.806,3.248,4.655,3.248C17.501,17.007,19.099,15.91,19.099,13.993z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/openai.svg b/crates/nyaterm-app/assets/icons/brand/openai.svg
new file mode 100644
index 00000000..384e411c
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/openai.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path d="M20.5624 10.1875C20.8124 9.5 20.8749 8.8125 20.8124 8.125C20.7499 7.4375 20.4999 6.75 20.1874 6.125C19.6249 5.1875 18.8124 4.4375 17.8749 4C16.8749 3.5625 15.8124 3.4375 14.7499 3.6875C14.2499 3.1875 13.6874 2.75 13.0624 2.4375C12.4374 2.125 11.6874 2 10.9999 2C9.9374 2 8.8749 2.3125 7.9999 2.9375C7.1249 3.5625 6.4999 4.4375 6.1874 5.4375C5.4374 5.625 4.8124 5.9375 4.1874 6.3125C3.6249 6.75 3.1874 7.3125 2.8124 7.875C2.24991 8.8125 2.06241 9.875 2.18741 10.9375C2.31241 12 2.7499 13 3.4374 13.8125C3.1874 14.5 3.1249 15.1875 3.1874 15.875C3.2499 16.5625 3.4999 17.25 3.8124 17.875C4.3749 18.8125 5.1874 19.5625 6.1249 20C7.1249 20.4375 8.1874 20.5625 9.2499 20.3125C9.7499 20.8125 10.3124 21.25 10.9374 21.5625C11.5624 21.875 12.3124 22 12.9999 22C14.0624 22 15.1249 21.6875 15.9999 21.0625C16.8749 20.4375 17.4999 19.5625 17.8124 18.5625C18.4999 18.4375 19.1874 18.125 19.7499 17.6875C20.3124 17.25 20.8124 16.75 21.1249 16.125C21.6874 15.1875 21.8749 14.125 21.7499 13.0625C21.6249 12 21.2499 11 20.5624 10.1875ZM13.0624 20.6875C12.0624 20.6875 11.3124 20.375 10.6249 19.8125C10.6249 19.8125 10.6874 19.75 10.7499 19.75L14.7499 17.4375C14.8749 17.375 14.9374 17.3125 14.9999 17.1875C15.0624 17.0625 15.0624 17 15.0624 16.875V11.25L16.7499 12.25V16.875C16.8124 19.0625 15.0624 20.6875 13.0624 20.6875ZM4.9999 17.25C4.5624 16.5 4.3749 15.625 4.5624 14.75C4.5624 14.75 4.6249 14.8125 4.6874 14.8125L8.6874 17.125C8.8124 17.1875 8.8749 17.1875 8.9999 17.1875C9.1249 17.1875 9.2499 17.1875 9.3124 17.125L14.1874 14.3125V16.25L10.1249 18.625C9.2499 19.125 8.2499 19.25 7.3124 19C6.3124 18.75 5.4999 18.125 4.9999 17.25ZM3.9374 8.5625C4.3749 7.8125 5.0624 7.25 5.8749 6.9375V7.0625V11.6875C5.8749 11.8125 5.8749 11.9375 5.9374 12C5.9999 12.125 6.0624 12.1875 6.1874 12.25L11.0624 15.0625L9.3749 16.0625L5.3749 13.75C4.4999 13.25 3.8749 12.4375 3.6249 11.5C3.3749 10.5625 3.4374 9.4375 3.9374 8.5625ZM17.7499 11.75L12.8749 8.9375L14.5624 7.9375L18.5624 10.25C19.1874 10.625 19.6874 11.125 19.9999 11.75C20.3124 12.375 20.4999 13.0625 20.4374 13.8125C20.3749 14.5 20.1249 15.1875 19.6874 15.75C19.2499 16.3125 18.6874 16.75 17.9999 17V12.25C17.9999 12.125 17.9999 12 17.9374 11.9375C17.9374 11.9375 17.8749 11.8125 17.7499 11.75ZM19.4374 9.25C19.4374 9.25 19.3749 9.1875 19.3124 9.1875L15.3124 6.875C15.1874 6.8125 15.1249 6.8125 14.9999 6.8125C14.8749 6.8125 14.7499 6.8125 14.6874 6.875L9.8124 9.6875V7.75L13.8749 5.375C14.4999 5 15.1874 4.875 15.9374 4.875C16.6249 4.875 17.3124 5.125 17.9374 5.5625C18.4999 6 18.9999 6.5625 19.2499 7.1875C19.4999 7.8125 19.5624 8.5625 19.4374 9.25ZM8.9374 12.75L7.2499 11.75V7.0625C7.2499 6.375 7.4374 5.625 7.8124 5.0625C8.1874 4.4375 8.7499 4 9.3749 3.6875C9.9999 3.375 10.7499 3.25 11.4374 3.375C12.1249 3.4375 12.8124 3.75 13.3749 4.1875C13.3749 4.1875 13.3124 4.25 13.2499 4.25L9.2499 6.5625C9.1249 6.625 9.0624 6.6875 8.9999 6.8125C8.9374 6.9375 8.9374 7 8.9374 7.125V12.75ZM9.8124 10.75L11.9999 9.5L14.1874 10.75V13.25L11.9999 14.5L9.8124 13.25V10.75Z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/php.svg b/crates/nyaterm-app/assets/icons/brand/php.svg
new file mode 100644
index 00000000..a08156af
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/php.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>PHP</title><path d="M7.01 10.207h-.944l-.515 2.648h.838c.556 0 .97-.105 1.242-.314.272-.21.455-.559.55-1.049.092-.47.05-.802-.124-.995-.175-.193-.523-.29-1.047-.29zM12 5.688C5.373 5.688 0 8.514 0 12s5.373 6.313 12 6.313S24 15.486 24 12c0-3.486-5.373-6.312-12-6.312zm-3.26 7.451c-.261.25-.575.438-.917.551-.336.108-.765.164-1.285.164H5.357l-.327 1.681H3.652l1.23-6.326h2.65c.797 0 1.378.209 1.744.628.366.418.476 1.002.33 1.752a2.836 2.836 0 0 1-.305.847c-.143.255-.33.49-.561.703zm4.024.715l.543-2.799c.063-.318.039-.536-.068-.651-.107-.116-.336-.174-.687-.174H11.46l-.704 3.625H9.388l1.23-6.327h1.367l-.327 1.682h1.218c.767 0 1.295.134 1.586.401s.378.7.263 1.299l-.572 2.944h-1.389zm7.597-2.265a2.782 2.782 0 0 1-.305.847c-.143.255-.33.49-.561.703a2.44 2.44 0 0 1-.917.551c-.336.108-.765.164-1.286.164h-1.18l-.327 1.682h-1.378l1.23-6.326h2.649c.797 0 1.378.209 1.744.628.366.417.477 1.001.331 1.751zM17.766 10.207h-.943l-.516 2.648h.838c.557 0 .971-.105 1.242-.314.272-.21.455-.559.551-1.049.092-.47.049-.802-.125-.995s-.524-.29-1.047-.29z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/postgresql.svg b/crates/nyaterm-app/assets/icons/brand/postgresql.svg
new file mode 100644
index 00000000..dcf75b72
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/postgresql.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>PostgreSQL</title><path d="M23.5594 14.7228a.5269.5269 0 0 0-.0563-.1191c-.139-.2632-.4768-.3418-1.0074-.2321-1.6533.3411-2.2935.1312-2.5256-.0191 1.342-2.0482 2.445-4.522 3.0411-6.8297.2714-1.0507.7982-3.5237.1222-4.7316a1.5641 1.5641 0 0 0-.1509-.235C21.6931.9086 19.8007.0248 17.5099.0005c-1.4947-.0158-2.7705.3461-3.1161.4794a9.449 9.449 0 0 0-.5159-.0816 8.044 8.044 0 0 0-1.3114-.1278c-1.1822-.0184-2.2038.2642-3.0498.8406-.8573-.3211-4.7888-1.645-7.2219.0788C.9359 2.1526.3086 3.8733.4302 6.3043c.0409.818.5069 3.334 1.2423 5.7436.4598 1.5065.9387 2.7019 1.4334 3.582.553.9942 1.1259 1.5933 1.7143 1.7895.4474.1491 1.1327.1441 1.8581-.7279.8012-.9635 1.5903-1.8258 1.9446-2.2069.4351.2355.9064.3625 1.39.3772a.0569.0569 0 0 0 .0004.0041 11.0312 11.0312 0 0 0-.2472.3054c-.3389.4302-.4094.5197-1.5002.7443-.3102.064-1.1344.2339-1.1464.8115-.0025.1224.0329.2309.0919.3268.2269.4231.9216.6097 1.015.6331 1.3345.3335 2.5044.092 3.3714-.6787-.017 2.231.0775 4.4174.3454 5.0874.2212.5529.7618 1.9045 2.4692 1.9043.2505 0 .5263-.0291.8296-.0941 1.7819-.3821 2.5557-1.1696 2.855-2.9059.1503-.8707.4016-2.8753.5388-4.1012.0169-.0703.0357-.1207.057-.1362.0007-.0005.0697-.0471.4272.0307a.3673.3673 0 0 0 .0443.0068l.2539.0223.0149.001c.8468.0384 1.9114-.1426 2.5312-.4308.6438-.2988 1.8057-1.0323 1.5951-1.6698zM2.371 11.8765c-.7435-2.4358-1.1779-4.8851-1.2123-5.5719-.1086-2.1714.4171-3.6829 1.5623-4.4927 1.8367-1.2986 4.8398-.5408 6.108-.13-.0032.0032-.0066.0061-.0098.0094-2.0238 2.044-1.9758 5.536-1.9708 5.7495-.0002.0823.0066.1989.0162.3593.0348.5873.0996 1.6804-.0735 2.9184-.1609 1.1504.1937 2.2764.9728 3.0892.0806.0841.1648.1631.2518.2374-.3468.3714-1.1004 1.1926-1.9025 2.1576-.5677.6825-.9597.5517-1.0886.5087-.3919-.1307-.813-.5871-1.2381-1.3223-.4796-.839-.9635-2.0317-1.4155-3.5126zm6.0072 5.0871c-.1711-.0428-.3271-.1132-.4322-.1772.0889-.0394.2374-.0902.4833-.1409 1.2833-.2641 1.4815-.4506 1.9143-1.0002.0992-.126.2116-.2687.3673-.4426a.3549.3549 0 0 0 .0737-.1298c.1708-.1513.2724-.1099.4369-.0417.156.0646.3078.26.3695.4752.0291.1016.0619.2945-.0452.4444-.9043 1.2658-2.2216 1.2494-3.1676 1.0128zm2.094-3.988-.0525.141c-.133.3566-.2567.6881-.3334 1.003-.6674-.0021-1.3168-.2872-1.8105-.8024-.6279-.6551-.9131-1.5664-.7825-2.5004.1828-1.3079.1153-2.4468.079-3.0586-.005-.0857-.0095-.1607-.0122-.2199.2957-.2621 1.6659-.9962 2.6429-.7724.4459.1022.7176.4057.8305.928.5846 2.7038.0774 3.8307-.3302 4.7363-.084.1866-.1633.3629-.2311.5454zm7.3637 4.5725c-.0169.1768-.0358.376-.0618.5959l-.146.4383a.3547.3547 0 0 0-.0182.1077c-.0059.4747-.054.6489-.115.8693-.0634.2292-.1353.4891-.1794 1.0575-.11 1.4143-.8782 2.2267-2.4172 2.5565-1.5155.3251-1.7843-.4968-2.0212-1.2217a6.5824 6.5824 0 0 0-.0769-.2266c-.2154-.5858-.1911-1.4119-.1574-2.5551.0165-.5612-.0249-1.9013-.3302-2.6462.0044-.2932.0106-.5909.019-.8918a.3529.3529 0 0 0-.0153-.1126 1.4927 1.4927 0 0 0-.0439-.208c-.1226-.4283-.4213-.7866-.7797-.9351-.1424-.059-.4038-.1672-.7178-.0869.067-.276.1831-.5875.309-.9249l.0529-.142c.0595-.16.134-.3257.213-.5012.4265-.9476 1.0106-2.2453.3766-5.1772-.2374-1.0981-1.0304-1.6343-2.2324-1.5098-.7207.0746-1.3799.3654-1.7088.5321a5.6716 5.6716 0 0 0-.1958.1041c.0918-1.1064.4386-3.1741 1.7357-4.4823a4.0306 4.0306 0 0 1 .3033-.276.3532.3532 0 0 0 .1447-.0644c.7524-.5706 1.6945-.8506 2.802-.8325.4091.0067.8017.0339 1.1742.081 1.939.3544 3.2439 1.4468 4.0359 2.3827.8143.9623 1.2552 1.9315 1.4312 2.4543-1.3232-.1346-2.2234.1268-2.6797.779-.9926 1.4189.543 4.1729 1.2811 5.4964.1353.2426.2522.4522.2889.5413.2403.5825.5515.9713.7787 1.2552.0696.087.1372.1714.1885.245-.4008.1155-1.1208.3825-1.0552 1.717-.0123.1563-.0423.4469-.0834.8148-.0461.2077-.0702.4603-.0994.7662zm.8905-1.6211c-.0405-.8316.2691-.9185.5967-1.0105a2.8566 2.8566 0 0 0 .135-.0406 1.202 1.202 0 0 0 .1342.103c.5703.3765 1.5823.4213 3.0068.1344-.2016.1769-.5189.3994-.9533.6011-.4098.1903-1.0957.333-1.7473.3636-.7197.0336-1.0859-.0807-1.1721-.151zm.5695-9.2712c-.0059.3508-.0542.6692-.1054 1.0017-.055.3576-.112.7274-.1264 1.1762-.0142.4368.0404.8909.0932 1.3301.1066.887.216 1.8003-.2075 2.7014a3.5272 3.5272 0 0 1-.1876-.3856c-.0527-.1276-.1669-.3326-.3251-.6162-.6156-1.1041-2.0574-3.6896-1.3193-4.7446.3795-.5427 1.3408-.5661 2.1781-.463zm.2284 7.0137a12.3762 12.3762 0 0 0-.0853-.1074l-.0355-.0444c.7262-1.1995.5842-2.3862.4578-3.4385-.0519-.4318-.1009-.8396-.0885-1.2226.0129-.4061.0666-.7543.1185-1.0911.0639-.415.1288-.8443.1109-1.3505.0134-.0531.0188-.1158.0118-.1902-.0457-.4855-.5999-1.938-1.7294-3.253-.6076-.7073-1.4896-1.4972-2.6889-2.0395.5251-.1066 1.2328-.2035 2.0244-.1859 2.0515.0456 3.6746.8135 4.8242 2.2824a.908.908 0 0 1 .0667.1002c.7231 1.3556-.2762 6.2751-2.9867 10.5405zm-8.8166-6.1162c-.025.1794-.3089.4225-.6211.4225a.5821.5821 0 0 1-.0809-.0056c-.1873-.026-.3765-.144-.5059-.3156-.0458-.0605-.1203-.178-.1055-.2844.0055-.0401.0261-.0985.0925-.1488.1182-.0894.3518-.1226.6096-.0867.3163.0441.6426.1938.6113.4186zm7.9305-.4114c.0111.0792-.049.201-.1531.3102-.0683.0717-.212.1961-.4079.2232a.5456.5456 0 0 1-.075.0052c-.2935 0-.5414-.2344-.5607-.3717-.024-.1765.2641-.3106.5611-.352.297-.0414.6111.0088.6356.1851z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/python.svg b/crates/nyaterm-app/assets/icons/brand/python.svg
new file mode 100644
index 00000000..30587d81
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/python.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Python</title><path d="M14.25.18l.9.2.73.26.59.3.45.32.34.34.25.34.16.33.1.3.04.26.02.2-.01.13V8.5l-.05.63-.13.55-.21.46-.26.38-.3.31-.33.25-.35.19-.35.14-.33.1-.3.07-.26.04-.21.02H8.77l-.69.05-.59.14-.5.22-.41.27-.33.32-.27.35-.2.36-.15.37-.1.35-.07.32-.04.27-.02.21v3.06H3.17l-.21-.03-.28-.07-.32-.12-.35-.18-.36-.26-.36-.36-.35-.46-.32-.59-.28-.73-.21-.88-.14-1.05-.05-1.23.06-1.22.16-1.04.24-.87.32-.71.36-.57.4-.44.42-.33.42-.24.4-.16.36-.1.32-.05.24-.01h.16l.06.01h8.16v-.83H6.18l-.01-2.75-.02-.37.05-.34.11-.31.17-.28.25-.26.31-.23.38-.2.44-.18.51-.15.58-.12.64-.1.71-.06.77-.04.84-.02 1.27.05zm-6.3 1.98l-.23.33-.08.41.08.41.23.34.33.22.41.09.41-.09.33-.22.23-.34.08-.41-.08-.41-.23-.33-.33-.22-.41-.09-.41.09zm13.09 3.95l.28.06.32.12.35.18.36.27.36.35.35.47.32.59.28.73.21.88.14 1.04.05 1.23-.06 1.23-.16 1.04-.24.86-.32.71-.36.57-.4.45-.42.33-.42.24-.4.16-.36.09-.32.05-.24.02-.16-.01h-8.22v.82h5.84l.01 2.76.02.36-.05.34-.11.31-.17.29-.25.25-.31.24-.38.2-.44.17-.51.15-.58.13-.64.09-.71.07-.77.04-.84.01-1.27-.04-1.07-.14-.9-.2-.73-.25-.59-.3-.45-.33-.34-.34-.25-.34-.16-.33-.1-.3-.04-.25-.02-.2.01-.13v-5.34l.05-.64.13-.54.21-.46.26-.38.3-.32.33-.24.35-.2.35-.14.33-.1.3-.06.26-.04.21-.02.13-.01h5.84l.69-.05.59-.14.5-.21.41-.28.33-.32.27-.35.2-.36.15-.36.1-.35.07-.32.04-.28.02-.21V6.07h2.09l.14.01zm-6.47 14.25l-.23.33-.08.41.08.41.23.33.33.23.41.08.41-.08.33-.23.23-.33.08-.41-.08-.41-.23-.33-.33-.23-.41-.08-.41.08z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/redis.svg b/crates/nyaterm-app/assets/icons/brand/redis.svg
new file mode 100644
index 00000000..fc47db86
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/redis.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Redis</title><path d="M22.71 13.145c-1.66 2.092-3.452 4.483-7.038 4.483-3.203 0-4.397-2.825-4.48-5.12.701 1.484 2.073 2.685 4.214 2.63 4.117-.133 6.94-3.852 6.94-7.239 0-4.05-3.022-6.972-8.268-6.972-3.752 0-8.4 1.428-11.455 3.685C2.59 6.937 3.885 9.958 4.35 9.626c2.648-1.904 4.748-3.13 6.784-3.744C8.12 9.244.886 17.05 0 18.425c.1 1.261 1.66 4.648 2.424 4.648.232 0 .431-.133.664-.365a100.49 100.49 0 0 0 5.54-6.765c.222 3.104 1.748 6.898 6.014 6.898 3.819 0 7.604-2.756 9.33-8.965.2-.764-.73-1.361-1.261-.73zm-4.349-5.013c0 1.959-1.926 2.922-3.685 2.922-.941 0-1.664-.247-2.235-.568 1.051-1.592 2.092-3.225 3.21-4.973 1.972.334 2.71 1.43 2.71 2.619z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/rust.svg b/crates/nyaterm-app/assets/icons/brand/rust.svg
new file mode 100644
index 00000000..b95ce42a
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/rust.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Rust</title><path d="M23.8346 11.7033l-1.0073-.6236a13.7268 13.7268 0 00-.0283-.2936l.8656-.8069a.3483.3483 0 00-.1154-.578l-1.1066-.414a8.4958 8.4958 0 00-.087-.2856l.6904-.9587a.3462.3462 0 00-.2257-.5446l-1.1663-.1894a9.3574 9.3574 0 00-.1407-.2622l.49-1.0761a.3437.3437 0 00-.0274-.3361.3486.3486 0 00-.3006-.154l-1.1845.0416a6.7444 6.7444 0 00-.1873-.2268l.2723-1.153a.3472.3472 0 00-.417-.4172l-1.1532.2724a14.0183 14.0183 0 00-.2278-.1873l.0415-1.1845a.3442.3442 0 00-.49-.328l-1.076.491c-.0872-.0476-.1742-.0952-.2623-.1407l-.1903-1.1673A.3483.3483 0 0016.256.955l-.9597.6905a8.4867 8.4867 0 00-.2855-.086l-.414-1.1066a.3483.3483 0 00-.5781-.1154l-.8069.8666a9.2936 9.2936 0 00-.2936-.0284L12.2946.1683a.3462.3462 0 00-.5892 0l-.6236 1.0073a13.7383 13.7383 0 00-.2936.0284L9.9803.3374a.3462.3462 0 00-.578.1154l-.4141 1.1065c-.0962.0274-.1903.0567-.2855.086L7.744.955a.3483.3483 0 00-.5447.2258L7.009 2.348a9.3574 9.3574 0 00-.2622.1407l-1.0762-.491a.3462.3462 0 00-.49.328l.0416 1.1845a7.9826 7.9826 0 00-.2278.1873L3.8413 3.425a.3472.3472 0 00-.4171.4171l.2713 1.1531c-.0628.075-.1255.1509-.1863.2268l-1.1845-.0415a.3462.3462 0 00-.328.49l.491 1.0761a9.167 9.167 0 00-.1407.2622l-1.1662.1894a.3483.3483 0 00-.2258.5446l.6904.9587a13.303 13.303 0 00-.087.2855l-1.1065.414a.3483.3483 0 00-.1155.5781l.8656.807a9.2936 9.2936 0 00-.0283.2935l-1.0073.6236a.3442.3442 0 000 .5892l1.0073.6236c.008.0982.0182.1964.0283.2936l-.8656.8079a.3462.3462 0 00.1155.578l1.1065.4141c.0273.0962.0567.1914.087.2855l-.6904.9587a.3452.3452 0 00.2268.5447l1.1662.1893c.0456.088.0922.1751.1408.2622l-.491 1.0762a.3462.3462 0 00.328.49l1.1834-.0415c.0618.0769.1235.1528.1873.2277l-.2713 1.1541a.3462.3462 0 00.4171.4161l1.153-.2713c.075.0638.151.1255.2279.1863l-.0415 1.1845a.3442.3442 0 00.49.327l1.0761-.49c.087.0486.1741.0951.2622.1407l.1903 1.1662a.3483.3483 0 00.5447.2268l.9587-.6904a9.299 9.299 0 00.2855.087l.414 1.1066a.3452.3452 0 00.5781.1154l.8079-.8656c.0972.0111.1954.0203.2936.0294l.6236 1.0073a.3472.3472 0 00.5892 0l.6236-1.0073c.0982-.0091.1964-.0183.2936-.0294l.8069.8656a.3483.3483 0 00.578-.1154l.4141-1.1066a8.4626 8.4626 0 00.2855-.087l.9587.6904a.3452.3452 0 00.5447-.2268l.1903-1.1662c.088-.0456.1751-.0931.2622-.1407l1.0762.49a.3472.3472 0 00.49-.327l-.0415-1.1845a6.7267 6.7267 0 00.2267-.1863l1.1531.2713a.3472.3472 0 00.4171-.416l-.2713-1.1542c.0628-.0749.1255-.1508.1863-.2278l1.1845.0415a.3442.3442 0 00.328-.49l-.49-1.076c.0475-.0872.0951-.1742.1407-.2623l1.1662-.1893a.3483.3483 0 00.2258-.5447l-.6904-.9587.087-.2855 1.1066-.414a.3462.3462 0 00.1154-.5781l-.8656-.8079c.0101-.0972.0202-.1954.0283-.2936l1.0073-.6236a.3442.3442 0 000-.5892zm-6.7413 8.3551a.7138.7138 0 01.2986-1.396.714.714 0 11-.2997 1.396zm-.3422-2.3142a.649.649 0 00-.7715.5l-.3573 1.6685c-1.1035.501-2.3285.7795-3.6193.7795a8.7368 8.7368 0 01-3.6951-.814l-.3574-1.6684a.648.648 0 00-.7714-.499l-1.473.3158a8.7216 8.7216 0 01-.7613-.898h7.1676c.081 0 .1356-.0141.1356-.088v-2.536c0-.074-.0536-.0881-.1356-.0881h-2.0966v-1.6077h2.2677c.2065 0 1.1065.0587 1.394 1.2088.0901.3533.2875 1.5044.4232 1.8729.1346.413.6833 1.2381 1.2685 1.2381h3.5716a.7492.7492 0 00.1296-.0131 8.7874 8.7874 0 01-.8119.9526zM6.8369 20.024a.714.714 0 11-.2997-1.396.714.714 0 01.2997 1.396zM4.1177 8.9972a.7137.7137 0 11-1.304.5791.7137.7137 0 011.304-.579zm-.8352 1.9813l1.5347-.6824a.65.65 0 00.33-.8585l-.3158-.7147h1.2432v5.6025H3.5669a8.7753 8.7753 0 01-.2834-3.348zm6.7343-.5437V8.7836h2.9601c.153 0 1.0792.1772 1.0792.8697 0 .575-.7107.7815-1.2948.7815zm10.7574 1.4862c0 .2187-.008.4363-.0243.651h-.9c-.09 0-.1265.0586-.1265.1477v.413c0 .973-.5487 1.1846-1.0296 1.2382-.4576.0517-.9648-.1913-1.0275-.4717-.2704-1.5186-.7198-1.8436-1.4305-2.4034.8817-.5599 1.799-1.386 1.799-2.4915 0-1.1936-.819-1.9458-1.3769-2.3153-.7825-.5163-1.6491-.6195-1.883-.6195H5.4682a8.7651 8.7651 0 014.907-2.7699l1.0974 1.151a.648.648 0 00.9182.0213l1.227-1.1743a8.7753 8.7753 0 016.0044 4.2762l-.8403 1.8982a.652.652 0 00.33.8585l1.6178.7188c.0283.2875.0425.577.0425.8717zm-9.3006-9.5993a.7128.7128 0 11.984 1.0316.7137.7137 0 01-.984-1.0316zm8.3389 6.71a.7107.7107 0 01.9395-.3625.7137.7137 0 11-.9405.3635z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/server.svg b/crates/nyaterm-app/assets/icons/brand/server.svg
new file mode 100644
index 00000000..2e93fefa
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/server.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2026 Fonticons, Inc. --><path fill="currentColor" d="M64 32C28.7 32 0 60.7 0 96l0 64c0 35.3 28.7 64 64 64l320 0c35.3 0 64-28.7 64-64l0-64c0-35.3-28.7-64-64-64L64 32zm216 72a24 24 0 1 1 0 48 24 24 0 1 1 0-48zm56 24a24 24 0 1 1 48 0 24 24 0 1 1 -48 0zM64 288c-35.3 0-64 28.7-64 64l0 64c0 35.3 28.7 64 64 64l320 0c35.3 0 64-28.7 64-64l0-64c0-35.3-28.7-64-64-64L64 288zm216 72a24 24 0 1 1 0 48 24 24 0 1 1 0-48zm56 24a24 24 0 1 1 48 0 24 24 0 1 1 -48 0z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/typescript.svg b/crates/nyaterm-app/assets/icons/brand/typescript.svg
new file mode 100644
index 00000000..e8beb740
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/typescript.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>TypeScript</title><path d="M1.125 0C.502 0 0 .502 0 1.125v21.75C0 23.498.502 24 1.125 24h21.75c.623 0 1.125-.502 1.125-1.125V1.125C24 .502 23.498 0 22.875 0zm17.363 9.75c.612 0 1.154.037 1.627.111a6.38 6.38 0 0 1 1.306.34v2.458a3.95 3.95 0 0 0-.643-.361 5.093 5.093 0 0 0-.717-.26 5.453 5.453 0 0 0-1.426-.2c-.3 0-.573.028-.819.086a2.1 2.1 0 0 0-.623.242c-.17.104-.3.229-.393.374a.888.888 0 0 0-.14.49c0 .196.053.373.156.529.104.156.252.304.443.444s.423.276.696.41c.273.135.582.274.926.416.47.197.892.407 1.266.628.374.222.695.473.963.753.268.279.472.598.614.957.142.359.214.776.214 1.253 0 .657-.125 1.21-.373 1.656a3.033 3.033 0 0 1-1.012 1.085 4.38 4.38 0 0 1-1.487.596c-.566.12-1.163.18-1.79.18a9.916 9.916 0 0 1-1.84-.164 5.544 5.544 0 0 1-1.512-.493v-2.63a5.033 5.033 0 0 0 3.237 1.2c.333 0 .624-.03.872-.09.249-.06.456-.144.623-.25.166-.108.29-.234.373-.38a1.023 1.023 0 0 0-.074-1.089 2.12 2.12 0 0 0-.537-.5 5.597 5.597 0 0 0-.807-.444 27.72 27.72 0 0 0-1.007-.436c-.918-.383-1.602-.852-2.053-1.405-.45-.553-.676-1.222-.676-2.005 0-.614.123-1.141.369-1.582.246-.441.58-.804 1.004-1.089a4.494 4.494 0 0 1 1.47-.629 7.536 7.536 0 0 1 1.77-.201zm-15.113.188h9.563v2.166H9.506v9.646H6.789v-9.646H3.375z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/ubuntu.svg b/crates/nyaterm-app/assets/icons/brand/ubuntu.svg
new file mode 100644
index 00000000..227f86aa
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/ubuntu.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Ubuntu</title><path d="M17.61.455a3.41 3.41 0 0 0-3.41 3.41 3.41 3.41 0 0 0 3.41 3.41 3.41 3.41 0 0 0 3.41-3.41 3.41 3.41 0 0 0-3.41-3.41zM12.92.8C8.923.777 5.137 2.941 3.148 6.451a4.5 4.5 0 0 1 .26-.007 4.92 4.92 0 0 1 2.585.737A8.316 8.316 0 0 1 12.688 3.6 4.944 4.944 0 0 1 13.723.834 11.008 11.008 0 0 0 12.92.8zm9.226 4.994a4.915 4.915 0 0 1-1.918 2.246 8.36 8.36 0 0 1-.273 8.303 4.89 4.89 0 0 1 1.632 2.54 11.156 11.156 0 0 0 .559-13.089zM3.41 7.932A3.41 3.41 0 0 0 0 11.342a3.41 3.41 0 0 0 3.41 3.409 3.41 3.41 0 0 0 3.41-3.41 3.41 3.41 0 0 0-3.41-3.41zm2.027 7.866a4.908 4.908 0 0 1-2.915.358 11.1 11.1 0 0 0 7.991 6.698 11.234 11.234 0 0 0 2.422.249 4.879 4.879 0 0 1-.999-2.85 8.484 8.484 0 0 1-.836-.136 8.304 8.304 0 0 1-5.663-4.32zm11.405.928a3.41 3.41 0 0 0-3.41 3.41 3.41 3.41 0 0 0 3.41 3.41 3.41 3.41 0 0 0 3.41-3.41 3.41 3.41 0 0 0-3.41-3.41z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/yahoo.svg b/crates/nyaterm-app/assets/icons/brand/yahoo.svg
new file mode 100644
index 00000000..c164caac
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/yahoo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2026 Fonticons, Inc. --><path fill="currentColor" d="M223.8 141.1l-56.7 143.2-56-143.2-96.1 0 105.8 249.1-38.6 89.8 94.2 0 140.9-338.9-93.6 0zM329.2 276.9a58.2 58.2 0 1 0 0 116.4 58.2 58.2 0 1 0 0-116.4zM394.7 32l-93 223.5 104.8 0 92.6-223.5-104.4 0z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/youtube.svg b/crates/nyaterm-app/assets/icons/brand/youtube.svg
new file mode 100644
index 00000000..0492366a
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/youtube.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>YouTube</title><path d="M23.498 6.186a3.016 3.016 0 0 0-2.122-2.136C19.505 3.545 12 3.545 12 3.545s-7.505 0-9.377.505A3.017 3.017 0 0 0 .502 6.186C0 8.07 0 12 0 12s0 3.93.502 5.814a3.016 3.016 0 0 0 2.122 2.136c1.871.505 9.376.505 9.376.505s7.505 0 9.377-.505a3.015 3.015 0 0 0 2.122-2.136C24 15.93 24 12 24 12s0-3.93-.502-5.814zM9.545 15.568V8.432L15.818 12l-6.273 3.568z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/brand/zhihu.svg b/crates/nyaterm-app/assets/icons/brand/zhihu.svg
new file mode 100644
index 00000000..c283d23e
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/brand/zhihu.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Zhihu</title><path d="M5.721 0C2.251 0 0 2.25 0 5.719V18.28C0 21.751 2.252 24 5.721 24h12.56C21.751 24 24 21.75 24 18.281V5.72C24 2.249 21.75 0 18.281 0zm1.964 4.078c-.271.73-.5 1.434-.68 2.11h4.587c.545-.006.445 1.168.445 1.171H9.384a58.104 58.104 0 01-.112 3.797h2.712c.388.023.393 1.251.393 1.266H9.183a9.223 9.223 0 01-.408 2.102l.757-.604c.452.456 1.512 1.712 1.906 2.177.473.681.063 2.081.063 2.081l-2.794-3.382c-.653 2.518-1.845 3.607-1.845 3.607-.523.468-1.58.82-2.64.516 2.218-1.73 3.44-3.917 3.667-6.497H4.491c0-.015.197-1.243.806-1.266h2.71c.024-.32.086-3.254.086-3.797H6.598c-.136.406-.158.447-.268.753-.594 1.095-1.603 1.122-1.907 1.155.906-1.821 1.416-3.6 1.591-4.064.425-1.124 1.671-1.125 1.671-1.125zM13.078 6h6.377v11.33h-2.573l-2.184 1.373-.401-1.373h-1.219zm1.313 1.219v8.86h.623l.263.937 1.455-.938h1.456v-8.86z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/check.svg b/crates/nyaterm-app/assets/icons/check.svg
index 43dd6880..8676ca39 100644
--- a/crates/nyaterm-app/assets/icons/check.svg
+++ b/crates/nyaterm-app/assets/icons/check.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="m9.1 16.2-4.3-4.3-1.4 1.4 5.7 5.7L21 7.1l-1.4-1.4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9 16.17 4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/chevron-down.svg b/crates/nyaterm-app/assets/icons/chevron-down.svg
index 4fe8fcf9..4428af00 100644
--- a/crates/nyaterm-app/assets/icons/chevron-down.svg
+++ b/crates/nyaterm-app/assets/icons/chevron-down.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="m7.4 8.6 4.6 4.6 4.6-4.6L18 10l-6 6-6-6 1.4-1.4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16.59 8.59 12 13.17 7.41 8.59 6 10l6 6 6-6z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/chevron-up.svg b/crates/nyaterm-app/assets/icons/chevron-up.svg
index ce0e5a81..53985246 100644
--- a/crates/nyaterm-app/assets/icons/chevron-up.svg
+++ b/crates/nyaterm-app/assets/icons/chevron-up.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="m7.4 15.4 4.6-4.6 4.6 4.6L18 14l-6-6-6 6 1.4 1.4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="m12 8-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/close.svg b/crates/nyaterm-app/assets/icons/close.svg
new file mode 100644
index 00000000..c3f7c2fd
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/commands.svg b/crates/nyaterm-app/assets/icons/commands.svg
index 00a23a3c..d5fa3689 100644
--- a/crates/nyaterm-app/assets/icons/commands.svg
+++ b/crates/nyaterm-app/assets/icons/commands.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="m5 7 5 5-5 5"/><path d="M12 17h7"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M11 21h-1l1-7H7.5c-.58 0-.57-.32-.38-.66.19-.34.05-.08.07-.12C8.48 10.94 10.42 7.54 13 3h1l-1 7h3.5c.49 0 .56.33.47.51l-.07.15C12.96 17.55 11 21 11 21z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/add.svg b/crates/nyaterm-app/assets/icons/conn/add.svg
index 09320265..58f73e96 100644
--- a/crates/nyaterm-app/assets/icons/conn/add.svg
+++ b/crates/nyaterm-app/assets/icons/conn/add.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M11 5h2v6h6v2h-6v6h-2v-6H5v-2h6V5Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/apple.svg b/crates/nyaterm-app/assets/icons/conn/apple.svg
deleted file mode 100644
index 2c51fd86..00000000
--- a/crates/nyaterm-app/assets/icons/conn/apple.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M16.2 12.6c0-2.3 1.9-3.4 2-3.5-1.1-1.6-2.8-1.8-3.4-1.8-1.4-.1-2.8.9-3.5.9-.7 0-1.9-.8-3.1-.8-1.6 0-3.1 1-3.9 2.4-1.7 2.9-.4 7.2 1.2 9.6.8 1.1 1.7 2.4 3 2.3 1.2 0 1.6-.8 3.1-.8s1.8.8 3.1.8 2.1-1.2 2.9-2.3c.9-1.3 1.3-2.6 1.3-2.6s-2.4-.9-2.7-4.2ZM14.8 5.8c.7-.8 1.1-1.9 1-3-.9 0-2 .6-2.7 1.4-.6.7-1.1 1.8-1 2.9 1 .1 2-.5 2.7-1.3Z"/></svg>
diff --git a/crates/nyaterm-app/assets/icons/conn/connect.svg b/crates/nyaterm-app/assets/icons/conn/connect.svg
index 592108ac..f39e2a7e 100644
--- a/crates/nyaterm-app/assets/icons/conn/connect.svg
+++ b/crates/nyaterm-app/assets/icons/conn/connect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8 5.5v13l11-6.5L8 5.5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/debian.svg b/crates/nyaterm-app/assets/icons/conn/debian.svg
deleted file mode 100644
index d0913060..00000000
--- a/crates/nyaterm-app/assets/icons/conn/debian.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M13.2 4.2c3.8.4 6.6 3.4 6.6 7.2 0 4.3-3.5 7.8-8.1 7.8-2.5 0-4.5-.8-5.9-2.2l1.2-1.3c1.1 1.1 2.7 1.7 4.6 1.7 3.4 0 6.1-2.5 6.1-6s-2.3-5.8-5.4-6.1c-1.7-.2-3.2.4-4.2 1.5L7 5.5c1.4-1.4 3.5-1.6 6.2-1.3Z"/></svg>
diff --git a/crates/nyaterm-app/assets/icons/conn/docker.svg b/crates/nyaterm-app/assets/icons/conn/docker.svg
deleted file mode 100644
index bfb5c87c..00000000
--- a/crates/nyaterm-app/assets/icons/conn/docker.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 11h2v2H4v-2Zm2.5 0h2v2h-2v-2Zm2.5 0h2v2h-2v-2Zm2.5 0h2v2h-2v-2ZM6.5 8.5h2v2h-2v-2Zm2.5 0h2v2h-2v-2Zm2.5 0h2v2h-2v-2ZM5 14.2c0 2.2 2.3 3.6 7 3.6s7-1.4 7-3.6c0-1-.5-1.8-1.4-2.4-.4 1.4-2.2 2.4-5.6 2.4s-5.2-1-5.6-2.4c-.9.6-1.4 1.4-1.4 2.4Z"/></svg>
diff --git a/crates/nyaterm-app/assets/icons/conn/file.svg b/crates/nyaterm-app/assets/icons/conn/file.svg
index e125bd99..6aa287e0 100644
--- a/crates/nyaterm-app/assets/icons/conn/file.svg
+++ b/crates/nyaterm-app/assets/icons/conn/file.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M14 3.5H7a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-9L14 3.5Z"/><path d="M14 3.5V9h5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 2c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6H6zm7 7V3.5L18.5 9H13z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/flash.svg b/crates/nyaterm-app/assets/icons/conn/flash.svg
index 34888f0f..e948043d 100644
--- a/crates/nyaterm-app/assets/icons/conn/flash.svg
+++ b/crates/nyaterm-app/assets/icons/conn/flash.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M7 2h8l-2 7h5L9 22l2-8H6L7 2Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M7 2v11h3v9l7-12h-4l4-8z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/folder.svg b/crates/nyaterm-app/assets/icons/conn/folder.svg
index 7b7bf550..e70b01ce 100644
--- a/crates/nyaterm-app/assets/icons/conn/folder.svg
+++ b/crates/nyaterm-app/assets/icons/conn/folder.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M4 7.5A2.5 2.5 0 0 1 6.5 5H10l2 2.5h5.5A2.5 2.5 0 0 1 20 10v6.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 4 16.5v-9Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/github.svg b/crates/nyaterm-app/assets/icons/conn/github.svg
deleted file mode 100644
index 0bf89b00..00000000
--- a/crates/nyaterm-app/assets/icons/conn/github.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 2a10 10 0 0 0-3.2 19.5c.5.1.7-.2.7-.5v-1.7c-2.8.6-3.4-1.2-3.4-1.2-.4-1.1-1-1.4-1-1.4-.9-.6.1-.6.1-.6 1 .1 1.5 1 1.5 1 .9 1.5 2.3 1.1 2.9.8.1-.6.3-1.1.6-1.3-2.2-.2-4.6-1.1-4.6-5a3.9 3.9 0 0 1 1-2.7c-.1-.3-.5-1.3.1-2.7 0 0 .8-.3 2.8 1a9.6 9.6 0 0 1 5 0c2-1.3 2.8-1 2.8-1 .6 1.4.2 2.4.1 2.7a3.9 3.9 0 0 1 1 2.7c0 3.9-2.3 4.7-4.6 5 .4.3.7.9.7 1.8v2.7c0 .3.2.6.7.5A10 10 0 0 0 12 2Z"/></svg>
diff --git a/crates/nyaterm-app/assets/icons/conn/linux.svg b/crates/nyaterm-app/assets/icons/conn/linux.svg
deleted file mode 100644
index 058ed03d..00000000
--- a/crates/nyaterm-app/assets/icons/conn/linux.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 3c2.2 0 4 2.1 4 5.2 0 1.5-.4 2.8-1 3.8l1.6 1.2c1.4 1 2.4 2.4 2.4 4.1 0 1.8-1.5 3.2-3.8 3.7-.7.8-1.9 1.3-3.2 1.3s-2.5-.5-3.2-1.3C6.5 20.5 5 19.1 5 17.3c0-1.7 1-3.1 2.4-4.1L9 12c-.6-1-1-2.3-1-3.8C8 5.1 9.8 3 12 3Zm-1.5 5.2a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm3 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z"/></svg>
diff --git a/crates/nyaterm-app/assets/icons/conn/more.svg b/crates/nyaterm-app/assets/icons/conn/more.svg
index 88540e69..f2427f84 100644
--- a/crates/nyaterm-app/assets/icons/conn/more.svg
+++ b/crates/nyaterm-app/assets/icons/conn/more.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M6 10a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/python.svg b/crates/nyaterm-app/assets/icons/conn/python.svg
deleted file mode 100644
index f2d68641..00000000
--- a/crates/nyaterm-app/assets/icons/conn/python.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 3c-3.2 0-3 .8-3 2.8V8h6v.8H8.2C6 8.8 5 10 5 12.5S6 16.2 8.2 16.2H10v-2c0-1.7 1.4-3 3.2-3H16V8.8C16 5.6 15.4 3 12 3Zm-1.4 1.6a.9.9 0 1 1 0 1.8.9.9 0 0 1 0-1.8ZM13.8 11.8c-1 0-1.8.8-1.8 1.8v2H8.2c-1 0-1.7-.6-1.7-1.6s.7-1.6 1.7-1.6h5.6Zm2 1.2H18c2.2 0 3.2-1.2 3.2-3.5S20.2 6 18 6H14v2c0 1.7-1.3 3-3.2 3H8.2v2.2C8.2 16.4 9 18 12 18c3.2 0 3-.8 3-2.8V14h-5.2v-.8h6Z"/></svg>
diff --git a/crates/nyaterm-app/assets/icons/conn/serial.svg b/crates/nyaterm-app/assets/icons/conn/serial.svg
index 2b3902ca..f4c8e262 100644
--- a/crates/nyaterm-app/assets/icons/conn/serial.svg
+++ b/crates/nyaterm-app/assets/icons/conn/serial.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8 4h8v3h-1.5v2H16v3h-1.5v2H16v3h-1.5v2H8v-2H9.5v-2H8v-3h1.5V9H8V7h1.5V4H8Zm3 3.5v2h2v-2h-2Zm0 5v2h2v-2h-2Zm0 5v2h2v-2h-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="m7.3 14.7 1.2-1.2c-1-1-1.5-2.3-1.5-3.5 0-1.3.5-2.6 1.5-3.5L7.3 5.3c-1.3 1.3-2 3-2 4.7s.7 3.4 2 4.7zM19.1 2.9l-1.2 1.2c1.6 1.6 2.4 3.8 2.4 5.9 0 2.1-.8 4.3-2.4 5.9l1.2 1.2c2-2 2.9-4.5 2.9-7.1 0-2.6-1-5.1-2.9-7.1z"/><path d="M6.1 4.1 4.9 2.9C3 4.9 2 7.4 2 10c0 2.6 1 5.1 2.9 7.1l1.2-1.2c-1.6-1.6-2.4-3.8-2.4-5.9 0-2.1.8-4.3 2.4-5.9zm10.6 10.6c1.3-1.3 2-3 2-4.7-.1-1.7-.7-3.4-2-4.7l-1.2 1.2c1 1 1.5 2.3 1.5 3.5 0 1.3-.5 2.6-1.5 3.5l1.2 1.2zM14.5 10a2.5 2.5 0 0 0-5 0c0 .76.34 1.42.87 1.88L7 22h2l.67-2h4.67l.66 2h2l-3.37-10.12c.53-.46.87-1.12.87-1.88zm-4.17 8L12 13l1.67 5h-3.34z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/server.svg b/crates/nyaterm-app/assets/icons/conn/server.svg
index 31b9ea10..4079ced5 100644
--- a/crates/nyaterm-app/assets/icons/conn/server.svg
+++ b/crates/nyaterm-app/assets/icons/conn/server.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="4" width="16" height="6" rx="1.5"/><rect x="4" y="14" width="16" height="6" rx="1.5"/><path d="M7.5 7h.01"/><path d="M7.5 17h.01"/><path d="M11 7h5"/><path d="M11 17h5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 13H4c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h16c.55 0 1-.45 1-1v-6c0-.55-.45-1-1-1zM7 19c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM20 3H4c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h16c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1zM7 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/sort.svg b/crates/nyaterm-app/assets/icons/conn/sort.svg
index ebeddf98..84efa535 100644
--- a/crates/nyaterm-app/assets/icons/conn/sort.svg
+++ b/crates/nyaterm-app/assets/icons/conn/sort.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8 6h2v10.2l2.6-2.6 1.4 1.4L9 20l-5-5 1.4-1.4L8 16.2V6Zm8 12h-2V7.8l-2.6 2.6-1.4-1.4L15 4l5 5-1.4 1.4L16 7.8V18Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 18h6v-2H3v2zM3 6v2h18V6H3zm0 7h12v-2H3v2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/symlink.svg b/crates/nyaterm-app/assets/icons/conn/symlink.svg
index 9497b0eb..f39e2a7e 100644
--- a/crates/nyaterm-app/assets/icons/conn/symlink.svg
+++ b/crates/nyaterm-app/assets/icons/conn/symlink.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M10.5 7H7a4 4 0 0 0 0 8h3.5v-1.5H7a2.5 2.5 0 0 1 0-5h3.5V7Zm3 0H17a4 4 0 0 1 0 8h-3.5v-1.5H17a2.5 2.5 0 0 0 0-5h-3.5V7Zm-5 3.25h7v1.5h-7v-1.5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/telnet.svg b/crates/nyaterm-app/assets/icons/conn/telnet.svg
index f9f4e4d7..4079ced5 100644
--- a/crates/nyaterm-app/assets/icons/conn/telnet.svg
+++ b/crates/nyaterm-app/assets/icons/conn/telnet.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 11h5V8l5 4-5 4v-3H4v-2Zm11-4h5v2h-5V7Zm0 4h5v2h-5v-2Zm0 4h5v2h-5v-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 13H4c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h16c.55 0 1-.45 1-1v-6c0-.55-.45-1-1-1zM7 19c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM20 3H4c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h16c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1zM7 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/terminal.svg b/crates/nyaterm-app/assets/icons/conn/terminal.svg
index d99912f3..b1a4d635 100644
--- a/crates/nyaterm-app/assets/icons/conn/terminal.svg
+++ b/crates/nyaterm-app/assets/icons/conn/terminal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="3.5" y="5" width="17" height="14" rx="2"/><path d="m7 9 3 3-3 3"/><path d="M12.5 15h4"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 4H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16c1.1 0 2-.9 2-2V6a2 2 0 0 0-2-2zm0 14H4V8h16v10zm-2-1h-6v-2h6v2zM7.5 17l-1.41-1.41L8.67 13l-2.59-2.59L7.5 9l4 4-4 4z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/conn/ubuntu.svg b/crates/nyaterm-app/assets/icons/conn/ubuntu.svg
deleted file mode 100644
index 880f1322..00000000
--- a/crates/nyaterm-app/assets/icons/conn/ubuntu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><circle cx="12" cy="12" r="2.2"/><circle cx="12" cy="5.2" r="1.6"/><circle cx="6.2" cy="15.4" r="1.6"/><circle cx="17.8" cy="15.4" r="1.6"/><path d="M12 7.6a4.4 4.4 0 0 1 3.8 6.6l1.3.8A6 6 0 0 0 12 6l0 1.6Zm-2.3 8.4A4.4 4.4 0 0 1 7.6 12H6a6 6 0 0 0 4.1 5.7l-.4-1.7Zm4.6 0 .4 1.7A6 6 0 0 0 18 12h-1.6a4.4 4.4 0 0 1-2.1 4Z" opacity=".9"/></svg>
diff --git a/crates/nyaterm-app/assets/icons/conn/windows.svg b/crates/nyaterm-app/assets/icons/conn/windows.svg
deleted file mode 100644
index da974cd8..00000000
--- a/crates/nyaterm-app/assets/icons/conn/windows.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M3 5.5 11 4.3v7.1H3V5.5Zm0 8.1h8v7.1L3 19.5v-5.9ZM12.5 4.1 21 3v8.4h-8.5V4.1Zm0 9.6H21V21l-8.5-1.3v-6Z"/></svg>
diff --git a/crates/nyaterm-app/assets/icons/connections.svg b/crates/nyaterm-app/assets/icons/connections.svg
index 31b9ea10..4079ced5 100644
--- a/crates/nyaterm-app/assets/icons/connections.svg
+++ b/crates/nyaterm-app/assets/icons/connections.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="4" width="16" height="6" rx="1.5"/><rect x="4" y="14" width="16" height="6" rx="1.5"/><path d="M7.5 7h.01"/><path d="M7.5 17h.01"/><path d="M11 7h5"/><path d="M11 17h5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 13H4c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h16c.55 0 1-.45 1-1v-6c0-.55-.45-1-1-1zM7 19c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM20 3H4c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h16c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1zM7 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/copy.svg b/crates/nyaterm-app/assets/icons/copy.svg
index a26c38fe..7c6b60ae 100644
--- a/crates/nyaterm-app/assets/icons/copy.svg
+++ b/crates/nyaterm-app/assets/icons/copy.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M16 1H4a2 2 0 0 0-2 2v14h2V3h12V1Zm3 4H8a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h11a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2Zm0 16H8V7h11v14Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/docker.svg b/crates/nyaterm-app/assets/icons/docker.svg
index 89e50601..0021a8a7 100644
--- a/crates/nyaterm-app/assets/icons/docker.svg
+++ b/crates/nyaterm-app/assets/icons/docker.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M4 13h14.5c1.2 0 2.2.8 2.5 2-1 3.4-3.8 5-8.4 5H11c-4.1 0-6.5-2-7-7Z"/><path d="M6 10h3v3H6z"/><path d="M9 10h3v3H9z"/><path d="M12 10h3v3h-3z"/><path d="M9 7h3v3H9z"/><path d="M12 7h3v3h-3z"/></svg>
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Docker</title><path d="M13.983 11.078h2.119a.186.186 0 00.186-.185V9.006a.186.186 0 00-.186-.186h-2.119a.185.185 0 00-.185.185v1.888c0 .102.083.185.185.185m-2.954-5.43h2.118a.186.186 0 00.186-.186V3.574a.186.186 0 00-.186-.185h-2.118a.185.185 0 00-.185.185v1.888c0 .102.082.185.185.185m0 2.716h2.118a.187.187 0 00.186-.186V6.29a.186.186 0 00-.186-.185h-2.118a.185.185 0 00-.185.185v1.887c0 .102.082.185.185.186m-2.93 0h2.12a.186.186 0 00.184-.186V6.29a.185.185 0 00-.185-.185H8.1a.185.185 0 00-.185.185v1.887c0 .102.083.185.185.186m-2.964 0h2.119a.186.186 0 00.185-.186V6.29a.185.185 0 00-.185-.185H5.136a.186.186 0 00-.186.185v1.887c0 .102.084.185.186.186m5.893 2.715h2.118a.186.186 0 00.186-.185V9.006a.186.186 0 00-.186-.186h-2.118a.185.185 0 00-.185.185v1.888c0 .102.082.185.185.185m-2.93 0h2.12a.185.185 0 00.184-.185V9.006a.185.185 0 00-.184-.186h-2.12a.185.185 0 00-.184.185v1.888c0 .102.083.185.185.185m-2.964 0h2.119a.185.185 0 00.185-.185V9.006a.185.185 0 00-.184-.186h-2.12a.186.186 0 00-.186.186v1.887c0 .102.084.185.186.185m-2.92 0h2.12a.185.185 0 00.184-.185V9.006a.185.185 0 00-.184-.186h-2.12a.185.185 0 00-.184.185v1.888c0 .102.082.185.185.185M23.763 9.89c-.065-.051-.672-.51-1.954-.51-.338.001-.676.03-1.01.087-.248-1.7-1.653-2.53-1.716-2.566l-.344-.199-.226.327c-.284.438-.49.922-.612 1.43-.23.97-.09 1.882.403 2.661-.595.332-1.55.413-1.744.42H.751a.751.751 0 00-.75.748 11.376 11.376 0 00.692 4.062c.545 1.428 1.355 2.48 2.41 3.124 1.18.723 3.1 1.137 5.275 1.137.983.003 1.963-.086 2.93-.266a12.248 12.248 0 003.823-1.389c.98-.567 1.86-1.288 2.61-2.136 1.252-1.418 1.998-2.997 2.553-4.4h.221c1.372 0 2.215-.549 2.68-1.009.309-.293.55-.65.707-1.046l.098-.288Z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/eye.svg b/crates/nyaterm-app/assets/icons/eye.svg
index 99b75c4c..5c700e39 100644
--- a/crates/nyaterm-app/assets/icons/eye.svg
+++ b/crates/nyaterm-app/assets/icons/eye.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 5c4.9 0 8.5 4.2 9.7 6.1.3.5.3 1.1 0 1.6C20.5 14.8 16.9 19 12 19s-8.5-4.2-9.7-6.1a1.5 1.5 0 0 1 0-1.6C3.5 9.2 7.1 5 12 5Zm0 2c-3.8 0-6.8 3.2-7.8 5 1 1.8 4 5 7.8 5s6.8-3.2 7.8-5C18.8 10.2 15.8 7 12 7Zm0 2.2a2.8 2.8 0 1 1 0 5.6 2.8 2.8 0 0 1 0-5.6Zm0 2a.8.8 0 1 0 0 1.6.8.8 0 0 0 0-1.6Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/back.svg b/crates/nyaterm-app/assets/icons/fe/back.svg
index d670bfbe..e119372c 100644
--- a/crates/nyaterm-app/assets/icons/fe/back.svg
+++ b/crates/nyaterm-app/assets/icons/fe/back.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M15.4 6.4 9.8 12l5.6 5.6-1.4 1.4L7 12l7-7 1.4 1.4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/bookmark-remove.svg b/crates/nyaterm-app/assets/icons/fe/bookmark-remove.svg
index 6d4730c9..679a1aac 100644
--- a/crates/nyaterm-app/assets/icons/fe/bookmark-remove.svg
+++ b/crates/nyaterm-app/assets/icons/fe/bookmark-remove.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M6 3h12a2 2 0 0 1 2 2v16l-8-4.5L4 21V5a2 2 0 0 1 2-2Zm0 2v12.6l6-3.4 6 3.4V5H6Zm2 4h8v2H8V9Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M21 7h-6V5h6v2zm-2 3.9A5.002 5.002 0 0 1 14 3H7c-1.1 0-2 .9-2 2v16l7-3 7 3V10.9z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/delete.svg b/crates/nyaterm-app/assets/icons/fe/delete.svg
index ae9c131a..0969a4dc 100644
--- a/crates/nyaterm-app/assets/icons/fe/delete.svg
+++ b/crates/nyaterm-app/assets/icons/fe/delete.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M9 3h6l1 2h4v2H4V5h4l1-2Zm1 6h2v8h-2V9Zm4 0h2v8h-2V9ZM7 9h2v8H7V9Zm1 11h8a1 1 0 0 0 1-1V9H7v10a1 1 0 0 0 1 1Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/download.svg b/crates/nyaterm-app/assets/icons/fe/download.svg
index ebd0850e..3b44aec9 100644
--- a/crates/nyaterm-app/assets/icons/fe/download.svg
+++ b/crates/nyaterm-app/assets/icons/fe/download.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M11 4h2v8.2l2.6-2.6 1.4 1.4L12 16 7 11l1.4-1.4L11 12.2V4Zm-6 16v-2h14v2H5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5 20h14v-2H5v2zM19 9h-4V3H9v6H5l7 7 7-7z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/forward.svg b/crates/nyaterm-app/assets/icons/fe/forward.svg
index ce5487b4..aae64cf7 100644
--- a/crates/nyaterm-app/assets/icons/fe/forward.svg
+++ b/crates/nyaterm-app/assets/icons/fe/forward.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8.6 6.4 14.2 12l-5.6 5.6 1.4 1.4 7-7-7-7-1.4 1.4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M8.59 16.59 13.17 12 8.59 7.41 10 6l6 6-6 6-1.41-1.41z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/new-file.svg b/crates/nyaterm-app/assets/icons/fe/new-file.svg
index 40fc9b88..36c9d08b 100644
--- a/crates/nyaterm-app/assets/icons/fe/new-file.svg
+++ b/crates/nyaterm-app/assets/icons/fe/new-file.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M14 2H6.5A1.5 1.5 0 0 0 5 3.5v17A1.5 1.5 0 0 0 6.5 22h11a1.5 1.5 0 0 0 1.5-1.5V8l-5-6Zm0 1.5L17.5 8H14V3.5ZM8 13h3v-3h2v3h3v2h-3v3h-2v-3H8v-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 14h-3v3h-2v-3H8v-2h3v-3h2v3h3v2zm-3-7V3.5L18.5 9H13z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/new-folder.svg b/crates/nyaterm-app/assets/icons/fe/new-folder.svg
index b353e0a7..3c9da3d6 100644
--- a/crates/nyaterm-app/assets/icons/fe/new-folder.svg
+++ b/crates/nyaterm-app/assets/icons/fe/new-folder.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M10 4H4.5A1.5 1.5 0 0 0 3 5.5v13A1.5 1.5 0 0 0 4.5 20h15a1.5 1.5 0 0 0 1.5-1.5V8.5A1.5 1.5 0 0 0 19.5 7H12l-2-3Zm1 6h2v2h2v2h-2v2h-2v-2H9v-2h2v-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 6h-8l-2-2H4c-1.11 0-1.99.89-1.99 2L2 18c0 1.11.89 2 2 2h16c1.11 0 2-.89 2-2V8c0-1.11-.89-2-2-2zm-1 8h-3v3h-2v-3h-3v-2h3V9h2v3h3v2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/paste.svg b/crates/nyaterm-app/assets/icons/fe/paste.svg
index c44ecc41..af63a642 100644
--- a/crates/nyaterm-app/assets/icons/fe/paste.svg
+++ b/crates/nyaterm-app/assets/icons/fe/paste.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M9 3h6a2 2 0 0 1 2 2v1h1.5A1.5 1.5 0 0 1 20 7.5v12A1.5 1.5 0 0 1 18.5 21h-13A1.5 1.5 0 0 1 4 19.5v-12A1.5 1.5 0 0 1 5.5 6H7V5a2 2 0 0 1 2-2Zm0 3h6V5H9v1Zm-2 3v10h10V9H7Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 2h-4.18C14.4.84 13.3 0 12 0c-1.3 0-2.4.84-2.82 2H5c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-7 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm7 18H5V4h2v3h10V4h2v16z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/refresh.svg b/crates/nyaterm-app/assets/icons/fe/refresh.svg
index 9171dfce..217df885 100644
--- a/crates/nyaterm-app/assets/icons/fe/refresh.svg
+++ b/crates/nyaterm-app/assets/icons/fe/refresh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M17.65 6.35A7.95 7.95 0 0 0 12 4a8 8 0 1 0 7.75 10h-2.1A6 6 0 1 1 12 6c1.5 0 2.86.56 3.9 1.48L13 11h7V4l-2.35 2.35Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17.65 6.35A7.958 7.958 0 0 0 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08A5.99 5.99 0 0 1 12 18c-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/search.svg b/crates/nyaterm-app/assets/icons/fe/search.svg
index 79c57799..cd9fd53c 100644
--- a/crates/nyaterm-app/assets/icons/fe/search.svg
+++ b/crates/nyaterm-app/assets/icons/fe/search.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M10 4a6 6 0 1 1 0 12 6 6 0 0 1 0-12Zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8Zm6.3 9.9 4.4 4.4-1.4 1.4-4.4-4.4 1.4-1.4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15.5 14h-.79l-.28-.27A6.471 6.471 0 0 0 16 9.5 6.5 6.5 0 1 0 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/star-outline.svg b/crates/nyaterm-app/assets/icons/fe/star-outline.svg
index df1b0951..edef6948 100644
--- a/crates/nyaterm-app/assets/icons/fe/star-outline.svg
+++ b/crates/nyaterm-app/assets/icons/fe/star-outline.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="m12 5.2 1.7 3.5 3.8.6-2.7 2.7.6 3.8L12 14.2 8.6 15.8l.6-3.8-2.7-2.7 3.8-.6L12 5.2Zm0-1.7L9.5 8.6 3.9 9.4l4 3.9-.9 5.6L12 16.3l5 2.6-.9-5.6 4-3.9-5.6-.8L12 3.5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17 3H7c-1.1 0-1.99.9-1.99 2L5 21l7-3 7 3V5c0-1.1-.9-2-2-2zm0 15-5-2.18L7 18V5h10v13z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/star.svg b/crates/nyaterm-app/assets/icons/fe/star.svg
index b270983d..10a5d7d4 100644
--- a/crates/nyaterm-app/assets/icons/fe/star.svg
+++ b/crates/nyaterm-app/assets/icons/fe/star.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="m12 3.5 2.5 5.1 5.6.8-4 3.9.9 5.6L12 16.3 7 18.9l.9-5.6-4-3.9 5.6-.8L12 3.5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="m19 21-7-3-7 3V5c0-1.1.9-2 2-2h7a5.002 5.002 0 0 0 5 7.9V21zM17.83 9 15 6.17l1.41-1.41 1.41 1.41 3.54-3.54 1.41 1.41L17.83 9z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/sync.svg b/crates/nyaterm-app/assets/icons/fe/sync.svg
index 164f1392..65004930 100644
--- a/crates/nyaterm-app/assets/icons/fe/sync.svg
+++ b/crates/nyaterm-app/assets/icons/fe/sync.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 4a8 8 0 0 1 7.75 6h-2.1A6 6 0 0 0 8.1 8.1L10 10H4V4l2.05 2.05A7.96 7.96 0 0 1 12 4Zm0 16a8 8 0 0 1-7.75-6h2.1A6 6 0 0 0 15.9 15.9L14 14h6v6l-2.05-2.05A7.96 7.96 0 0 1 12 20Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 4.26v2.09C7.67 7.18 6 9.39 6 12c0 1.77.78 3.34 2 4.44V14h2v6H4v-2h2.73A7.942 7.942 0 0 1 4 12c0-3.73 2.55-6.85 6-7.74zM20 4h-6v6h2V7.56c1.22 1.1 2 2.67 2 4.44h2c0-2.4-1.06-4.54-2.73-6H20V4zm0 13v-1c0-1.1-.9-2-2-2s-2 .9-2 2v1c-.55 0-1 .45-1 1v3c0 .55.45 1 1 1h4c.55 0 1-.45 1-1v-3c0-.55-.45-1-1-1zm-1 0h-2v-1c0-.55.45-1 1-1s1 .45 1 1v1z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/up.svg b/crates/nyaterm-app/assets/icons/fe/up.svg
index 755a7fab..b84aab84 100644
--- a/crates/nyaterm-app/assets/icons/fe/up.svg
+++ b/crates/nyaterm-app/assets/icons/fe/up.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 4 5 11h4v9h6v-9h4L12 4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="m4 12 1.41 1.41L11 7.83V20h2V7.83l5.58 5.59L20 12l-8-8-8 8z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/upload-folder.svg b/crates/nyaterm-app/assets/icons/fe/upload-folder.svg
index bc99af7e..3b85ccbe 100644
--- a/crates/nyaterm-app/assets/icons/fe/upload-folder.svg
+++ b/crates/nyaterm-app/assets/icons/fe/upload-folder.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M10 4H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-8l-2-2Zm1 5v3H8v2h3v3h2v-3h3v-2h-3V9h-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10zM8 13.01l1.41 1.41L11 12.84V17h2v-4.16l1.59 1.59L16 13.01 12.01 9 8 13.01z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/fe/upload.svg b/crates/nyaterm-app/assets/icons/fe/upload.svg
index c135f963..76168acf 100644
--- a/crates/nyaterm-app/assets/icons/fe/upload.svg
+++ b/crates/nyaterm-app/assets/icons/fe/upload.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M11 16V7.8l-2.6 2.6-1.4-1.4L12 4l5 5-1.4 1.4L13 7.8V16h-2Zm-6 4v-2h14v2H5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5 20h14v-2H5v2zm0-10h4v6h6v-6h4l-7-7-7 7z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/apps.svg b/crates/nyaterm-app/assets/icons/file/apps.svg
new file mode 100644
index 00000000..b0ccb6c8
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/apps.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M4 8h4V4H4v4zm6 12h4v-4h-4v4zm-6 0h4v-4H4v4zm0-6h4v-4H4v4zm6 0h4v-4h-4v4zm6-10v4h4V4h-4zm-6 4h4V4h-4v4zm6 6h4v-4h-4v4zm0 6h4v-4h-4v4z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/archive.svg b/crates/nyaterm-app/assets/icons/file/archive.svg
new file mode 100644
index 00000000..1fa6401d
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/archive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm-2 6h-2v2h2v2h-2v2h-2v-2h2v-2h-2v-2h2v-2h-2V8h2v2h2v2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/audio.svg b/crates/nyaterm-app/assets/icons/file/audio.svg
new file mode 100644
index 00000000..08ad00de
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/audio.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 11h-3v3.75c0 1.24-1.01 2.25-2.25 2.25S8.5 17.99 8.5 16.75s1.01-2.25 2.25-2.25c.46 0 .89.14 1.25.38V11h4v2zm-3-4V3.5L18.5 9H13z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/code.svg b/crates/nyaterm-app/assets/icons/file/code.svg
new file mode 100644
index 00000000..01454236
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9.4 16.6 4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0 4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/data-object.svg b/crates/nyaterm-app/assets/icons/file/data-object.svg
new file mode 100644
index 00000000..8199c504
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/data-object.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M4 7v2c0 .55-.45 1-1 1H2v4h1c.55 0 1 .45 1 1v2c0 1.65 1.35 3 3 3h3v-2H7c-.55 0-1-.45-1-1v-2c0-1.3-.84-2.42-2-2.83v-.34C5.16 11.42 6 10.3 6 9V7c0-.55.45-1 1-1h3V4H7C5.35 4 4 5.35 4 7zm17 3c-.55 0-1-.45-1-1V7c0-1.65-1.35-3-3-3h-3v2h3c.55 0 1 .45 1 1v2c0 1.3.84 2.42 2 2.83v.34c-1.16.41-2 1.52-2 2.83v2c0 .55-.45 1-1 1h-3v2h3c1.65 0 3-1.35 3-3v-2c0-.55.45-1 1-1h1v-4h-1z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/description.svg b/crates/nyaterm-app/assets/icons/file/description.svg
new file mode 100644
index 00000000..1585a6ca
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/description.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/image.svg b/crates/nyaterm-app/assets/icons/file/image.svg
new file mode 100644
index 00000000..6ccc16ad
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/image.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/movie.svg b/crates/nyaterm-app/assets/icons/file/movie.svg
new file mode 100644
index 00000000..632ecd4e
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/movie.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="m18 4 2 4h-3l-2-4h-2l2 4h-3l-2-4H8l2 4H7L5 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4h-4z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/pdf.svg b/crates/nyaterm-app/assets/icons/file/pdf.svg
new file mode 100644
index 00000000..e50f55f5
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/pdf.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 2H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-8.5 7.5c0 .83-.67 1.5-1.5 1.5H9v2H7.5V7H10c.83 0 1.5.67 1.5 1.5v1zm5 2c0 .83-.67 1.5-1.5 1.5h-2.5V7H15c.83 0 1.5.67 1.5 1.5v3zm4-3H19v1h1.5V11H19v2h-1.5V7h3v1.5zM9 9.5h1v-1H9v1zM4 6H2v14c0 1.1.9 2 2 2h14v-2H4V6zm10 5.5h1v-3h-1v3z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/present.svg b/crates/nyaterm-app/assets/icons/file/present.svg
new file mode 100644
index 00000000..27c21d79
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/present.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M21 3H3c-1.1 0-2 .9-2 2v8h2V5h18v16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/><circle cx="9" cy="10" r="4"/><path d="M15.39 16.56C13.71 15.7 11.53 15 9 15s-4.71.7-6.39 1.56A2.97 2.97 0 0 0 1 19.22V22h16v-2.78c0-1.12-.61-2.15-1.61-2.66z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/storage.svg b/crates/nyaterm-app/assets/icons/file/storage.svg
new file mode 100644
index 00000000..8cae0c1e
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/storage.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M2 20h20v-4H2v4zm2-3h2v2H4v-2zM2 4v4h20V4H2zm4 3H4V5h2v2zm-4 7h20v-4H2v4zm2-3h2v2H4v-2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/table.svg b/crates/nyaterm-app/assets/icons/file/table.svg
new file mode 100644
index 00000000..c6491c7b
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/table.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 10.02h5V21h-5zM17 21h3c1.1 0 2-.9 2-2v-9h-5v11zm3-18H5c-1.1 0-2 .9-2 2v3h19V5c0-1.1-.9-2-2-2zM3 19c0 1.1.9 2 2 2h3V10H3v9z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/file/text.svg b/crates/nyaterm-app/assets/icons/file/text.svg
new file mode 100644
index 00000000..55c1c072
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/file/text.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-5 14H7v-2h7v2zm3-4H7v-2h10v2zm0-4H7V7h10v2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/files.svg b/crates/nyaterm-app/assets/icons/files.svg
index fbe06236..931189a4 100644
--- a/crates/nyaterm-app/assets/icons/files.svg
+++ b/crates/nyaterm-app/assets/icons/files.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M14 3.5H7a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-9L14 3.5Z"/><path d="M14 3.5V9h5"/><path d="M8.5 13h7"/><path d="M8.5 16.5h5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="m9.17 6 2 2H20v10H4V6h5.17M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/history.svg b/crates/nyaterm-app/assets/icons/history.svg
index dc9f8c7f..f8f018c8 100644
--- a/crates/nyaterm-app/assets/icons/history.svg
+++ b/crates/nyaterm-app/assets/icons/history.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M4.5 12a7.5 7.5 0 1 0 2.2-5.3L4.5 8.9"/><path d="M4.5 4.5v4.4h4.4"/><path d="M12 8v4.4l3 1.8"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13 3a9 9 0 0 0-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42A8.954 8.954 0 0 0 13 21a9 9 0 0 0 0-18zm-1 5v5l4.28 2.54.72-1.21-3.5-2.08V8H12z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/import.svg b/crates/nyaterm-app/assets/icons/import.svg
index 3fc78350..ef421c32 100644
--- a/crates/nyaterm-app/assets/icons/import.svg
+++ b/crates/nyaterm-app/assets/icons/import.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M11 3h2v9.2l2.6-2.6 1.4 1.4-5 5-5-5 1.4-1.4 2.6 2.6V3Zm-6 14h2v2h10v-2h2v4H5v-4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/import/mobaxterm.svg b/crates/nyaterm-app/assets/icons/import/mobaxterm.svg
deleted file mode 100644
index e58f0b01..00000000
--- a/crates/nyaterm-app/assets/icons/import/mobaxterm.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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 version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">  <image id="image0" width="32" height="32" x="0" y="0"
-    xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAIGNIUk0AAHomAACAhAAA+gAAAIDo
-AAB1MAAA6mAAADqYAAAXcJy6UTwAAAI9UExURQAAADEAAL0AALAaGvVYWL5bPbvxBLz9AWegAFSR
-AAcNACcAALcAAIknC67pAbDtAWCgAD9vAAAAAB0AALEAAHEvAEZ2AKbgAZvWAWSsAG6+ACpKABUA
-AFsuAEZ4AJ7UAYG6AGu5AGawABkqAAYJAD5qAEZ5AHHCAFiZAAwTAAMGADllAEl9AEh6AAAAAAAA
-ADRaADJWAMzMzDU1NcjIyFtbW9TU1P7+/ra2tk5OTnR0dO7u7t7e3mhoaM/Pz/39/aKiov///8PD
-w1VVVT9OZTxHV0dghmCe+16Y8T5MYTY3OU90rGGg/1+b9UFSazg2NqhLS6dLSzY1NTk+RlaGzlWK
-2zI5REQ4OMtSUv9cXLRNTTc1NT1JW1yT5kyAzwZb4S46S1k8POVXV8BQUEhZeF+c92Gg/j1yxgBZ
-53hCQvZaWv5cXKRlfWKg/l2a9RNn7BRMpTQ2OJ1JSfVaW4h1o1yc/i5boJ1DQ/dbW3WGyWKg+F+c
-+EFTbqMQEMxJSbtcaWKe+oOyVqzjD2ihyWKf75PDLmR5JKQNDcgBAcdFRcVaZGSb9WOg7ZbHK8D/
-ArLrCmuhumegzqfcFL/9Am2GIYIaGskAAMNBQc5ZYKbPGbbxB32taLTuCMbkbn8aGr87O9tdUbzn
-C7z6A5XQMnUeHsgAALw1NeBbVLrdD67qBWutCnLEAMuCgskDA95TU/5dXfN4a7PsIXzGFXbECsuP
-j8kGBttLS/5fX/V0asjoH6jfL3XEB37FG7zLqU6HAPiM1KIAAAAydFJOUwA+8cz1xfb9v7wSMem8
-8PHKkAMm4cbY69/e+GAcq9/ky/HmNxPL0v3IGg2/2aAHCJdw+qQOmgAAAAFiS0dEQYnebE4AAAAH
-dElNRQfqAwMHABeogtQ4AAABfUlEQVQ4y2MwIgAYiFBgjAcQq8DElIACM3MLS/xWWFnb4FVga2fv
-gFeBo5MzhpSLK7IJILajI7K8m7uHJx5venn7+Pj4+mEq8A8IDAJSwSE+IBAahq4gPCIyMiraOCYW
-LB8Xn4CmIDEpEgiSU1JB0mnpGRloCjKzQPLZOblg/Xn5GQWFyAqCirJB8sUlPlBQWobqi3KQdGRF
-JViyCkRU16AoqK0Dq6hvAEo1NjUDyZbWNmQF7R2dYBVd3T29fX39E3wmTuqbPAVJwdRp06aDVcyY
-2QcEs2bPAVFzkXwxb9q0+WAVCxb2wcCixcjeXLJ02jKwT5avgMqvXLUaJdGuWTtt3XqQig0Q+Y2b
-Vm9GTdVbtk7btj0ycsdOsPyu3av37DViQAGMTNOYWVjZQNLsHKtXc3IxoANunmm8fCB5foHVqwWF
-GDCBsIiomHhfn4TkailpBqxARnafnLyC4molZQYcQEV1n5r6ag1NBpxAS1tnta4eAx6gb2DIQDwA
-AMB47WH9AeILAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDI2LTAzLTAzVDA3OjAwOjIzKzAwOjAw+k0V
-kQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyNi0wMy0wM1QwNzowMDoyMyswMDowMIsQrS0AAAAodEVY
-dGRhdGU6dGltZXN0YW1wADIwMjYtMDMtMDNUMDc6MDA6MjMrMDA6MDDcBYzyAAAAAElFTkSuQmCC" />
-</svg>
diff --git a/crates/nyaterm-app/assets/icons/import/windterm.svg b/crates/nyaterm-app/assets/icons/import/windterm.svg
deleted file mode 100644
index b226356f..00000000
--- a/crates/nyaterm-app/assets/icons/import/windterm.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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 version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">  <image id="image0" width="32" height="32" x="0" y="0"
-    xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACDUlEQVR4nO2X3UrjQBTHJx9m5pzQ2oJgC4J2RcXqnBPwJvgUgg/gA/oqPkH3ZgJS8AEWm9kk40W7y3ZbN4nYyoq/m4FkPn6cDId/vONe/ziJMWFAJlCUICaHYXgoqkpsHEThrXvei6IeY8yMwKSAkhiTCykvlHNqKwLrCH0/PMP4jBGYAChBTEgBDX1vuBWB19hXap8RmQGYEIkB+FzK87Cqwq0IrEMGgRxjPE4QEgIkRuBrgGsphKwVOEA8uB99u89ymxmbG2OtMTY3Jrcmm82y57J4fovUA/PDVRhe/S2wUqYoCKJUyTRVMhWis/TOCc89VdWTsda8l2D9d/oDTzhv4HuDgZKDOsGJtZO775O7uj39NgJNBVMl09tu57bJmncVeAubE3AfLVCVHyzQkC+BzysQI8ZhENQ2us9bgS8BUVVCuPp2+Ikr8L8ItAokTSg8v5gWxdTMfhjn6i9Ba4HCXxxgrcmszUy+iGWL8XE2e7RlaZvutyJQOVeZsjTz3Pdznvvy3Pwap9ZO2xxQx0ZiuRBCDAGGBEAEQBpA33S7Nx3PWw6R61JxWyAMYYw4JgAiRNIAmgF5T7i9JutbCRwhHmkAzYisAbRWSp9G0WngXLA8s2Eee02gs7PT0XGstVKaMCatpCYA2hVid2Vyg273T4GTfv+EEflSwSXj/P9uFAQjz7mN3Y/fRJF4Adjt29MjOCgSAAAAAElFTkSuQmCC" />
-</svg>
diff --git a/crates/nyaterm-app/assets/icons/import/xshell.svg b/crates/nyaterm-app/assets/icons/import/xshell.svg
deleted file mode 100644
index 458747fa..00000000
--- a/crates/nyaterm-app/assets/icons/import/xshell.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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 version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">  <image id="image0" width="32" height="32" x="0" y="0"
-    xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAEZklEQVR4nO1WT1AbZRR/ppuGbjD7IQFJtcsSOhBHAtsZBw5UkkxpDz0gHT2qgPZIC9XxZiFArxax3jwIjEccoIMeCk6W0hxgWgh/KtAKfAQVJGn5NsI2JMvoISwu+Qcpvdnfaed7b9/7vfe9Px/AS/zf8cpRDSAtha6YcxoqjMhewuh5dJxCAAAesunBUhAPrD3tF/wBwStt4xdOoN6c09BkyXUqTpOhbXbZ2Tb/e8sLI/DdmdPf1+S+XpvKP3griCvdMw51NjTP4/x64ZvNqToHAOD0adxQeZGLpXWccpZyBlhax/124Z2lRHISkgkJhwmnP8El0vGQTc8F90MHCcsk5QxcLzzVnMjouXszjuyfRzMKBsfzsn8azfhk/FEd3nqGo3V5lM7X55saAZ4jA+sXyzaii04dUZUpo7qYSee9UhAL/oAAANBTaunlUTqv/oeEZFIw+CAvJQIVRoN96KzVFX1++s79PK+0jXtKC3urThqrlXO8FcTvj81eEsM75L6dn4gm/tn04rWUrgBptSj6zEM2PV5pG1eZMqvVzgEiRfdLudUVCO+Qbxb/7Ij+12Zk7CkRMGg1MQTE8A4BAChmaD4u6eMUqs83NX67sPo1CclELSsx6EuoMXvJBNIeizGsRqkwdYaEZTItbnmiZbm7LUXC+43vc8ToeRKWCZaCmIM0blJlhwIASNYyAABWRs+P+EVhWQphEpKJ+i45fRr3rpGx/+D1dV41mxrUthRdRFEMAMBUYHMSaSl03j3jUHQ0U4HNyWTOAQBsRoNdifKunwjR8q+KuHYAgEr3Q0e3d71r2CcKtxb+6Li99rRfracQUUOjtEoyXDWfbEDaSNQdi2sxxcSjdH7MXjLB0Tru8vjj2vPuGcew/2/hYza7BiASOQAAS6dxip09AgOrG30HEVAKCQBgxC8KrXMrMUuF06dxQ2etrlB1+T/rF8s2esosvYqsb3Wjj6V1HI/S+eha0ZCwTIZ94oFZaLKwzdbdSr8x53XeWohtKzVh5btr+a/OEb8o1JzKqgEAWI5ayxoAgNb52Iji4cfSt3qVRfL59FJj69xKS7xRq2DYJwpfzOBrLK3jPmKzawH+uw4Fe5NwsLzIZcti7AeRUKbbtCh5ACLLqcJosFflvPZexu6gwlIQd6/4ukb8ooC0FLpT/rZLGcUfjP566bbq2vcIsLSOizcuE6FtdtnZteLrSvTSUWyq9wDeCuKCwQd5ap19u6A+39R402puPwwBgEif968+6RtYe9KPpSCeFJ95kJZCxQzN2zINtiv5bzSqA7o8/qiu2+vrTEgAAOBLC+tsssRfuUdBvOgB4ryIbsx5nfHa7CggIZlUqqafGgnX8YdsVu3NInP7YWsimfNz7mmHUrSHJgAQKaImC+tUJlqqGPaJwqcTj+uSFeqhHiQKkYrMV20HLS7Fcev8SsuI/+ABl/KTzMrQfB59gitmaD5DewwZKIoJyLK4JG1jrxTCd/2ikGw1v0Q0/gUUTvvpe7FxNQAAAABJRU5ErkJggg==" />
-</svg>
diff --git a/crates/nyaterm-app/assets/icons/lock.svg b/crates/nyaterm-app/assets/icons/lock.svg
index aa507a55..2154a2c5 100644
--- a/crates/nyaterm-app/assets/icons/lock.svg
+++ b/crates/nyaterm-app/assets/icons/lock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="5" y="10" width="14" height="10" rx="2"/><path d="M8 10V7a4 4 0 0 1 8 0v3"/><path d="M12 14.5v2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/article.svg b/crates/nyaterm-app/assets/icons/menu/article.svg
index ebd8523a..55c1c072 100644
--- a/crates/nyaterm-app/assets/icons/menu/article.svg
+++ b/crates/nyaterm-app/assets/icons/menu/article.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5 3h14a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2Zm2 4v2h10V7H7Zm0 4v2h10v-2H7Zm0 4v2h7v-2H7Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-5 14H7v-2h7v2zm3-4H7v-2h10v2zm0-4H7V7h10v2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/book.svg b/crates/nyaterm-app/assets/icons/menu/book.svg
index a93fa084..d238211b 100644
--- a/crates/nyaterm-app/assets/icons/menu/book.svg
+++ b/crates/nyaterm-app/assets/icons/menu/book.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5 4h6a3 3 0 0 1 3 3v13a3 3 0 0 0-3-1H5a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2Zm14 0h-4a3 3 0 0 0-3 3v13a3 3 0 0 1 3-1h4a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M21 5c-1.11-.35-2.33-.5-3.5-.5-1.95 0-4.05.4-5.5 1.5-1.45-1.1-3.55-1.5-5.5-1.5S2.45 4.9 1 6v14.65c0 .25.25.5.5.5.1 0 .15-.05.25-.05C3.1 20.45 5.05 20 6.5 20c1.95 0 4.05.4 5.5 1.5 1.35-.85 3.8-1.5 5.5-1.5 1.65 0 3.35.3 4.75 1.05.1.05.15.05.25.05.25 0 .5-.25.5-.5V6c-.6-.45-1.25-.75-2-1zm0 13.5c-1.1-.35-2.3-.5-3.5-.5-1.7 0-4.15.65-5.5 1.5V8c1.35-.85 3.8-1.5 5.5-1.5 1.2 0 2.4.15 3.5.5v11.5z"/><path d="M17.5 10.5c.88 0 1.73.09 2.5.26V9.24c-.79-.15-1.64-.24-2.5-.24-1.7 0-3.24.29-4.5.83v1.66c1.13-.64 2.7-.99 4.5-.99zM13 12.49v1.66c1.13-.64 2.7-.99 4.5-.99.88 0 1.73.09 2.5.26V11.9c-.79-.15-1.64-.24-2.5-.24-1.7 0-3.24.3-4.5.83zm4.5 1.84c-1.7 0-3.24.29-4.5.83v1.66c1.13-.64 2.7-.99 4.5-.99.88 0 1.73.09 2.5.26v-1.52c-.79-.16-1.64-.24-2.5-.24z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/broadcast.svg b/crates/nyaterm-app/assets/icons/menu/broadcast.svg
index 7b7938f2..f4c8e262 100644
--- a/crates/nyaterm-app/assets/icons/menu/broadcast.svg
+++ b/crates/nyaterm-app/assets/icons/menu/broadcast.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M11 4h2v3.1a5 5 0 0 1 0 9.8V20h-2v-3.1a5 5 0 0 1 0-9.8V4Zm1 5a3 3 0 1 0 0 6 3 3 0 0 0 0-6ZM4.4 7.1l1.4 1.4a5 5 0 0 0 0 6.9l-1.4 1.4a7 7 0 0 1 0-9.7Zm15.2 0a7 7 0 0 1 0 9.7l-1.4-1.4a5 5 0 0 0 0-6.9l1.4-1.4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="m7.3 14.7 1.2-1.2c-1-1-1.5-2.3-1.5-3.5 0-1.3.5-2.6 1.5-3.5L7.3 5.3c-1.3 1.3-2 3-2 4.7s.7 3.4 2 4.7zM19.1 2.9l-1.2 1.2c1.6 1.6 2.4 3.8 2.4 5.9 0 2.1-.8 4.3-2.4 5.9l1.2 1.2c2-2 2.9-4.5 2.9-7.1 0-2.6-1-5.1-2.9-7.1z"/><path d="M6.1 4.1 4.9 2.9C3 4.9 2 7.4 2 10c0 2.6 1 5.1 2.9 7.1l1.2-1.2c-1.6-1.6-2.4-3.8-2.4-5.9 0-2.1.8-4.3 2.4-5.9zm10.6 10.6c1.3-1.3 2-3 2-4.7-.1-1.7-.7-3.4-2-4.7l-1.2 1.2c1 1 1.5 2.3 1.5 3.5 0 1.3-.5 2.6-1.5 3.5l1.2 1.2zM14.5 10a2.5 2.5 0 0 0-5 0c0 .76.34 1.42.87 1.88L7 22h2l.67-2h4.67l.66 2h2l-3.37-10.12c.53-.46.87-1.12.87-1.88zm-4.17 8L12 13l1.67 5h-3.34z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/export.svg b/crates/nyaterm-app/assets/icons/menu/export.svg
index bdf5bfd8..0fe9aadd 100644
--- a/crates/nyaterm-app/assets/icons/menu/export.svg
+++ b/crates/nyaterm-app/assets/icons/menu/export.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M11 3h2v9.2l2.6-2.6 1.4 1.4-5 5-5-5 1.4-1.4 2.6 2.6V3Zm-6 14h2v2h10v-2h2v4H5v-4Z" transform="rotate(180 12 12)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9 16h6v-6h4l-7-7-7 7h4zm-4 2h14v2H5z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/fit.svg b/crates/nyaterm-app/assets/icons/menu/fit.svg
index 82631c3e..e8a07e71 100644
--- a/crates/nyaterm-app/assets/icons/menu/fit.svg
+++ b/crates/nyaterm-app/assets/icons/menu/fit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 4h6v2H6v4H4V4Zm10 0h6v6h-2V6h-4V4ZM4 14h2v4h4v2H4v-6Zm14 0h2v6h-6v-2h4v-4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17 4h3c1.1 0 2 .9 2 2v2h-2V6h-3V4zM4 8V6h3V4H4c-1.1 0-2 .9-2 2v2h2zm16 8v2h-3v2h3c1.1 0 2-.9 2-2v-2h-2zM7 18H4v-2H2v2c0 1.1.9 2 2 2h3v-2zM18 8H6v8h12V8z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/horizontal.svg b/crates/nyaterm-app/assets/icons/menu/horizontal.svg
index 1c9fcd3f..4b7ef90b 100644
--- a/crates/nyaterm-app/assets/icons/menu/horizontal.svg
+++ b/crates/nyaterm-app/assets/icons/menu/horizontal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M3 5h18v5H3V5Zm0 9h18v5H3v-5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 19h18v-6H3v6zm0-8h18V9H3v2zm0-6v2h18V5H3z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/info.svg b/crates/nyaterm-app/assets/icons/menu/info.svg
index 1e8d33a2..22ef137e 100644
--- a/crates/nyaterm-app/assets/icons/menu/info.svg
+++ b/crates/nyaterm-app/assets/icons/menu/info.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M11 10h2v7h-2v-7Zm0-4h2v2h-2V6Zm1 16a10 10 0 1 1 0-20 10 10 0 0 1 0 20Zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/menu.svg b/crates/nyaterm-app/assets/icons/menu/menu.svg
index 667c03f4..ae7c36cb 100644
--- a/crates/nyaterm-app/assets/icons/menu/menu.svg
+++ b/crates/nyaterm-app/assets/icons/menu/menu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 5h16v2H4V5Zm0 6h16v2H4v-2Zm0 6h16v2H4v-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/palette.svg b/crates/nyaterm-app/assets/icons/menu/palette.svg
index dc800451..a4be942f 100644
--- a/crates/nyaterm-app/assets/icons/menu/palette.svg
+++ b/crates/nyaterm-app/assets/icons/menu/palette.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 3a9 9 0 0 0 0 18h1.5a2.5 2.5 0 0 0 0-5H12a2 2 0 0 1-2-2v-1h7a4 4 0 0 0 0-8h-5Zm-4 5.5a1.25 1.25 0 1 1 2.5 0 1.25 1.25 0 0 1-2.5 0Zm4-2a1.25 1.25 0 1 1 2.5 0 1.25 1.25 0 0 1-2.5 0Zm4 2a1.25 1.25 0 1 1 2.5 0 1.25 1.25 0 0 1-2.5 0Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2C6.49 2 2 6.49 2 12s4.49 10 10 10a2.5 2.5 0 0 0 2.5-2.5c0-.61-.23-1.2-.64-1.67a.528.528 0 0 1-.13-.33c0-.28.22-.5.5-.5H16c3.31 0 6-2.69 6-6 0-4.96-4.49-9-10-9zm5.5 11c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm-3-4c-.83 0-1.5-.67-1.5-1.5S13.67 6 14.5 6s1.5.67 1.5 1.5S15.33 9 14.5 9zM5 11.5c0-.83.67-1.5 1.5-1.5s1.5.67 1.5 1.5S7.33 13 6.5 13 5 12.33 5 11.5zm6-4c0 .83-.67 1.5-1.5 1.5S8 8.33 8 7.5 8.67 6 9.5 6s1.5.67 1.5 1.5z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/reset.svg b/crates/nyaterm-app/assets/icons/menu/reset.svg
index 5fb8c790..6c59c4da 100644
--- a/crates/nyaterm-app/assets/icons/menu/reset.svg
+++ b/crates/nyaterm-app/assets/icons/menu/reset.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 4a8 8 0 1 1-7.4 11h2.2A6 6 0 1 0 7.5 8H4v3H2V4h7v2H6.2A8 8 0 0 1 12 4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 5V2L8 6l4 4V7c3.31 0 6 2.69 6 6 0 2.97-2.17 5.43-5 5.91v2.02c3.95-.49 7-3.85 7-7.93 0-4.42-3.58-8-8-8zm-6 8c0-1.65.67-3.15 1.76-4.24L6.34 7.34A8.014 8.014 0 0 0 4 13c0 4.08 3.05 7.44 7 7.93v-2.02c-2.83-.48-5-2.94-5-5.91z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/sidebar.svg b/crates/nyaterm-app/assets/icons/menu/sidebar.svg
index 6b2b520c..f11e08a7 100644
--- a/crates/nyaterm-app/assets/icons/menu/sidebar.svg
+++ b/crates/nyaterm-app/assets/icons/menu/sidebar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 4h16v16H4V4Zm2 2v12h4V6H6Zm6 0v12h6V6h-6Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16 20H2V4h14v16zm2-12h4V4h-4v4zm0 12h4v-4h-4v4zm0-6h4v-4h-4v4z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/split.svg b/crates/nyaterm-app/assets/icons/menu/split.svg
index aa6ac560..60d15a00 100644
--- a/crates/nyaterm-app/assets/icons/menu/split.svg
+++ b/crates/nyaterm-app/assets/icons/menu/split.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 4h7v7H4V4Zm9 0h7v7h-7V4ZM4 13h7v7H4v-7Zm9 0h7v7h-7v-7Zm-1-2h2v2h-2v-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M18 4v5H6V4h12m0-2H6c-1.1 0-2 .9-2 2v5c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm0 13v5H6v-5h12m0-2H6c-1.1 0-2 .9-2 2v5c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-5c0-1.1-.9-2-2-2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/update.svg b/crates/nyaterm-app/assets/icons/menu/update.svg
index 5b181e53..2e02f709 100644
--- a/crates/nyaterm-app/assets/icons/menu/update.svg
+++ b/crates/nyaterm-app/assets/icons/menu/update.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 4a8 8 0 0 1 7.4 5H17l3 3 3-3h-1.5A10 10 0 1 0 22 14h-2.1A8 8 0 1 1 12 4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M21 10.12h-6.78l2.74-2.82c-2.73-2.7-7.15-2.8-9.88-.1-2.73 2.71-2.73 7.08 0 9.79s7.15 2.71 9.88 0C18.32 15.65 19 14.08 19 12.1h2c0 1.98-.88 4.55-2.64 6.29-3.51 3.48-9.21 3.48-12.72 0-3.5-3.47-3.53-9.11-.02-12.58s9.14-3.47 12.65 0L21 3v7.12zM12.5 8v4.25l3.5 2.08-.72 1.21L11 13V8h1.5z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/vertical.svg b/crates/nyaterm-app/assets/icons/menu/vertical.svg
index 4b704390..2e63c3c0 100644
--- a/crates/nyaterm-app/assets/icons/menu/vertical.svg
+++ b/crates/nyaterm-app/assets/icons/menu/vertical.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5 3h5v18H5V3Zm9 0h5v18h-5V3Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 15h8v-2H3v2zm0 4h8v-2H3v2zm0-8h8V9H3v2zm0-6v2h8V5H3zm10 0h8v14h-8V5z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/zoom-in.svg b/crates/nyaterm-app/assets/icons/menu/zoom-in.svg
index 47ded04b..0c257ee8 100644
--- a/crates/nyaterm-app/assets/icons/menu/zoom-in.svg
+++ b/crates/nyaterm-app/assets/icons/menu/zoom-in.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M10.5 4a6.5 6.5 0 1 0 4.1 11.5l4.2 4.2 1.4-1.4-4.2-4.2A6.5 6.5 0 0 0 10.5 4Zm0 2a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9Zm-1 1.5h2v2h2v2h-2v2h-2v-2h-2v-2h2v-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15.5 14h-.79l-.28-.27A6.471 6.471 0 0 0 16 9.5 6.5 6.5 0 1 0 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M12 10h-2v2H9v-2H7V9h2V7h1v2h2v1z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/menu/zoom-out.svg b/crates/nyaterm-app/assets/icons/menu/zoom-out.svg
index 4ec63ec4..b511470c 100644
--- a/crates/nyaterm-app/assets/icons/menu/zoom-out.svg
+++ b/crates/nyaterm-app/assets/icons/menu/zoom-out.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M10.5 4a6.5 6.5 0 1 0 4.1 11.5l4.2 4.2 1.4-1.4-4.2-4.2A6.5 6.5 0 0 0 10.5 4Zm0 2a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9Zm-3 3.5h6v2h-6v-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15.5 14h-.79l-.28-.27A6.471 6.471 0 0 0 16 9.5 6.5 6.5 0 1 0 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14zM7 9h5v1H7z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/migration.svg b/crates/nyaterm-app/assets/icons/migration.svg
index 3df9aabd..75333ca5 100644
--- a/crates/nyaterm-app/assets/icons/migration.svg
+++ b/crates/nyaterm-app/assets/icons/migration.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M11 4v11.2l-3.1-3.1-1.4 1.4L12 19l5.5-5.5-1.4-1.4L13 15.2V4h-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 13c0-2.45 1.76-4.47 4.08-4.91l-1.49 1.5L7 11l4-4.01L7 3 5.59 4.41l1.58 1.58v.06A7.007 7.007 0 0 0 1 13c0 3.87 3.13 7 7 7h3v-2H8c-2.76 0-5-2.24-5-5zm10 0v7h9v-7h-9zm7 5h-5v-3h5v3zM13 4h9v7h-9z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/net/delete.svg b/crates/nyaterm-app/assets/icons/net/delete.svg
index ae9c131a..0969a4dc 100644
--- a/crates/nyaterm-app/assets/icons/net/delete.svg
+++ b/crates/nyaterm-app/assets/icons/net/delete.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M9 3h6l1 2h4v2H4V5h4l1-2Zm1 6h2v8h-2V9Zm4 0h2v8h-2V9ZM7 9h2v8H7V9Zm1 11h8a1 1 0 0 0 1-1V9H7v10a1 1 0 0 0 1 1Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/net/edit.svg b/crates/nyaterm-app/assets/icons/net/edit.svg
index 85316d93..a2841f94 100644
--- a/crates/nyaterm-app/assets/icons/net/edit.svg
+++ b/crates/nyaterm-app/assets/icons/net/edit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 17.3V20h2.7l9.8-9.8-2.7-2.7L4 17.3Zm14.7-8.5c.3-.3.3-.8 0-1.1l-1.4-1.4a.8.8 0 0 0-1.1 0l-1.1 1.1 2.5 2.5 1.1-1.1Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04a.996.996 0 0 0 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/net/move.svg b/crates/nyaterm-app/assets/icons/net/move.svg
index c9887b74..11bcc0e1 100644
--- a/crates/nyaterm-app/assets/icons/net/move.svg
+++ b/crates/nyaterm-app/assets/icons/net/move.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M10 4h4v2h-4V4Zm0 14h4v2h-4v-2ZM4 10h2v4H4v-4Zm14 0h2v4h-2v-4Zm-7-1 4 4-4 4v-3H7v-2h4V9Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 6h-8l-2-2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm-6 12v-3h-4v-4h4V8l5 5-5 5z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/network.svg b/crates/nyaterm-app/assets/icons/network.svg
index d5eee3aa..55c6883b 100644
--- a/crates/nyaterm-app/assets/icons/network.svg
+++ b/crates/nyaterm-app/assets/icons/network.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="4" width="6" height="6" rx="1.5"/><rect x="14" y="4" width="6" height="6" rx="1.5"/><rect x="4" y="14" width="6" height="6" rx="1.5"/><rect x="14" y="14" width="6" height="6" rx="1.5"/><path d="M10 7h4"/><path d="M7 10v4"/><path d="M17 10v4"/><path d="M10 17h4"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13 22h8v-7h-3v-4h-5V9h3V2H8v7h3v2H6v4H3v7h8v-7H8v-2h8v2h-3z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/pin.svg b/crates/nyaterm-app/assets/icons/pin.svg
index f12ed5d4..568580e1 100644
--- a/crates/nyaterm-app/assets/icons/pin.svg
+++ b/crates/nyaterm-app/assets/icons/pin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8.2 3h7.6l-1.1 6.2 3.8 3.8-1.4 1.4-3.7-3.7L11 13.1V20l-1 1-1-1v-6.9l-2.4-2.4-3.7 3.7L1.5 13l3.8-3.8L4.2 3h4Zm-1.6 2 .7 4.8 2.7 2.7 2.7-2.7.7-4.8H6.6Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M16 9V4h1c.55 0 1-.45 1-1s-.45-1-1-1H7c-.55 0-1 .45-1 1s.45 1 1 1h1v5c0 1.66-1.34 3-3 3v2h5.97v7l1 1 1-1v-7H19v-2c-1.66 0-3-1.34-3-3z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/processes.svg b/crates/nyaterm-app/assets/icons/processes.svg
index c80b387f..86d6ff68 100644
--- a/crates/nyaterm-app/assets/icons/processes.svg
+++ b/crates/nyaterm-app/assets/icons/processes.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M9 6h11"/><path d="M9 12h11"/><path d="M9 18h11"/><circle cx="5" cy="6" r="1"/><circle cx="5" cy="12" r="1"/><circle cx="5" cy="18" r="1"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 5v14H5V5h14m1.1-2H3.9c-.5 0-.9.4-.9.9v16.2c0 .4.4.9.9.9h16.2c.4 0 .9-.5.9-.9V3.9c0-.5-.5-.9-.9-.9zM11 7h6v2h-6V7zm0 4h6v2h-6v-2zm0 4h6v2h-6zM7 7h2v2H7zm0 4h2v2H7zm0 4h2v2H7z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/quote.svg b/crates/nyaterm-app/assets/icons/quote.svg
index ac2847a8..9d8fa8b4 100644
--- a/crates/nyaterm-app/assets/icons/quote.svg
+++ b/crates/nyaterm-app/assets/icons/quote.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M3 21c3.3 0 6-2.7 6-6V5H3v8h4c0 2.7-1.3 4-4 4v4Zm12 0c3.3 0 6-2.7 6-6V5h-6v8h4c0 2.7-1.3 4-4 4v4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 17h3l2-4V7H5v6h3zm8 0h3l2-4V7h-6v6h3z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/record.svg b/crates/nyaterm-app/assets/icons/record.svg
index 18565709..d91ccfd9 100644
--- a/crates/nyaterm-app/assets/icons/record.svg
+++ b/crates/nyaterm-app/assets/icons/record.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="7"/><circle cx="12" cy="12" r="2.8" fill="currentColor" stroke="none"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><circle cx="12" cy="12" r="8"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/resources.svg b/crates/nyaterm-app/assets/icons/resources.svg
index 2a2478fe..7caf14e7 100644
--- a/crates/nyaterm-app/assets/icons/resources.svg
+++ b/crates/nyaterm-app/assets/icons/resources.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M5 19V5"/><path d="M19 19V5"/><path d="M8 17v-5"/><path d="M12 17V7"/><path d="M16 17v-8"/><path d="M4 19h16"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 4H4c-1.1 0-2 .9-2 2v3h2V6h16v3h2V6c0-1.1-.9-2-2-2zm0 14H4v-3H2v3c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2v-3h-2v3z"/><path d="M14.89 7.55c-.34-.68-1.45-.68-1.79 0L10 13.76l-1.11-2.21A.988.988 0 0 0 8 11H2v2h5.38l1.72 3.45c.18.34.52.55.9.55s.72-.21.89-.55L14 10.24l1.11 2.21c.17.34.51.55.89.55h6v-2h-5.38l-1.73-3.45z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/send.svg b/crates/nyaterm-app/assets/icons/send.svg
index d61a6fda..b6786781 100644
--- a/crates/nyaterm-app/assets/icons/send.svg
+++ b/crates/nyaterm-app/assets/icons/send.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M21 3 10 14"/><path d="m21 3-7 18-4-7-7-4 18-7Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M2.01 21 23 12 2.01 3 2 10l15 2-15 2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/session/disconnect.svg b/crates/nyaterm-app/assets/icons/session/disconnect.svg
index a22580a4..0ea35879 100644
--- a/crates/nyaterm-app/assets/icons/session/disconnect.svg
+++ b/crates/nyaterm-app/assets/icons/session/disconnect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M17 7h-4v2h4a3 3 0 0 1 0 6h-4v2h4a5 5 0 0 0 0-10Zm-6 0H7a5 5 0 0 0 0 10h4v-2H7a3 3 0 0 1 0-6h4V7Zm-1 4h4v2h-4v-2Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17 7h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1 0 1.43-.98 2.63-2.31 2.98l1.46 1.46C20.88 15.61 22 13.95 22 12c0-2.76-2.24-5-5-5zm-1 4h-2.19l2 2H16zM2 4.27l3.11 3.11A4.991 4.991 0 0 0 2 12c0 2.76 2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1 0-1.59 1.21-2.9 2.76-3.07L8.73 11H8v2h2.73L13 15.27V17h1.73l4.01 4L20 19.74 3.27 3 2 4.27z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/session/more.svg b/crates/nyaterm-app/assets/icons/session/more.svg
index 86531ca6..afb392c8 100644
--- a/crates/nyaterm-app/assets/icons/session/more.svg
+++ b/crates/nyaterm-app/assets/icons/session/more.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><circle cx="6" cy="12" r="2"/><circle cx="12" cy="12" r="2"/><circle cx="18" cy="12" r="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/session/reconnect.svg b/crates/nyaterm-app/assets/icons/session/reconnect.svg
index 8b666792..217df885 100644
--- a/crates/nyaterm-app/assets/icons/session/reconnect.svg
+++ b/crates/nyaterm-app/assets/icons/session/reconnect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12 6V3L8 7l4 4V8c2.76 0 5 2.24 5 5a5 5 0 0 1-8.66 3.5l-1.42 1.42A7 7 0 0 0 19 13c0-3.87-3.13-7-7-7Zm-5 5a5 5 0 0 1 8.66-3.5l1.42-1.42A7 7 0 0 0 5 13c0 3.87 3.13 7 7 7v3l4-4-4-4v3c-2.76 0-5-2.24-5-5Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17.65 6.35A7.958 7.958 0 0 0 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08A5.99 5.99 0 0 1 12 18c-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/session/record.svg b/crates/nyaterm-app/assets/icons/session/record.svg
index 23bcb539..d91ccfd9 100644
--- a/crates/nyaterm-app/assets/icons/session/record.svg
+++ b/crates/nyaterm-app/assets/icons/session/record.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><circle cx="12" cy="12" r="6"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><circle cx="12" cy="12" r="8"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/session/rename.svg b/crates/nyaterm-app/assets/icons/session/rename.svg
index f64ee8be..a4fa4478 100644
--- a/crates/nyaterm-app/assets/icons/session/rename.svg
+++ b/crates/nyaterm-app/assets/icons/session/rename.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25Zm17.71-10.04a1 1 0 0 0 0-1.41l-2.51-2.51a1 1 0 0 0-1.41 0l-1.83 1.83 3.75 3.75 2-1.66Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M18.41 5.8 17.2 4.59c-.78-.78-2.05-.78-2.83 0l-2.68 2.68L3 15.96V20h4.04l8.74-8.74 2.63-2.63c.79-.78.79-2.05 0-2.83zM6.21 18H5v-1.21l8.66-8.66 1.21 1.21L6.21 18zM11 20l4-4h6v4H11z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/session/save.svg b/crates/nyaterm-app/assets/icons/session/save.svg
index 19015da7..b672e6b2 100644
--- a/crates/nyaterm-app/assets/icons/session/save.svg
+++ b/crates/nyaterm-app/assets/icons/session/save.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M17 3H7a2 2 0 0 0-2 2v14l7-3 7 3V5a2 2 0 0 0-2-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17 3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2V7l-4-4zm-5 16c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm3-10H5V5h10v4z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/session/stop.svg b/crates/nyaterm-app/assets/icons/session/stop.svg
index 5757171a..48d3f2d7 100644
--- a/crates/nyaterm-app/assets/icons/session/stop.svg
+++ b/crates/nyaterm-app/assets/icons/session/stop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M6 6h12v12H6z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 6h12v12H6z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/sessions.svg b/crates/nyaterm-app/assets/icons/sessions.svg
index e9dfd234..f39e2a7e 100644
--- a/crates/nyaterm-app/assets/icons/sessions.svg
+++ b/crates/nyaterm-app/assets/icons/sessions.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="5" width="16" height="14" rx="2"/><path d="M8 9h8"/><path d="M8 13h5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/settings.svg b/crates/nyaterm-app/assets/icons/settings.svg
index 0c704d08..f255a580 100644
--- a/crates/nyaterm-app/assets/icons/settings.svg
+++ b/crates/nyaterm-app/assets/icons/settings.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M12 3.5h0a2 2 0 0 1 1.9 1.4l.3 1.1a7 7 0 0 1 1.3.8l1.1-.3a2 2 0 0 1 2.3.9h0a2 2 0 0 1-.4 2.5l-.8.8a7 7 0 0 1 0 1.6l.8.8a2 2 0 0 1 .4 2.5h0a2 2 0 0 1-2.3.9l-1.1-.3a7 7 0 0 1-1.3.8l-.3 1.1a2 2 0 0 1-1.9 1.4h0a2 2 0 0 1-1.9-1.4L9.8 18a7 7 0 0 1-1.3-.8l-1.1.3a2 2 0 0 1-2.3-.9h0a2 2 0 0 1 .4-2.5l.8-.8a7 7 0 0 1 0-1.6l-.8-.8a2 2 0 0 1-.4-2.5h0a2 2 0 0 1 2.3-.9l1.1.3A7 7 0 0 1 9.8 6l.3-1.1A2 2 0 0 1 12 3.5Z"/><circle cx="12" cy="12" r="2.8"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19.14 12.94c.04-.3.06-.61.06-.94 0-.32-.02-.64-.07-.94l2.03-1.58a.49.49 0 0 0 .12-.61l-1.92-3.32a.488.488 0 0 0-.59-.22l-2.39.96c-.5-.38-1.03-.7-1.62-.94l-.36-2.54a.484.484 0 0 0-.48-.41h-3.84c-.24 0-.43.17-.47.41l-.36 2.54c-.59.24-1.13.57-1.62.94l-2.39-.96c-.22-.08-.47 0-.59.22L2.74 8.87c-.12.21-.08.47.12.61l2.03 1.58c-.05.3-.09.63-.09.94s.02.64.07.94l-2.03 1.58a.49.49 0 0 0-.12.61l1.92 3.32c.12.22.37.29.59.22l2.39-.96c.5.38 1.03.7 1.62.94l.36 2.54c.05.24.24.41.48.41h3.84c.24 0 .44-.17.47-.41l.36-2.54c.59-.24 1.13-.56 1.62-.94l2.39.96c.22.08.47 0 .59-.22l1.92-3.32c.12-.22.07-.47-.12-.61l-2.01-1.58zM12 15.6c-1.98 0-3.6-1.62-3.6-3.6s1.62-3.6 3.6-3.6 3.6 1.62 3.6 3.6-1.62 3.6-3.6 3.6z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/sync.svg b/crates/nyaterm-app/assets/icons/sync.svg
index 497eb6b0..0b5b51ec 100644
--- a/crates/nyaterm-app/assets/icons/sync.svg
+++ b/crates/nyaterm-app/assets/icons/sync.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M20 11a8 8 0 0 0-14.6-4.5L4 8"/><path d="M4 4v4h4"/><path d="M4 13a8 8 0 0 0 14.6 4.5L20 16"/><path d="M20 20v-4h-4"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19.35 10.04A7.49 7.49 0 0 0 12 4C9.11 4 6.6 5.64 5.35 8.04A5.994 5.994 0 0 0 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/transfer/clear-all.svg b/crates/nyaterm-app/assets/icons/transfer/clear-all.svg
index 395a2960..8aab88ac 100644
--- a/crates/nyaterm-app/assets/icons/transfer/clear-all.svg
+++ b/crates/nyaterm-app/assets/icons/transfer/clear-all.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M7 4h10l1 2h4v2H2V6h4l1-2Zm1 6h2v8h2v-8h2v8h2v-8h2v9a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2v-9h2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15 16h4v2h-4zm0-8h7v2h-7zm0 4h6v2h-6zM3 18c0 1.1.9 2 2 2h6c1.1 0 2-.9 2-2V8H3v10zM14 5h-3l-1-1H6L5 5H2v2h12z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/transfer/pause.svg b/crates/nyaterm-app/assets/icons/transfer/pause.svg
index 917d6006..c20e1563 100644
--- a/crates/nyaterm-app/assets/icons/transfer/pause.svg
+++ b/crates/nyaterm-app/assets/icons/transfer/pause.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M7 5h4v14H7V5Zm6 0h4v14h-4V5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/transfer/play.svg b/crates/nyaterm-app/assets/icons/transfer/play.svg
index 564a5e05..c5e1a4c4 100644
--- a/crates/nyaterm-app/assets/icons/transfer/play.svg
+++ b/crates/nyaterm-app/assets/icons/transfer/play.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7L8 5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M8 5v14l11-7z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/transfer/playlist-remove.svg b/crates/nyaterm-app/assets/icons/transfer/playlist-remove.svg
index 8bb85c17..99454437 100644
--- a/crates/nyaterm-app/assets/icons/transfer/playlist-remove.svg
+++ b/crates/nyaterm-app/assets/icons/transfer/playlist-remove.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 6h11v2H4V6Zm0 5h9v2H4v-2Zm0 5h7v2H4v-2Zm12.7-4.7L19 13.6l2.3-2.3 1.4 1.4-2.3 2.3 2.3 2.3-1.4 1.4-2.3-2.3-2.3 2.3-1.4-1.4 2.3-2.3-2.3-2.3 1.4-1.4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M14 10H3v2h11v-2zm0-4H3v2h11V6zM3 16h7v-2H3v2zm11.41 6L17 19.41 19.59 22 21 20.59 18.41 18 21 15.41 19.59 14 17 16.59 14.41 14 13 15.41 15.59 18 13 20.59 14.41 22z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/transfer/stop.svg b/crates/nyaterm-app/assets/icons/transfer/stop.svg
index 8f245fe7..a968282c 100644
--- a/crates/nyaterm-app/assets/icons/transfer/stop.svg
+++ b/crates/nyaterm-app/assets/icons/transfer/stop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M7 7h10v10H7V7Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM4 12c0-4.42 3.58-8 8-8 1.85 0 3.55.63 4.9 1.69L5.69 16.9A7.902 7.902 0 0 1 4 12zm8 8c-1.85 0-3.55-.63-4.9-1.69L18.31 7.1A7.902 7.902 0 0 1 20 12c0 4.42-3.58 8-8 8z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/translation.svg b/crates/nyaterm-app/assets/icons/translation.svg
index 9e8557ef..9b806048 100644
--- a/crates/nyaterm-app/assets/icons/translation.svg
+++ b/crates/nyaterm-app/assets/icons/translation.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 5h9v2H9.8l-.5 1.5H12v2H8.8L7.5 15H5.3l1.4-4.5H4V5Zm11 4h5v2h-1.6l-1.7 8h-2.2l1.7-8H15V9Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="m12.87 15.07-2.54-2.51.03-.03A17.52 17.52 0 0 0 14.07 6H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7 1.62-4.33L19.12 17h-3.24z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/view-compact.svg b/crates/nyaterm-app/assets/icons/view-compact.svg
index 8d83dc99..4beb2cd9 100644
--- a/crates/nyaterm-app/assets/icons/view-compact.svg
+++ b/crates/nyaterm-app/assets/icons/view-compact.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 5h3v3H4V5Zm5 0h11v3H9V5Zm-5 6h3v3H4v-3Zm5 0h11v3H9v-3Zm-5 6h3v3H4v-3Zm5 0h11v3H9v-3Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M4 10.5c-.83 0-1.5.67-1.5 1.5s.67 1.5 1.5 1.5 1.5-.67 1.5-1.5-.67-1.5-1.5-1.5zm0-6c-.83 0-1.5.67-1.5 1.5S3.17 7.5 4 7.5 5.5 6.83 5.5 6 4.83 4.5 4 4.5zm0 12c-.83 0-1.5.68-1.5 1.5s.68 1.5 1.5 1.5 1.5-.68 1.5-1.5-.67-1.5-1.5-1.5zM7 19h14v-2H7v2zm0-6h14v-2H7v2zm0-8v2h14V5H7z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/view-grid.svg b/crates/nyaterm-app/assets/icons/view-grid.svg
index 5917331a..b732680d 100644
--- a/crates/nyaterm-app/assets/icons/view-grid.svg
+++ b/crates/nyaterm-app/assets/icons/view-grid.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M4 4h7v7H4V4Zm9 0h7v7h-7V4ZM4 13h7v7H4v-7Zm9 0h7v7h-7v-7Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M3 3v8h8V3H3zm6 6H5V5h4v4zm-6 4v8h8v-8H3zm6 6H5v-4h4v4zm4-16v8h8V3h-8zm6 6h-4V5h4v4zm-6 4v8h8v-8h-8zm6 6h-4v-4h4v4z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/view-list.svg b/crates/nyaterm-app/assets/icons/view-list.svg
index 9fa9d2a5..0144a900 100644
--- a/crates/nyaterm-app/assets/icons/view-list.svg
+++ b/crates/nyaterm-app/assets/icons/view-list.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5 5h14v2H5V5Zm0 6h14v2H5v-2Zm0 6h14v2H5v-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 14h4v-4H3v4zm0 5h4v-4H3v4zM3 9h4V5H3v4zm5 5h13v-4H8v4zm0 5h13v-4H8v4zM8 5v4h13V5H8z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/warning.svg b/crates/nyaterm-app/assets/icons/warning.svg
new file mode 100644
index 00000000..05fbc02c
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 5.99 19.53 19H4.47L12 5.99M12 2 1 21h22L12 2z"/><path d="M13 16h-2v2h2zm0-6h-2v5h2z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/window/close.svg b/crates/nyaterm-app/assets/icons/window/close.svg
index 9fea7d64..a1c97efd 100644
--- a/crates/nyaterm-app/assets/icons/window/close.svg
+++ b/crates/nyaterm-app/assets/icons/window/close.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M6.4 5 12 10.6 17.6 5 19 6.4 13.4 12l5.6 5.6-1.4 1.4-5.6-5.6L6.4 19 5 17.6l5.6-5.6L5 6.4 6.4 5Z"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M2.58859 2.71569L2.64645 2.64645C2.82001 2.47288 3.08944 2.4536 3.28431 2.58859L3.35355 2.64645L8 7.293L12.6464 2.64645C12.8417 2.45118 13.1583 2.45118 13.3536 2.64645C13.5488 2.84171 13.5488 3.15829 13.3536 3.35355L8.707 8L13.3536 12.6464C13.5271 12.82 13.5464 13.0894 13.4114 13.2843L13.3536 13.3536C13.18 13.5271 12.9106 13.5464 12.7157 13.4114L12.6464 13.3536L8 8.707L3.35355 13.3536C3.15829 13.5488 2.84171 13.5488 2.64645 13.3536C2.45118 13.1583 2.45118 12.8417 2.64645 12.6464L7.293 8L2.64645 3.35355C2.47288 3.17999 2.4536 2.91056 2.58859 2.71569L2.64645 2.64645L2.58859 2.71569Z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/window/maximize.svg b/crates/nyaterm-app/assets/icons/window/maximize.svg
index 13209481..bc0f29a9 100644
--- a/crates/nyaterm-app/assets/icons/window/maximize.svg
+++ b/crates/nyaterm-app/assets/icons/window/maximize.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5 5h14v14H5V5Zm2 2v10h10V7H7Z"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M2 4.5C2 3.11929 3.11929 2 4.5 2H11.5C12.8807 2 14 3.11929 14 4.5V11.5C14 12.8807 12.8807 14 11.5 14H4.5C3.11929 14 2 12.8807 2 11.5V4.5ZM4.5 3C3.67157 3 3 3.67157 3 4.5V11.5C3 12.3284 3.67157 13 4.5 13H11.5C12.3284 13 13 12.3284 13 11.5V4.5C13 3.67157 12.3284 3 11.5 3H4.5Z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/window/minimize.svg b/crates/nyaterm-app/assets/icons/window/minimize.svg
index 7ff8e8f3..ff59c67a 100644
--- a/crates/nyaterm-app/assets/icons/window/minimize.svg
+++ b/crates/nyaterm-app/assets/icons/window/minimize.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5 11h14v2H5z"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M3 7.5C3 7.22386 3.22386 7 3.5 7H12.5C12.7761 7 13 7.22386 13 7.5C13 7.77614 12.7761 8 12.5 8H3.5C3.22386 8 3 7.77614 3 7.5Z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/window/restore.svg b/crates/nyaterm-app/assets/icons/window/restore.svg
index 8d05edfc..efd9cebb 100644
--- a/crates/nyaterm-app/assets/icons/window/restore.svg
+++ b/crates/nyaterm-app/assets/icons/window/restore.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8 5h11v11h-2V7H8V5ZM5 8h11v11H5V8Zm2 2v7h7v-7H7Z"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M5.08496 4C5.29088 3.4174 5.8465 3 6.49961 3H9.99961C11.6565 3 12.9996 4.34315 12.9996 6V9.5C12.9996 10.1531 12.5822 10.7087 11.9996 10.9146V6C11.9996 4.89543 11.1042 4 9.99961 4H5.08496ZM4.5 5H9.5C10.3284 5 11 5.67157 11 6.5V11.5C11 12.3284 10.3284 13 9.5 13H4.5C3.67157 13 3 12.3284 3 11.5V6.5C3 5.67157 3.67157 5 4.5 5ZM4.5 6C4.22386 6 4 6.22386 4 6.5V11.5C4 11.7761 4.22386 12 4.5 12H9.5C9.77614 12 10 11.7761 10 11.5V6.5C10 6.22386 9.77614 6 9.5 6H4.5Z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/assets/icons/workspace.svg b/crates/nyaterm-app/assets/icons/workspace.svg
new file mode 100644
index 00000000..16822956
--- /dev/null
+++ b/crates/nyaterm-app/assets/icons/workspace.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 13h8V3H3v10zm0 8h8v-6H3v6zm10 0h8V11h-8v10zm0-18v6h8V3h-8z"/></svg>
\ No newline at end of file
diff --git a/crates/nyaterm-app/build.rs b/crates/nyaterm-app/build.rs
new file mode 100644
index 00000000..fadc68c4
--- /dev/null
+++ b/crates/nyaterm-app/build.rs
@@ -0,0 +1,7 @@
+fn main() {
+    // `rust_embed` expands to `include_bytes!` for the files that exist when the
+    // macro runs, so cargo only tracks those paths. Without this, adding or
+    // removing an asset leaves a stale `EmbeddedAssets` and the new icon 404s at
+    // runtime until something else forces `assets.rs` to recompile.
+    println!("cargo:rerun-if-changed=assets");
+}
diff --git a/crates/nyaterm-app/src/assets.rs b/crates/nyaterm-app/src/assets.rs
index 2c7fb12f..506c70f0 100644
--- a/crates/nyaterm-app/src/assets.rs
+++ b/crates/nyaterm-app/src/assets.rs
@@ -1,279 +1,129 @@
 use std::borrow::Cow;
 
 use gpui::{AssetSource, Result, SharedString};
+use rust_embed::RustEmbed;
+
+/// Bundled UI assets, addressed by the same paths the desktop crate passes to
+/// `svg()` and `img()`.
+///
+/// The directory prefix encodes how an asset is meant to be painted, because the
+/// two GPUI elements are not interchangeable:
+///
+/// * `icons/**` — monochrome. `svg()` rasterizes to an alpha mask and keeps only
+///   the coverage channel, so the file's own paints are discarded and the color
+///   comes entirely from `.text_color()`.
+/// * `color/**` — full color. `img()` keeps the rasterized pixels, and the asset
+///   cannot be tinted.
+///
+/// Invariant: nothing under `icons/` may contain a raster `<image>` payload.
+/// GPUI builds resvg without the `raster-images` feature, so embedded bitmaps are
+/// skipped silently — the icon renders as nothing at all rather than failing.
+/// `color/**` carries real `.png` files instead of base64-in-SVG for that reason.
+#[derive(RustEmbed)]
+#[folder = "assets/"]
+#[include = "icons/**/*.svg"]
+#[include = "color/**/*.svg"]
+#[include = "color/**/*.png"]
+pub struct EmbeddedAssets;
 
 /// Bundled SVG assets for the native shell (activity icons, logo, connection icons).
 pub struct NyaTermAssets;
 
-const ICON_FILES: &[&str] = &[
-    "icons/logo.svg",
-    "icons/files.svg",
-    "icons/network.svg",
-    "icons/auth.svg",
-    "icons/sync.svg",
-    "icons/settings.svg",
-    "icons/connections.svg",
-    "icons/ai.svg",
-    "icons/sessions.svg",
-    "icons/history.svg",
-    "icons/resources.svg",
-    "icons/processes.svg",
-    "icons/docker.svg",
-    "icons/commands.svg",
-    "icons/send.svg",
-    "icons/record.svg",
-    "icons/lock.svg",
-    "icons/chevron-down.svg",
-    "icons/chevron-up.svg",
-    "icons/check.svg",
-    "icons/copy.svg",
-    "icons/quote.svg",
-    "icons/eye.svg",
-    "icons/import.svg",
-    "icons/import/xshell.svg",
-    "icons/import/mobaxterm.svg",
-    "icons/import/windterm.svg",
-    "icons/pin.svg",
-    "icons/view-compact.svg",
-    "icons/view-grid.svg",
-    "icons/view-list.svg",
-    "icons/window/minimize.svg",
-    "icons/window/maximize.svg",
-    "icons/window/restore.svg",
-    "icons/window/close.svg",
-    "icons/session/more.svg",
-    "icons/session/save.svg",
-    "icons/session/stop.svg",
-    "icons/session/record.svg",
-    "icons/session/disconnect.svg",
-    "icons/session/reconnect.svg",
-    "icons/session/rename.svg",
-    "icons/translation.svg",
-    "icons/migration.svg",
-    "icons/conn/server.svg",
-    "icons/conn/terminal.svg",
-    "icons/conn/telnet.svg",
-    "icons/conn/serial.svg",
-    "icons/conn/linux.svg",
-    "icons/conn/ubuntu.svg",
-    "icons/conn/debian.svg",
-    "icons/conn/apple.svg",
-    "icons/conn/windows.svg",
-    "icons/conn/docker.svg",
-    "icons/conn/python.svg",
-    "icons/conn/github.svg",
-    "icons/conn/folder.svg",
-    "icons/conn/file.svg",
-    "icons/conn/connect.svg",
-    "icons/conn/symlink.svg",
-    "icons/net/move.svg",
-    "icons/net/delete.svg",
-    "icons/net/edit.svg",
-    "icons/conn/sort.svg",
-    "icons/conn/more.svg",
-    "icons/conn/flash.svg",
-    "icons/conn/add.svg",
-    "icons/fe/new-file.svg",
-    "icons/fe/new-folder.svg",
-    "icons/fe/upload.svg",
-    "icons/fe/upload-folder.svg",
-    "icons/fe/download.svg",
-    "icons/fe/delete.svg",
-    "icons/fe/up.svg",
-    "icons/fe/refresh.svg",
-    "icons/fe/search.svg",
-    "icons/fe/back.svg",
-    "icons/fe/forward.svg",
-    "icons/fe/star.svg",
-    "icons/fe/star-outline.svg",
-    "icons/fe/sync.svg",
-    "icons/fe/paste.svg",
-    "icons/fe/bookmark-remove.svg",
-    "icons/transfer/clear-all.svg",
-    "icons/transfer/pause.svg",
-    "icons/transfer/play.svg",
-    "icons/transfer/playlist-remove.svg",
-    "icons/transfer/stop.svg",
-    "icons/menu/article.svg",
-    "icons/menu/book.svg",
-    "icons/menu/broadcast.svg",
-    "icons/menu/export.svg",
-    "icons/menu/fit.svg",
-    "icons/menu/horizontal.svg",
-    "icons/menu/info.svg",
-    "icons/menu/menu.svg",
-    "icons/menu/palette.svg",
-    "icons/menu/reset.svg",
-    "icons/menu/sidebar.svg",
-    "icons/menu/split.svg",
-    "icons/menu/update.svg",
-    "icons/menu/vertical.svg",
-    "icons/menu/zoom-in.svg",
-    "icons/menu/zoom-out.svg",
-    "icons/ai/history.svg",
-    "icons/ai/settings.svg",
-    "icons/ai/new.svg",
-    "icons/ai/send.svg",
-    "icons/ai/stop.svg",
-    "icons/ai/search.svg",
-    "icons/ai/exec-confirm.svg",
-    "icons/ai/exec-smart.svg",
-    "icons/ai/exec-auto.svg",
-];
-
-fn icon_bytes(path: &str) -> Option<&'static [u8]> {
-    match path {
-        "icons/logo.svg" => Some(include_bytes!("../assets/icons/logo.svg")),
-        "icons/files.svg" => Some(include_bytes!("../assets/icons/files.svg")),
-        "icons/network.svg" => Some(include_bytes!("../assets/icons/network.svg")),
-        "icons/auth.svg" => Some(include_bytes!("../assets/icons/auth.svg")),
-        "icons/sync.svg" => Some(include_bytes!("../assets/icons/sync.svg")),
-        "icons/settings.svg" => Some(include_bytes!("../assets/icons/settings.svg")),
-        "icons/connections.svg" => Some(include_bytes!("../assets/icons/connections.svg")),
-        "icons/ai.svg" => Some(include_bytes!("../assets/icons/ai.svg")),
-        "icons/sessions.svg" => Some(include_bytes!("../assets/icons/sessions.svg")),
-        "icons/history.svg" => Some(include_bytes!("../assets/icons/history.svg")),
-        "icons/resources.svg" => Some(include_bytes!("../assets/icons/resources.svg")),
-        "icons/processes.svg" => Some(include_bytes!("../assets/icons/processes.svg")),
-        "icons/docker.svg" => Some(include_bytes!("../assets/icons/docker.svg")),
-        "icons/commands.svg" => Some(include_bytes!("../assets/icons/commands.svg")),
-        "icons/send.svg" => Some(include_bytes!("../assets/icons/send.svg")),
-        "icons/record.svg" => Some(include_bytes!("../assets/icons/record.svg")),
-        "icons/lock.svg" => Some(include_bytes!("../assets/icons/lock.svg")),
-        "icons/chevron-down.svg" => Some(include_bytes!("../assets/icons/chevron-down.svg")),
-        "icons/chevron-up.svg" => Some(include_bytes!("../assets/icons/chevron-up.svg")),
-        "icons/check.svg" => Some(include_bytes!("../assets/icons/check.svg")),
-        "icons/copy.svg" => Some(include_bytes!("../assets/icons/copy.svg")),
-        "icons/quote.svg" => Some(include_bytes!("../assets/icons/quote.svg")),
-        "icons/eye.svg" => Some(include_bytes!("../assets/icons/eye.svg")),
-        "icons/import.svg" => Some(include_bytes!("../assets/icons/import.svg")),
-        "icons/import/xshell.svg" => Some(include_bytes!("../assets/icons/import/xshell.svg")),
-        "icons/import/mobaxterm.svg" => {
-            Some(include_bytes!("../assets/icons/import/mobaxterm.svg"))
-        }
-        "icons/import/windterm.svg" => Some(include_bytes!("../assets/icons/import/windterm.svg")),
-        "icons/pin.svg" => Some(include_bytes!("../assets/icons/pin.svg")),
-        "icons/view-compact.svg" => Some(include_bytes!("../assets/icons/view-compact.svg")),
-        "icons/view-grid.svg" => Some(include_bytes!("../assets/icons/view-grid.svg")),
-        "icons/view-list.svg" => Some(include_bytes!("../assets/icons/view-list.svg")),
-        "icons/window/minimize.svg" => Some(include_bytes!("../assets/icons/window/minimize.svg")),
-        "icons/window/maximize.svg" => Some(include_bytes!("../assets/icons/window/maximize.svg")),
-        "icons/window/restore.svg" => Some(include_bytes!("../assets/icons/window/restore.svg")),
-        "icons/window/close.svg" => Some(include_bytes!("../assets/icons/window/close.svg")),
-        "icons/session/more.svg" => Some(include_bytes!("../assets/icons/session/more.svg")),
-        "icons/session/save.svg" => Some(include_bytes!("../assets/icons/session/save.svg")),
-        "icons/session/stop.svg" => Some(include_bytes!("../assets/icons/session/stop.svg")),
-        "icons/session/record.svg" => Some(include_bytes!("../assets/icons/session/record.svg")),
-        "icons/session/disconnect.svg" => {
-            Some(include_bytes!("../assets/icons/session/disconnect.svg"))
-        }
-        "icons/session/reconnect.svg" => {
-            Some(include_bytes!("../assets/icons/session/reconnect.svg"))
-        }
-        "icons/session/rename.svg" => Some(include_bytes!("../assets/icons/session/rename.svg")),
-        "icons/translation.svg" => Some(include_bytes!("../assets/icons/translation.svg")),
-        "icons/migration.svg" => Some(include_bytes!("../assets/icons/migration.svg")),
-        "icons/conn/server.svg" => Some(include_bytes!("../assets/icons/conn/server.svg")),
-        "icons/conn/terminal.svg" => Some(include_bytes!("../assets/icons/conn/terminal.svg")),
-        "icons/conn/telnet.svg" => Some(include_bytes!("../assets/icons/conn/telnet.svg")),
-        "icons/conn/serial.svg" => Some(include_bytes!("../assets/icons/conn/serial.svg")),
-        "icons/conn/linux.svg" => Some(include_bytes!("../assets/icons/conn/linux.svg")),
-        "icons/conn/ubuntu.svg" => Some(include_bytes!("../assets/icons/conn/ubuntu.svg")),
-        "icons/conn/debian.svg" => Some(include_bytes!("../assets/icons/conn/debian.svg")),
-        "icons/conn/apple.svg" => Some(include_bytes!("../assets/icons/conn/apple.svg")),
-        "icons/conn/windows.svg" => Some(include_bytes!("../assets/icons/conn/windows.svg")),
-        "icons/conn/docker.svg" => Some(include_bytes!("../assets/icons/conn/docker.svg")),
-        "icons/conn/python.svg" => Some(include_bytes!("../assets/icons/conn/python.svg")),
-        "icons/conn/github.svg" => Some(include_bytes!("../assets/icons/conn/github.svg")),
-        "icons/conn/folder.svg" => Some(include_bytes!("../assets/icons/conn/folder.svg")),
-        "icons/conn/file.svg" => Some(include_bytes!("../assets/icons/conn/file.svg")),
-        "icons/conn/connect.svg" => Some(include_bytes!("../assets/icons/conn/connect.svg")),
-        "icons/conn/symlink.svg" => Some(include_bytes!("../assets/icons/conn/symlink.svg")),
-        "icons/net/move.svg" => Some(include_bytes!("../assets/icons/net/move.svg")),
-        "icons/net/delete.svg" => Some(include_bytes!("../assets/icons/net/delete.svg")),
-        "icons/net/edit.svg" => Some(include_bytes!("../assets/icons/net/edit.svg")),
-        "icons/conn/sort.svg" => Some(include_bytes!("../assets/icons/conn/sort.svg")),
-        "icons/conn/more.svg" => Some(include_bytes!("../assets/icons/conn/more.svg")),
-        "icons/conn/flash.svg" => Some(include_bytes!("../assets/icons/conn/flash.svg")),
-        "icons/conn/add.svg" => Some(include_bytes!("../assets/icons/conn/add.svg")),
-        "icons/fe/new-file.svg" => Some(include_bytes!("../assets/icons/fe/new-file.svg")),
-        "icons/fe/new-folder.svg" => Some(include_bytes!("../assets/icons/fe/new-folder.svg")),
-        "icons/fe/upload.svg" => Some(include_bytes!("../assets/icons/fe/upload.svg")),
-        "icons/fe/upload-folder.svg" => {
-            Some(include_bytes!("../assets/icons/fe/upload-folder.svg"))
-        }
-        "icons/fe/download.svg" => Some(include_bytes!("../assets/icons/fe/download.svg")),
-        "icons/fe/delete.svg" => Some(include_bytes!("../assets/icons/fe/delete.svg")),
-        "icons/fe/up.svg" => Some(include_bytes!("../assets/icons/fe/up.svg")),
-        "icons/fe/refresh.svg" => Some(include_bytes!("../assets/icons/fe/refresh.svg")),
-        "icons/fe/search.svg" => Some(include_bytes!("../assets/icons/fe/search.svg")),
-        "icons/fe/back.svg" => Some(include_bytes!("../assets/icons/fe/back.svg")),
-        "icons/fe/forward.svg" => Some(include_bytes!("../assets/icons/fe/forward.svg")),
-        "icons/fe/star.svg" => Some(include_bytes!("../assets/icons/fe/star.svg")),
-        "icons/fe/star-outline.svg" => Some(include_bytes!("../assets/icons/fe/star-outline.svg")),
-        "icons/fe/sync.svg" => Some(include_bytes!("../assets/icons/fe/sync.svg")),
-        "icons/fe/paste.svg" => Some(include_bytes!("../assets/icons/fe/paste.svg")),
-        "icons/fe/bookmark-remove.svg" => {
-            Some(include_bytes!("../assets/icons/fe/bookmark-remove.svg"))
-        }
-        "icons/transfer/clear-all.svg" => {
-            Some(include_bytes!("../assets/icons/transfer/clear-all.svg"))
-        }
-        "icons/transfer/pause.svg" => Some(include_bytes!("../assets/icons/transfer/pause.svg")),
-        "icons/transfer/play.svg" => Some(include_bytes!("../assets/icons/transfer/play.svg")),
-        "icons/transfer/playlist-remove.svg" => Some(include_bytes!(
-            "../assets/icons/transfer/playlist-remove.svg"
-        )),
-        "icons/transfer/stop.svg" => Some(include_bytes!("../assets/icons/transfer/stop.svg")),
-        "icons/menu/article.svg" => Some(include_bytes!("../assets/icons/menu/article.svg")),
-        "icons/menu/book.svg" => Some(include_bytes!("../assets/icons/menu/book.svg")),
-        "icons/menu/broadcast.svg" => Some(include_bytes!("../assets/icons/menu/broadcast.svg")),
-        "icons/menu/export.svg" => Some(include_bytes!("../assets/icons/menu/export.svg")),
-        "icons/menu/fit.svg" => Some(include_bytes!("../assets/icons/menu/fit.svg")),
-        "icons/menu/horizontal.svg" => Some(include_bytes!("../assets/icons/menu/horizontal.svg")),
-        "icons/menu/info.svg" => Some(include_bytes!("../assets/icons/menu/info.svg")),
-        "icons/menu/menu.svg" => Some(include_bytes!("../assets/icons/menu/menu.svg")),
-        "icons/menu/palette.svg" => Some(include_bytes!("../assets/icons/menu/palette.svg")),
-        "icons/menu/reset.svg" => Some(include_bytes!("../assets/icons/menu/reset.svg")),
-        "icons/menu/sidebar.svg" => Some(include_bytes!("../assets/icons/menu/sidebar.svg")),
-        "icons/menu/split.svg" => Some(include_bytes!("../assets/icons/menu/split.svg")),
-        "icons/menu/update.svg" => Some(include_bytes!("../assets/icons/menu/update.svg")),
-        "icons/menu/vertical.svg" => Some(include_bytes!("../assets/icons/menu/vertical.svg")),
-        "icons/menu/zoom-in.svg" => Some(include_bytes!("../assets/icons/menu/zoom-in.svg")),
-        "icons/menu/zoom-out.svg" => Some(include_bytes!("../assets/icons/menu/zoom-out.svg")),
-        "icons/ai/history.svg" => Some(include_bytes!("../assets/icons/ai/history.svg")),
-        "icons/ai/settings.svg" => Some(include_bytes!("../assets/icons/ai/settings.svg")),
-        "icons/ai/new.svg" => Some(include_bytes!("../assets/icons/ai/new.svg")),
-        "icons/ai/send.svg" => Some(include_bytes!("../assets/icons/ai/send.svg")),
-        "icons/ai/stop.svg" => Some(include_bytes!("../assets/icons/ai/stop.svg")),
-        "icons/ai/search.svg" => Some(include_bytes!("../assets/icons/ai/search.svg")),
-        "icons/ai/exec-confirm.svg" => Some(include_bytes!("../assets/icons/ai/exec-confirm.svg")),
-        "icons/ai/exec-smart.svg" => Some(include_bytes!("../assets/icons/ai/exec-smart.svg")),
-        "icons/ai/exec-auto.svg" => Some(include_bytes!("../assets/icons/ai/exec-auto.svg")),
-        _ => None,
-    }
-}
-
 impl AssetSource for NyaTermAssets {
     fn load(&self, path: &str) -> Result<Option<Cow<'static, [u8]>>> {
-        let normalized = path.trim_start_matches('/');
-        Ok(icon_bytes(normalized).map(|bytes| Cow::Borrowed(bytes)))
+        Ok(EmbeddedAssets::get(path.trim_start_matches('/')).map(|file| file.data))
     }
 
     fn list(&self, path: &str) -> Result<Vec<SharedString>> {
-        let normalized = path.trim_start_matches('/');
-        if normalized.is_empty()
-            || normalized == "icons"
-            || normalized == "icons/conn"
-            || normalized == "icons/fe"
-            || normalized == "icons/ai"
-            || normalized == "icons/menu"
-            || normalized == "icons/transfer"
-            || normalized == "icons/window"
+        let prefix = path.trim_start_matches('/').trim_end_matches('/');
+        Ok(EmbeddedAssets::iter()
+            .filter(|entry| {
+                prefix.is_empty()
+                    || entry
+                        .strip_prefix(prefix)
+                        .is_some_and(|rest| rest.starts_with('/'))
+            })
+            .map(|entry| SharedString::from(entry.into_owned()))
+            .collect())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// `img()` rasterizes at `SMOOTH_SVG_SCALE_FACTOR` (2.0) times the asset's
+    /// *intrinsic* size, not its display size, and `App::fetch_asset` never evicts
+    /// the result. A logo left at its authoring size of 256px would hold a 512x512
+    /// BGRA buffer (1 MB) to paint a 16px row icon.
+    const MAX_COLOR_INTRINSIC_PX: f32 = 64.0;
+
+    fn parse(path: &str, bytes: &[u8]) -> usvg::Tree {
+        usvg::Tree::from_data(bytes, &usvg::Options::default())
+            .unwrap_or_else(|err| panic!("{path} is not parseable by usvg: {err}"))
+    }
+
+    #[test]
+    fn every_embedded_svg_parses_with_a_nonzero_size() {
+        for path in EmbeddedAssets::iter().filter(|path| path.ends_with(".svg")) {
+            let file = EmbeddedAssets::get(&path).expect("iter() yielded a missing asset");
+            let size = parse(&path, &file.data).size();
+            assert!(
+                size.width() > 0.0 && size.height() > 0.0,
+                "{path} resolves to a zero size, so it would paint nothing"
+            );
+        }
+    }
+
+    #[test]
+    fn no_icon_asset_carries_a_raster_payload() {
+        fn find_raster(group: &usvg::Group, path: &str) {
+            for node in group.children() {
+                match node {
+                    usvg::Node::Image(image) => assert!(
+                        matches!(image.kind(), usvg::ImageKind::SVG(_)),
+                        "{path} embeds a raster image. GPUI builds resvg without the \
+                         `raster-images` feature, so this renders blank. Extract the \
+                         payload to a real file under color/ and paint it with img()."
+                    ),
+                    usvg::Node::Group(child) => find_raster(child, path),
+                    _ => {}
+                }
+            }
+        }
+
+        for path in EmbeddedAssets::iter().filter(|path| path.starts_with("icons/")) {
+            let file = EmbeddedAssets::get(&path).expect("iter() yielded a missing asset");
+            find_raster(parse(&path, &file.data).root(), &path);
+        }
+    }
+
+    #[test]
+    fn color_assets_stay_within_the_raster_budget() {
+        for path in EmbeddedAssets::iter()
+            .filter(|path| path.starts_with("color/") && path.ends_with(".svg"))
         {
-            Ok(ICON_FILES.iter().map(|item| (*item).into()).collect())
-        } else {
-            Ok(Vec::new())
+            let file = EmbeddedAssets::get(&path).expect("iter() yielded a missing asset");
+            let size = parse(&path, &file.data).size();
+            let largest = size.width().max(size.height());
+            assert!(
+                largest <= MAX_COLOR_INTRINSIC_PX,
+                "{path} has an intrinsic size of {largest}px; img() would hold a \
+                 {}x{} raster forever. Set width/height to {MAX_COLOR_INTRINSIC_PX}px \
+                 or less (leave viewBox alone).",
+                (largest * 2.0) as u32,
+                (largest * 2.0) as u32,
+            );
         }
+    }
+
+    #[test]
+    fn list_returns_only_entries_below_the_requested_prefix() {
+        let all = NyaTermAssets.list("").expect("list all");
+        let icons = NyaTermAssets.list("icons").expect("list icons");
+
+        assert!(!icons.is_empty(), "no icons are embedded");
+        assert!(icons.len() <= all.len());
+        assert!(icons.iter().all(|entry| entry.starts_with("icons/")));
     }
 }
diff --git a/crates/nyaterm-app/src/lib.rs b/crates/nyaterm-app/src/lib.rs
new file mode 100644
index 00000000..50cfe440
--- /dev/null
+++ b/crates/nyaterm-app/src/lib.rs
@@ -0,0 +1,7 @@
+//! Bundled assets for the NyaTerm shell.
+//!
+//! The binary is the real entry point; this library exists so the asset registry
+//! is reachable from tests and from the `icon_gallery` example, which is how a
+//! newly added icon gets proven to actually render.
+
+pub mod assets;
diff --git a/crates/nyaterm-app/src/main.rs b/crates/nyaterm-app/src/main.rs
index 1db62635..3c354aee 100644
--- a/crates/nyaterm-app/src/main.rs
+++ b/crates/nyaterm-app/src/main.rs
@@ -1,7 +1,6 @@
-mod assets;
-
 use anyhow::Context as _;
 use gpui::{App, AppContext, Application, Bounds, WindowBounds, WindowOptions, px, size};
+use nyaterm_app::assets;
 use nyaterm_core::{AppRuntime, LOG_FILE_PREFIX, LOG_FILE_SUFFIX};
 use nyaterm_desktop::AppShell;
 use tracing_appender::non_blocking::WorkerGuard;
diff --git a/crates/nyaterm-core/src/cloud_sync.rs b/crates/nyaterm-core/src/cloud_sync.rs
index b0fc5962..3c8e096a 100644
--- a/crates/nyaterm-core/src/cloud_sync.rs
+++ b/crates/nyaterm-core/src/cloud_sync.rs
@@ -2766,6 +2766,7 @@ mod tests {
             description: None,
             sort_order: 0,
             icon: None,
+            icon_auto_detect: None,
             auth: None,
             network: None,
             post_login: None,
diff --git a/crates/nyaterm-core/src/models.rs b/crates/nyaterm-core/src/models.rs
index 274f8e9e..594a7f3d 100644
--- a/crates/nyaterm-core/src/models.rs
+++ b/crates/nyaterm-core/src/models.rs
@@ -426,6 +426,14 @@ pub struct SavedConnection {
     pub sort_order: i32,
     #[serde(default)]
     pub icon: Option<String>,
+    /// Whether `icon` may be replaced by one detected from the remote system.
+    ///
+    /// `None` means "not configured", which reads as enabled only while no icon
+    /// has been chosen — see [`SavedConnection::icon_auto_detect_enabled`]. Kept
+    /// as an `Option` and skipped when empty so files round-trip unchanged
+    /// through builds that predate the field.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub icon_auto_detect: Option<bool>,
     #[serde(default)]
     pub auth: Option<ConnectionAuth>,
     #[serde(default)]
@@ -441,6 +449,16 @@ pub struct SavedConnection {
 }
 
 impl SavedConnection {
+    /// Whether the icon may be replaced by one inferred from the remote system.
+    ///
+    /// An unset flag defaults to "yes, until the user picks something", which is
+    /// what keeps auto-detection from ever overwriting a deliberate choice made
+    /// before this field existed.
+    pub fn icon_auto_detect_enabled(&self) -> bool {
+        self.icon_auto_detect
+            .unwrap_or_else(|| self.icon.as_deref().is_none_or(str::is_empty))
+    }
+
     pub fn kind_label(&self) -> &'static str {
         match self.config {
             ConnectionType::Ssh { .. } => "SSH",
@@ -1452,6 +1470,7 @@ mod tests {
             description: None,
             sort_order: 0,
             icon: None,
+            icon_auto_detect: None,
             auth: None,
             network: None,
             post_login: None,
@@ -1462,4 +1481,48 @@ mod tests {
 
         assert_eq!(connection.endpoint(), "zsh in /data");
     }
+
+    #[test]
+    fn icon_auto_detect_defaults_to_filling_in_a_blank_only() {
+        let mut connection: SavedConnection = serde_json::from_str(
+            r#"{"id":"c1","name":"Box","type":"ssh","host":"h","port":22,"username":"root"}"#,
+        )
+        .expect("valid connection");
+
+        // Unset flag, no icon: detection may fill one in.
+        assert!(connection.icon_auto_detect_enabled());
+
+        // Unset flag but an icon chosen by an older build: leave it alone.
+        connection.icon = Some("ubuntu".to_string());
+        assert!(!connection.icon_auto_detect_enabled());
+
+        // An explicit flag always wins over the heuristic, either way.
+        connection.icon_auto_detect = Some(true);
+        assert!(connection.icon_auto_detect_enabled());
+        connection.icon = None;
+        connection.icon_auto_detect = Some(false);
+        assert!(!connection.icon_auto_detect_enabled());
+    }
+
+    #[test]
+    fn icon_auto_detect_round_trips_and_stays_absent_when_unset() {
+        let connection: SavedConnection = serde_json::from_str(
+            r#"{"id":"c1","name":"Box","type":"ssh","host":"h","port":22,"username":"root"}"#,
+        )
+        .expect("valid connection");
+
+        // Files written by builds predating the field must round-trip byte-for-
+        // byte, so an unset flag is never serialized.
+        let json = serde_json::to_string(&connection).expect("serializes");
+        assert!(!json.contains("icon_auto_detect"), "{json}");
+
+        let explicit = SavedConnection {
+            icon_auto_detect: Some(false),
+            ..connection
+        };
+        let reloaded: SavedConnection =
+            serde_json::from_str(&serde_json::to_string(&explicit).expect("serializes"))
+                .expect("reloads");
+        assert_eq!(reloaded.icon_auto_detect, Some(false));
+    }
 }
diff --git a/crates/nyaterm-core/src/session_import.rs b/crates/nyaterm-core/src/session_import.rs
index dfad8897..a397030b 100644
--- a/crates/nyaterm-core/src/session_import.rs
+++ b/crates/nyaterm-core/src/session_import.rs
@@ -1150,6 +1150,7 @@ fn import_legacy_sessions(
             description: None,
             sort_order: 0,
             icon: None,
+            icon_auto_detect: None,
             auth: Some(ConnectionAuth {
                 mode: sess.auth_type,
                 password_id: None,
@@ -1208,6 +1209,9 @@ fn import_prepared_nyaterm_json(
             description: conn.description,
             sort_order: conn.sort_order,
             icon: conn.icon,
+            // Imported sessions carry whatever icon the source client had; leave
+            // auto-detection unconfigured so it only fills in a blank.
+            icon_auto_detect: None,
             auth: conn.auth,
             network: None,
             post_login: None,
diff --git a/crates/nyaterm-core/src/storage.rs b/crates/nyaterm-core/src/storage.rs
index 31828395..fa9d06a0 100644
--- a/crates/nyaterm-core/src/storage.rs
+++ b/crates/nyaterm-core/src/storage.rs
@@ -1506,6 +1506,7 @@ mod tests {
                 description: Some("Primary".to_string()),
                 sort_order: 0,
                 icon: None,
+                icon_auto_detect: None,
                 auth: Some(ConnectionAuth {
                     mode: "password".to_string(),
                     password: Some("secret".to_string()),
@@ -1570,6 +1571,7 @@ mod tests {
                 description: None,
                 sort_order: 0,
                 icon: None,
+                icon_auto_detect: None,
                 auth: None,
                 network: None,
                 post_login: None,
@@ -1645,6 +1647,7 @@ mod tests {
                     description: Some("Primary".to_string()),
                     sort_order: 0,
                     icon: None,
+                    icon_auto_detect: None,
                     auth: Some(ConnectionAuth {
                         mode: "password".to_string(),
                         password: Some("session-secret".to_string()),
@@ -1811,6 +1814,7 @@ mod tests {
                     description: None,
                     sort_order: 0,
                     icon: None,
+                    icon_auto_detect: None,
                     auth: None,
                     network: None,
                     post_login: None,
@@ -1867,6 +1871,7 @@ mod tests {
                     description: None,
                     sort_order: 0,
                     icon: None,
+                    icon_auto_detect: None,
                     auth: None,
                     network: None,
                     post_login: None,
@@ -1937,6 +1942,7 @@ mod tests {
                     description: None,
                     sort_order: 0,
                     icon: None,
+                    icon_auto_detect: None,
                     auth: None,
                     network: None,
                     post_login: None,
@@ -2004,6 +2010,7 @@ mod tests {
             description: None,
             sort_order: 0,
             icon: None,
+            icon_auto_detect: None,
             auth: None,
             network: None,
             post_login: None,
@@ -2045,6 +2052,7 @@ mod tests {
             description: None,
             sort_order: 0,
             icon: None,
+            icon_auto_detect: None,
             auth: None,
             network: None,
             post_login: None,
@@ -2112,6 +2120,7 @@ mod tests {
                     description: None,
                     sort_order: 0,
                     icon: None,
+                    icon_auto_detect: None,
                     auth: None,
                     network: None,
                     post_login: None,
@@ -2148,6 +2157,7 @@ mod tests {
             description: None,
             sort_order: 0,
             icon: None,
+            icon_auto_detect: None,
             auth: Some(ConnectionAuth {
                 mode: "password".to_string(),
                 ..Default::default()
diff --git a/crates/nyaterm-desktop/src/features/commands/mod.rs b/crates/nyaterm-desktop/src/features/commands/mod.rs
index cebaabef..ebd09a86 100644
--- a/crates/nyaterm-desktop/src/features/commands/mod.rs
+++ b/crates/nyaterm-desktop/src/features/commands/mod.rs
@@ -7,7 +7,7 @@ mod quick_command_runtime;
 mod state;
 
 pub(in crate::features) use quick_command_runtime::{
-    QUICK_COMMAND_COLOR_OPTIONS, QUICK_COMMAND_ICON_OPTIONS, quick_command_category_label,
+    QUICK_COMMAND_COLOR_OPTIONS, quick_command_category_label,
     quick_command_sort_mode_from_setting, quick_command_view_mode_from_setting,
 };
 pub(in crate::features) use state::{QuickCommandFeatureFocus, QuickCommandFeatureState};
diff --git a/crates/nyaterm-desktop/src/features/commands/quick_command_runtime/mod.rs b/crates/nyaterm-desktop/src/features/commands/quick_command_runtime/mod.rs
index dcb15c0c..67dc0982 100644
--- a/crates/nyaterm-desktop/src/features/commands/quick_command_runtime/mod.rs
+++ b/crates/nyaterm-desktop/src/features/commands/quick_command_runtime/mod.rs
@@ -12,39 +12,6 @@ pub(in crate::features) const QUICK_COMMAND_COLOR_OPTIONS: [Option<&str>; 6] = [
     Some("yellow"),
     Some("purple"),
 ];
-pub(in crate::features) const QUICK_COMMAND_ICON_OPTIONS: [Option<&str>; 31] = [
-    None,
-    Some("terminal"),
-    Some("code"),
-    Some("server"),
-    Some("folder"),
-    Some("sparkles"),
-    Some("bolt"),
-    Some("docker"),
-    Some("k8s"),
-    Some("linux"),
-    Some("ubuntu"),
-    Some("debian"),
-    Some("centos"),
-    Some("fedora"),
-    Some("apple"),
-    Some("github"),
-    Some("gitlab"),
-    Some("nginx"),
-    Some("redis"),
-    Some("postgres"),
-    Some("mysql"),
-    Some("mongodb"),
-    Some("python"),
-    Some("js"),
-    Some("ts"),
-    Some("rust"),
-    Some("go"),
-    Some("node"),
-    Some("php"),
-    Some("aws"),
-    Some("gcp"),
-];
 
 mod helpers;
 pub(in crate::features) use helpers::*;
diff --git a/crates/nyaterm-desktop/src/features/connections/connection_runtime/auto_icon.rs b/crates/nyaterm-desktop/src/features/connections/connection_runtime/auto_icon.rs
new file mode 100644
index 00000000..b8ef5ba3
--- /dev/null
+++ b/crates/nyaterm-desktop/src/features/connections/connection_runtime/auto_icon.rs
@@ -0,0 +1,73 @@
+//! Fill in a saved connection's icon from what the remote host reports.
+//!
+//! Runs off the remote-stats snapshot the resource panel already collects, so no
+//! extra round trip is made. Only ever fills in a blank or refreshes a previous
+//! auto-detection — a hand-picked icon clears the flag and is never touched.
+
+use nyaterm_core::ConnectionType;
+use nyaterm_transport::SystemInfo;
+
+use crate::features::{NyaTermApp, infer_connection_icon_key_from_remote_system};
+
+impl NyaTermApp {
+    pub(in crate::features) fn apply_auto_detected_connection_icon(
+        &mut self,
+        session_id: &str,
+        system: &SystemInfo,
+    ) {
+        let Some(connection_id) = self
+            .session_metadata
+            .get(session_id)
+            .and_then(|metadata| metadata.source_connection_id.as_deref())
+            .map(str::trim)
+            .filter(|id| !id.is_empty())
+            .map(ToOwned::to_owned)
+        else {
+            return;
+        };
+
+        let Some(connection) = self
+            .connections
+            .iter()
+            .find(|connection| connection.id == connection_id)
+        else {
+            return;
+        };
+
+        // Only SSH sessions report a remote system worth reading.
+        if !matches!(connection.config, ConnectionType::Ssh { .. })
+            || !connection.icon_auto_detect_enabled()
+        {
+            return;
+        }
+
+        let Some(icon_key) = infer_connection_icon_key_from_remote_system(&system.os, &system.arch)
+        else {
+            return;
+        };
+        if connection.icon.as_deref() == Some(icon_key) {
+            return;
+        }
+
+        let mut updated = connection.clone();
+        updated.icon = Some(icon_key.to_string());
+        updated.icon_auto_detect = Some(true);
+
+        match self.persist_saved_connection_with_group(updated, None) {
+            Ok(connection) => {
+                self.terminal.view.status =
+                    format!("detected {icon_key} icon for {}", connection.name);
+            }
+            Err(error) => {
+                // A failed icon refresh must not disturb the session, so this is
+                // reported as a log line rather than surfaced to the user.
+                tracing::warn!(
+                    target: "nyaterm::connections",
+                    connection_id = %connection_id,
+                    %error,
+                    "failed to persist auto-detected connection icon"
+                );
+            }
+        }
+    }
+}
diff --git a/crates/nyaterm-desktop/src/features/connections/connection_runtime/editor.rs b/crates/nyaterm-desktop/src/features/connections/connection_runtime/editor.rs
index 08ba00b4..1ff1bdea 100644
--- a/crates/nyaterm-desktop/src/features/connections/connection_runtime/editor.rs
+++ b/crates/nyaterm-desktop/src/features/connections/connection_runtime/editor.rs
@@ -47,6 +47,9 @@ impl NyaTermApp {
                 name: String::new(),
                 description: String::new(),
                 icon: None,
+                // A new connection has no icon yet, so let the first successful
+                // SSH session fill one in.
+                icon_auto_detect: true,
                 group_id: parent_group_id.filter(|value| !value.trim().is_empty()),
                 new_group_name: String::new(),
                 pending_group_name: None,
@@ -127,6 +130,16 @@ impl NyaTermApp {
         cx.notify();
     }
 
+    pub(in crate::features) fn set_connection_editor_icon_auto_detect(
+        &mut self,
+        enabled: bool,
+        cx: &mut Context<Self>,
+    ) {
+        if self.connection_state.editor.set_icon_auto_detect(enabled) {
+            cx.notify();
+        }
+    }
+
     pub(in crate::features) fn toggle_connection_editor_menu(
         &mut self,
         menu: ConnectionEditorMenu,
diff --git a/crates/nyaterm-desktop/src/features/connections/connection_runtime/helpers.rs b/crates/nyaterm-desktop/src/features/connections/connection_runtime/helpers.rs
index aacf0632..ff380b9e 100644
--- a/crates/nyaterm-desktop/src/features/connections/connection_runtime/helpers.rs
+++ b/crates/nyaterm-desktop/src/features/connections/connection_runtime/helpers.rs
@@ -34,12 +34,14 @@ pub(super) fn connection_editor_from_saved(
     } else {
         ConnectionEditorPasswordSource::Ask
     };
+    let icon_auto_detect = connection.icon_auto_detect_enabled();
     let mut editor = ConnectionEditorState {
         id: Some(connection.id),
         kind: ConnectionKindTab::from_connection_type(&connection.config),
         name: connection.name,
         description: connection.description.unwrap_or_default(),
         icon: connection.icon,
+        icon_auto_detect,
         group_id: connection.group_id,
         new_group_name: String::new(),
         pending_group_name: None,
@@ -369,6 +371,11 @@ pub(super) fn build_saved_connection_from_editor(
         description: non_empty_optional(&editor.description),
         sort_order: 0,
         icon: editor.icon.clone().filter(|value| !value.trim().is_empty()),
+        // Only SSH sessions report a remote system, so nothing else can be
+        // auto-detected; persist the flag explicitly rather than relying on the
+        // "unset means enabled while blank" default, which would flip once the
+        // user chose an icon.
+        icon_auto_detect: Some(editor.kind == ConnectionKindTab::Ssh && editor.icon_auto_detect),
         auth,
         network,
         post_login,
@@ -421,6 +428,7 @@ mod tests {
             description: None,
             sort_order: 0,
             icon: Some("linux".to_string()),
+            icon_auto_detect: None,
             auth: None,
             network: None,
             post_login: None,
@@ -452,6 +460,7 @@ mod tests {
             description: None,
             sort_order: 0,
             icon: None,
+            icon_auto_detect: None,
             auth: Some(ConnectionAuth {
                 mode: "password".to_string(),
                 password_id: Some("password-1".to_string()),
@@ -500,6 +509,7 @@ mod tests {
             description: None,
             sort_order: 0,
             icon: None,
+            icon_auto_detect: None,
             auth: None,
             network: None,
             post_login: None,
diff --git a/crates/nyaterm-desktop/src/features/connections/connection_runtime/mod.rs b/crates/nyaterm-desktop/src/features/connections/connection_runtime/mod.rs
index 5019a384..504b450c 100644
--- a/crates/nyaterm-desktop/src/features/connections/connection_runtime/mod.rs
+++ b/crates/nyaterm-desktop/src/features/connections/connection_runtime/mod.rs
@@ -2,5 +2,6 @@ mod helpers;
 pub(in crate::features) use helpers::ConnectionEditorToggle;
 
 mod actions;
+mod auto_icon;
 mod editor;
 mod groups;
diff --git a/crates/nyaterm-desktop/src/features/connections/connections/mod.rs b/crates/nyaterm-desktop/src/features/connections/connections/mod.rs
index c500d568..5cc08dc0 100644
--- a/crates/nyaterm-desktop/src/features/connections/connections/mod.rs
+++ b/crates/nyaterm-desktop/src/features/connections/connections/mod.rs
@@ -45,9 +45,9 @@ impl ConnectionDragPreview {
 
 impl Render for ConnectionDragPreview {
     fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        let (kind, accent) = match self.payload.kind {
-            ConnectionDragKind::Connection => ("⌂", rgb(0x3fb950)),
-            ConnectionDragKind::Group => ("▸", rgb(0x58a6ff)),
+        let (icon, accent) = match self.payload.kind {
+            ConnectionDragKind::Connection => ("icons/brand/server.svg", rgb(0x3fb950)),
+            ConnectionDragKind::Group => ("icons/conn/folder.svg", rgb(0x58a6ff)),
         };
         div()
             .pl(self.position.x - px(90.))
@@ -65,7 +65,7 @@ impl Render for ConnectionDragPreview {
                     .border_color(rgb(0x388bfd))
                     .bg(rgba(0x0d1117ee))
                     .shadow_lg()
-                    .child(div().text_size(px(13.)).text_color(accent).child(kind))
+                    .child(crate::features::mono_icon(icon, accent.into(), 13.))
                     .child(
                         div()
                             .min_w_0()
diff --git a/crates/nyaterm-desktop/src/features/connections/state/editor_logic.rs b/crates/nyaterm-desktop/src/features/connections/state/editor_logic.rs
index ef128e44..24c40bd3 100644
--- a/crates/nyaterm-desktop/src/features/connections/state/editor_logic.rs
+++ b/crates/nyaterm-desktop/src/features/connections/state/editor_logic.rs
@@ -101,10 +101,27 @@ pub(super) fn set_connection_editor_icon(
         .map(str::trim)
         .filter(|icon| !icon.is_empty())
         .map(ToOwned::to_owned);
+    // Choosing an icon by hand is an explicit decision, so stop letting the
+    // remote system overwrite it. Clearing the icon hands control back.
+    editor.icon_auto_detect = editor.icon.is_none();
     editor.error = None;
     true
 }
 
+pub(super) fn set_connection_editor_icon_auto_detect(
+    draft: &mut Option<ConnectionEditorState>,
+    enabled: bool,
+) -> bool {
+    let Some(editor) = draft.as_mut() else {
+        return false;
+    };
+    if editor.icon_auto_detect == enabled {
+        return false;
+    }
+    editor.icon_auto_detect = enabled;
+    true
+}
+
 pub(super) fn set_connection_editor_menu_value(
     draft: &mut Option<ConnectionEditorState>,
     menu: ConnectionEditorMenu,
diff --git a/crates/nyaterm-desktop/src/features/formatting/connection_icons.rs b/crates/nyaterm-desktop/src/features/formatting/connection_icons.rs
deleted file mode 100644
index 4a6a3615..00000000
--- a/crates/nyaterm-desktop/src/features/formatting/connection_icons.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-/// Tauri `resolveConnectionIcon`: map stored icon key / connection kind to SVG path + color.
-#[derive(Debug, Clone, Copy)]
-pub(in crate::features) struct ConnectionIconDef {
-    pub path: &'static str,
-    pub color: u32,
-}
-
-/// Keys exposed by the Tauri connection icon picker, in its display order.
-pub(in crate::features) const CONNECTION_ICON_OPTIONS: &[&str] = &[
-    "server",
-    "server-emerald",
-    "server-amber",
-    "server-rose",
-    "server-violet",
-    "server-cyan",
-    "server-slate",
-    "windows",
-    "apple",
-    "android",
-    "linux",
-    "ubuntu",
-    "debian",
-    "centos",
-    "fedora",
-    "arch",
-    "manjaro",
-    "opensuse",
-    "rocky",
-    "alma",
-    "alpine",
-    "kali",
-    "mint",
-    "nixos",
-    "gentoo",
-    "freebsd",
-    "raspberrypi",
-];
-
-pub(in crate::features) fn resolve_connection_icon(
-    icon_key: Option<&str>,
-    kind: &str,
-) -> ConnectionIconDef {
-    if let Some(key) = icon_key.map(str::trim).filter(|value| !value.is_empty()) {
-        if let Some(def) = connection_icon_by_key(key) {
-            return def;
-        }
-    }
-    default_connection_icon_for_kind(kind)
-}
-
-fn connection_icon_by_key(key: &str) -> Option<ConnectionIconDef> {
-    let key = key.to_ascii_lowercase();
-    // Server palette (Tauri SERVER_ICONS colors).
-    let server = match key.as_str() {
-        "server" => Some(0x60a5fa),
-        "server-emerald" => Some(0x34d399),
-        "server-amber" => Some(0xfbbf24),
-        "server-rose" => Some(0xfb7185),
-        "server-violet" => Some(0xa78bfa),
-        "server-cyan" => Some(0x22d3ee),
-        "server-slate" => Some(0x94a3b8),
-        _ => None,
-    };
-    if let Some(color) = server {
-        return Some(ConnectionIconDef {
-            path: "icons/conn/server.svg",
-            color,
-        });
-    }
-    Some(match key.as_str() {
-        "linux" => ConnectionIconDef {
-            path: "icons/conn/linux.svg",
-            color: 0xfcc624,
-        },
-        "ubuntu" => ConnectionIconDef {
-            path: "icons/conn/ubuntu.svg",
-            color: 0xe95420,
-        },
-        "debian" => ConnectionIconDef {
-            path: "icons/conn/debian.svg",
-            color: 0xa81d33,
-        },
-        "centos" | "fedora" | "arch" | "manjaro" | "opensuse" | "rocky" | "alma" | "alpine"
-        | "kali" | "mint" | "nixos" | "gentoo" | "freebsd" | "raspberrypi" => ConnectionIconDef {
-            path: "icons/conn/linux.svg",
-            color: match key.as_str() {
-                "centos" => 0xa14f8c,
-                "fedora" => 0x3c4fb1,
-                "arch" => 0x1793d1,
-                "manjaro" => 0x35bf5c,
-                "opensuse" => 0x73ba25,
-                "rocky" => 0x10b981,
-                "alma" => 0xff4649,
-                "alpine" => 0x0d597f,
-                "kali" => 0x268bee,
-                "mint" => 0x87cf3e,
-                "nixos" => 0x5277c3,
-                "gentoo" => 0x54487a,
-                "freebsd" => 0xab2b28,
-                "raspberrypi" => 0xa22846,
-                _ => 0xfcc624,
-            },
-        },
-        "apple" => ConnectionIconDef {
-            path: "icons/conn/apple.svg",
-            color: 0xa2aaad,
-        },
-        "windows" => ConnectionIconDef {
-            path: "icons/conn/windows.svg",
-            color: 0x0078d4,
-        },
-        "android" => ConnectionIconDef {
-            path: "icons/conn/linux.svg",
-            color: 0x3ddc84,
-        },
-        "docker" => ConnectionIconDef {
-            path: "icons/conn/docker.svg",
-            color: 0x2496ed,
-        },
-        "python" => ConnectionIconDef {
-            path: "icons/conn/python.svg",
-            color: 0x3776ab,
-        },
-        "github" => ConnectionIconDef {
-            path: "icons/conn/github.svg",
-            color: 0xc9d1d9,
-        },
-        "k8s" | "kubernetes" => ConnectionIconDef {
-            path: "icons/conn/docker.svg",
-            color: 0x326ce5,
-        },
-        "local" | "terminal" => ConnectionIconDef {
-            path: "icons/conn/terminal.svg",
-            color: 0x4ade80,
-        },
-        "telnet" => ConnectionIconDef {
-            path: "icons/conn/telnet.svg",
-            color: 0xd29922,
-        },
-        "serial" => ConnectionIconDef {
-            path: "icons/conn/serial.svg",
-            color: 0xbc8cff,
-        },
-        "folder" | "group" => ConnectionIconDef {
-            path: "icons/conn/folder.svg",
-            color: 0xfbbf24,
-        },
-        // Other QUICK_ICONS keys fall back to colored server glyph.
-        "nginx" | "redis" | "postgres" | "mysql" | "mongodb" | "js" | "ts" | "rust" | "go"
-        | "node" | "php" | "aws" | "gcp" | "gitlab" => ConnectionIconDef {
-            path: "icons/conn/server.svg",
-            color: match key.as_str() {
-                "nginx" => 0x009639,
-                "redis" => 0xdc382d,
-                "postgres" => 0x4169e1,
-                "mysql" => 0x4479a1,
-                "mongodb" => 0x47a248,
-                "js" => 0xf7df1e,
-                "ts" => 0x3178c6,
-                "rust" => 0xdea584,
-                "go" => 0x00add8,
-                "node" => 0x339933,
-                "php" => 0x777bb4,
-                "aws" => 0xff9900,
-                "gcp" => 0x4285f4,
-                "gitlab" => 0xfc6d26,
-                _ => 0x60a5fa,
-            },
-        },
-        _ => return None,
-    })
-}
-
-fn default_connection_icon_for_kind(kind: &str) -> ConnectionIconDef {
-    match kind {
-        "Local" => ConnectionIconDef {
-            path: "icons/conn/terminal.svg",
-            color: 0x4ade80,
-        },
-        "Telnet" => ConnectionIconDef {
-            path: "icons/conn/telnet.svg",
-            color: 0xd29922,
-        },
-        "Serial" => ConnectionIconDef {
-            path: "icons/conn/serial.svg",
-            color: 0xbc8cff,
-        },
-        _ => ConnectionIconDef {
-            path: "icons/conn/server.svg",
-            color: 0x60a5fa,
-        },
-    }
-}
diff --git a/crates/nyaterm-desktop/src/features/formatting/mod.rs b/crates/nyaterm-desktop/src/features/formatting/mod.rs
index 70de70c7..676c8d2a 100644
--- a/crates/nyaterm-desktop/src/features/formatting/mod.rs
+++ b/crates/nyaterm-desktop/src/features/formatting/mod.rs
@@ -19,9 +19,6 @@ pub(in crate::features) use labels::*;
 mod ai_history;
 pub(in crate::features) use ai_history::*;
 
-mod connection_icons;
-pub(in crate::features) use connection_icons::*;
-
 mod markdown;
 pub(in crate::features) use markdown::*;
 
diff --git a/crates/nyaterm-desktop/src/features/icons/aliases.rs b/crates/nyaterm-desktop/src/features/icons/aliases.rs
new file mode 100644
index 00000000..4c881752
--- /dev/null
+++ b/crates/nyaterm-desktop/src/features/icons/aliases.rs
@@ -0,0 +1,117 @@
+//! Key normalization for stored connection icons.
+//!
+//! Icon keys reach us from three places that spell things differently: the app's
+//! own picker (canonical), `.nya` backups written by the old app, and session
+//! imports from Xshell / MobaXterm / WindTerm (which is where `Ubuntu.svg`,
+//! `kali_linux` and `pwsh` come from). Aliasing is deliberately a *read-time*
+//! concern — stored values are never rewritten, so a file that round-trips
+//! through an older build still resolves.
+
+/// Spelling variants accepted for a canonical icon key. Ported verbatim from the
+/// pre-GPUI `CONNECTION_ICON_ALIASES`.
+pub(super) const CONNECTION_ICON_ALIASES: &[(&str, &str)] = &[
+    ("alibaba-cloudlinux", "alibaba-cloud-linux"),
+    ("alibabacloudlinux", "alibaba-cloud-linux"),
+    ("alibaba-linux", "alibaba-cloud-linux"),
+    ("almalinux", "alma"),
+    ("alma-linux", "alma"),
+    ("alpine-linux", "alpine"),
+    ("alpinelinux", "alpine"),
+    ("anolisos", "anolis"),
+    ("anolis-os", "anolis"),
+    ("archlinux", "arch"),
+    ("arch-linux", "arch"),
+    ("amazon", "aws"),
+    ("amazon-linux", "aws"),
+    ("amazonlinux", "aws"),
+    ("aws-linux", "aws"),
+    ("deepin-a", "deepin"),
+    ("command-prompt", "cmd"),
+    ("commandprompt", "cmd"),
+    ("gitbash", "git"),
+    ("git-bash", "git"),
+    ("huawei-cloud", "huawei"),
+    ("huaweicloud", "huawei"),
+    ("kali-linux", "kali"),
+    ("kalilinux", "kali"),
+    ("linuxmint", "mint"),
+    ("linux-mint", "mint"),
+    ("nix-os", "nixos"),
+    ("open-euler", "openeuler"),
+    ("open-suse", "opensuse"),
+    ("raspberry", "raspberrypi"),
+    ("raspberry-pi", "raspberrypi"),
+    ("rocky-linux", "rocky"),
+    ("rockylinux", "rocky"),
+    ("tencent", "tencentos"),
+    ("tencent-os", "tencentos"),
+    ("tencentlinux", "tencentos"),
+    ("ps", "powershell"),
+    ("pwsh", "powershell"),
+    ("power-shell", "powershell"),
+];
+
+/// Fold a stored key toward its canonical spelling: drop a trailing `.svg`,
+/// treat `_` as `-`, and lowercase.
+pub(super) fn normalize_connection_icon_key(key: &str) -> String {
+    let trimmed = key.trim();
+    let stripped = trimmed
+        .len()
+        .checked_sub(4)
+        .filter(|split| trimmed[*split..].eq_ignore_ascii_case(".svg"))
+        .map_or(trimmed, |split| &trimmed[..split]);
+    stripped.replace('_', "-").to_lowercase()
+}
+
+pub(super) fn resolve_alias(normalized: &str) -> &str {
+    CONNECTION_ICON_ALIASES
+        .iter()
+        .find(|(alias, _)| *alias == normalized)
+        .map_or(normalized, |(_, canonical)| *canonical)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn normalization_strips_the_svg_suffix_case_insensitively() {
+        assert_eq!(normalize_connection_icon_key("Ubuntu.SVG"), "ubuntu");
+        assert_eq!(normalize_connection_icon_key(" Debian.svg "), "debian");
+        // A key that merely ends in the same letters must survive intact.
+        assert_eq!(normalize_connection_icon_key("nosvg"), "nosvg");
+    }
+
+    #[test]
+    fn normalization_folds_underscores_and_case() {
+        assert_eq!(normalize_connection_icon_key("Kali_Linux"), "kali-linux");
+        assert_eq!(normalize_connection_icon_key("ALMA_LINUX"), "alma-linux");
+    }
+
+    #[test]
+    fn every_alias_points_at_a_different_key() {
+        for (alias, canonical) in CONNECTION_ICON_ALIASES {
+            assert_ne!(alias, canonical, "{alias} aliases itself");
+            assert_eq!(
+                *alias,
+                normalize_connection_icon_key(alias),
+                "{alias} is not in normalized form, so it can never be hit"
+            );
+        }
+    }
+
+    #[test]
+    fn aliases_resolve_through_normalization() {
+        for (input, expected) in [
+            ("kali_linux", "kali"),
+            ("Rocky-Linux.svg", "rocky"),
+            ("PWSH", "powershell"),
+            ("AmazonLinux", "aws"),
+        ] {
+            assert_eq!(
+                resolve_alias(&normalize_connection_icon_key(input)),
+                expected
+            );
+        }
+    }
+}
diff --git a/crates/nyaterm-desktop/src/features/icons/connection.rs b/crates/nyaterm-desktop/src/features/icons/connection.rs
new file mode 100644
index 00000000..946d3997
--- /dev/null
+++ b/crates/nyaterm-desktop/src/features/icons/connection.rs
@@ -0,0 +1,418 @@
+//! Connection icon tables, ported from the pre-GPUI `icons.tsx`.
+//!
+//! Four tables are merged into one lookup, in the same precedence the old app
+//! used: server → linux → brand → system, later winning. That ordering is
+//! load-bearing, not incidental: eight keys (`apple`, `linux`, `ubuntu`,
+//! `debian`, `centos`, `fedora`, `k8s`, `aws`) appear in both the brand table and
+//! the system table, and connections must get the full-color OS logo rather than
+//! the monochrome brand mark.
+
+use super::IconDef;
+use super::aliases::{normalize_connection_icon_key, resolve_alias};
+
+/// Key stored when a connection has no icon of its own.
+pub(in crate::features) const DEFAULT_CONNECTION_ICON: &str = "server";
+
+/// The default glyph in seven theme-friendly hues. One asset, seven tints — this
+/// is exactly what a monochrome alpha mask is for.
+const SERVER_ICONS: &[(&str, IconDef)] = &[
+    ("server", IconDef::mono("icons/brand/server.svg", 0x60a5fa)),
+    (
+        "server-emerald",
+        IconDef::mono("icons/brand/server.svg", 0x34d399),
+    ),
+    (
+        "server-amber",
+        IconDef::mono("icons/brand/server.svg", 0xfbbf24),
+    ),
+    (
+        "server-rose",
+        IconDef::mono("icons/brand/server.svg", 0xfb7185),
+    ),
+    (
+        "server-violet",
+        IconDef::mono("icons/brand/server.svg", 0xa78bfa),
+    ),
+    (
+        "server-cyan",
+        IconDef::mono("icons/brand/server.svg", 0x22d3ee),
+    ),
+    (
+        "server-slate",
+        IconDef::mono("icons/brand/server.svg", 0x94a3b8),
+    ),
+];
+
+/// The same seven hues on Tux, for people who want a Linux mark without
+/// committing to a distro.
+const LINUX_ICONS: &[(&str, IconDef)] = &[
+    (
+        "linux-default",
+        IconDef::mono("icons/brand/linux.svg", 0x60a5fa),
+    ),
+    (
+        "linux-emerald",
+        IconDef::mono("icons/brand/linux.svg", 0x34d399),
+    ),
+    (
+        "linux-amber",
+        IconDef::mono("icons/brand/linux.svg", 0xfbbf24),
+    ),
+    (
+        "linux-rose",
+        IconDef::mono("icons/brand/linux.svg", 0xfb7185),
+    ),
+    (
+        "linux-violet",
+        IconDef::mono("icons/brand/linux.svg", 0xa78bfa),
+    ),
+    (
+        "linux-cyan",
+        IconDef::mono("icons/brand/linux.svg", 0x22d3ee),
+    ),
+    (
+        "linux-slate",
+        IconDef::mono("icons/brand/linux.svg", 0x94a3b8),
+    ),
+];
+
+/// Service and language marks. Colors are the vendors' published brand values;
+/// several are near-black and get lifted at paint time by [`IconDef::tint`].
+pub(super) const BRAND_ICONS: &[(&str, IconDef)] = &[
+    ("docker", IconDef::mono("icons/brand/docker.svg", 0x2496ed)),
+    ("k8s", IconDef::mono("icons/brand/kubernetes.svg", 0x326ce5)),
+    ("linux", IconDef::mono("icons/brand/linux.svg", 0xfcc624)),
+    ("ubuntu", IconDef::mono("icons/brand/ubuntu.svg", 0xe95420)),
+    ("debian", IconDef::mono("icons/brand/debian.svg", 0xa81d33)),
+    ("centos", IconDef::mono("icons/brand/centos.svg", 0x262577)),
+    ("fedora", IconDef::mono("icons/brand/fedora.svg", 0x3c4fb1)),
+    ("apple", IconDef::mono("icons/brand/apple.svg", 0xa2aaad)),
+    ("github", IconDef::mono("icons/brand/github.svg", 0x181717)),
+    ("gitlab", IconDef::mono("icons/brand/gitlab.svg", 0xfc6d26)),
+    ("nginx", IconDef::mono("icons/brand/nginx.svg", 0x009639)),
+    ("redis", IconDef::mono("icons/brand/redis.svg", 0xdc382d)),
+    (
+        "postgres",
+        IconDef::mono("icons/brand/postgresql.svg", 0x4169e1),
+    ),
+    ("mysql", IconDef::mono("icons/brand/mysql.svg", 0x4479a1)),
+    (
+        "mongodb",
+        IconDef::mono("icons/brand/mongodb.svg", 0x47a248),
+    ),
+    ("python", IconDef::mono("icons/brand/python.svg", 0x3776ab)),
+    ("js", IconDef::mono("icons/brand/javascript.svg", 0xf7df1e)),
+    ("ts", IconDef::mono("icons/brand/typescript.svg", 0x3178c6)),
+    ("rust", IconDef::mono("icons/brand/rust.svg", 0x000000)),
+    ("go", IconDef::mono("icons/brand/go.svg", 0x00add8)),
+    ("node", IconDef::mono("icons/brand/nodedotjs.svg", 0x339933)),
+    ("php", IconDef::mono("icons/brand/php.svg", 0x777bb4)),
+    ("aws", IconDef::mono("icons/brand/aws.svg", 0x232f3e)),
+    (
+        "gcp",
+        IconDef::mono("icons/brand/googlecloud.svg", 0x4285f4),
+    ),
+];
+
+/// Official OS and distro logos, kept in full color. These override the brand
+/// table on the eight colliding keys.
+const SYSTEM_ICONS: &[(&str, IconDef)] = &[
+    ("windows", IconDef::full_color("color/os/windows.svg")),
+    ("apple", IconDef::full_color("color/os/apple.svg")),
+    ("android", IconDef::full_color("color/os/android.svg")),
+    ("linux", IconDef::full_color("color/os/linux.svg")),
+    ("ubuntu", IconDef::full_color("color/os/ubuntu.svg")),
+    ("debian", IconDef::full_color("color/os/debian.svg")),
+    ("centos", IconDef::full_color("color/os/centos.svg")),
+    ("fedora", IconDef::full_color("color/os/fedora.svg")),
+    ("arch", IconDef::full_color("color/os/archlinux.svg")),
+    ("manjaro", IconDef::full_color("color/os/manjaro.svg")),
+    ("opensuse", IconDef::full_color("color/os/opensuse.svg")),
+    ("rocky", IconDef::full_color("color/os/rocky-linux.svg")),
+    ("alma", IconDef::full_color("color/os/almalinux.svg")),
+    ("alpine", IconDef::full_color("color/os/alpine-linux.svg")),
+    ("kali", IconDef::full_color("color/os/kalilinux.svg")),
+    ("mint", IconDef::full_color("color/os/linux-mint.svg")),
+    ("nixos", IconDef::full_color("color/os/nixos.svg")),
+    ("h3c", IconDef::full_color("color/os/h3c.svg")),
+    ("k8s", IconDef::full_color("color/os/k8s.svg")),
+    ("gentoo", IconDef::full_color("color/os/gentoo.svg")),
+    (
+        "raspberrypi",
+        IconDef::full_color("color/os/raspberrypi.svg"),
+    ),
+    (
+        "alibaba-cloud-linux",
+        IconDef::full_color("color/os/alibabacloudlinux.svg"),
+    ),
+    ("anolis", IconDef::full_color("color/os/anolisos.svg")),
+    ("deepin", IconDef::full_color("color/os/deepin.svg")),
+    ("kylin", IconDef::full_color("color/os/kylin.svg")),
+    ("openeuler", IconDef::full_color("color/os/openeuler.svg")),
+    ("tencentos", IconDef::full_color("color/os/tencentos.svg")),
+    ("uos", IconDef::full_color("color/os/uos.svg")),
+    ("aws", IconDef::full_color("color/os/aws.svg")),
+    ("huawei", IconDef::full_color("color/os/huawei.svg")),
+    ("git", IconDef::full_color("color/os/git.svg")),
+    ("cmd", IconDef::full_color("color/os/cmd.svg")),
+    ("powershell", IconDef::full_color("color/os/powershell.svg")),
+];
+
+/// Keys the GPUI build has written that the old app never had. They are not
+/// offered in the picker, but stored connections already carry them, so they must
+/// keep resolving. Do not prune this list without a data migration.
+const LEGACY_ICONS: &[(&str, IconDef)] = &[
+    ("kubernetes", IconDef::full_color("color/os/k8s.svg")),
+    ("local", IconDef::mono("icons/conn/terminal.svg", 0x4ade80)),
+    (
+        "terminal",
+        IconDef::mono("icons/conn/terminal.svg", 0x4ade80),
+    ),
+    ("telnet", IconDef::mono("icons/conn/telnet.svg", 0xd29922)),
+    ("serial", IconDef::mono("icons/conn/serial.svg", 0xbc8cff)),
+    ("folder", IconDef::mono("icons/conn/folder.svg", 0xfbbf24)),
+    ("group", IconDef::mono("icons/conn/folder.svg", 0xfbbf24)),
+    // The old app had no FreeBSD entry; the GPUI picker offered one backed by the
+    // generic Tux glyph. Keep it resolving for anyone who picked it.
+    ("freebsd", IconDef::mono("icons/brand/linux.svg", 0xab2b28)),
+];
+
+/// Picker contents, in the old app's display order: the seven server hues, the
+/// seven Linux hues, then every OS logo.
+pub(in crate::features) fn connection_icon_options() -> impl Iterator<Item = &'static str> {
+    SERVER_ICONS
+        .iter()
+        .chain(LINUX_ICONS)
+        .chain(SYSTEM_ICONS)
+        .map(|(key, _)| *key)
+}
+
+/// Materialized picker list, so grid code can index and count without collecting.
+pub(in crate::features) static CONNECTION_ICON_OPTIONS: std::sync::LazyLock<Vec<&'static str>> =
+    std::sync::LazyLock::new(|| connection_icon_options().collect());
+
+fn lookup(key: &str) -> Option<IconDef> {
+    // Reverse precedence order: the table that wins is consulted first.
+    for table in [
+        SYSTEM_ICONS,
+        BRAND_ICONS,
+        LINUX_ICONS,
+        SERVER_ICONS,
+        LEGACY_ICONS,
+    ] {
+        if let Some((_, def)) = table.iter().find(|(candidate, _)| *candidate == key) {
+            return Some(*def);
+        }
+    }
+    None
+}
+
+/// Resolve a stored icon key, falling back to a glyph for the connection kind.
+///
+/// Matches the old `resolveConnectionIcon` exactly: an exact key wins first, then
+/// the normalized-and-aliased form, then the default. Step one is byte-exact on
+/// purpose — normalizing up front would let `Ubuntu` and `ubuntu` diverge if a
+/// case-sensitive key is ever added.
+pub(in crate::features) fn resolve_connection_icon(icon_key: Option<&str>, kind: &str) -> IconDef {
+    if let Some(key) = icon_key.filter(|key| !key.is_empty()) {
+        if let Some(def) = lookup(key) {
+            return def;
+        }
+        let normalized = normalize_connection_icon_key(key);
+        if let Some(def) = lookup(resolve_alias(&normalized)) {
+            return def;
+        }
+    }
+    default_connection_icon_for_kind(kind)
+}
+
+/// Kind-specific default. The old app always fell back to the blue server glyph;
+/// giving Local/Telnet/Serial their own mark is an intentional improvement, and
+/// it is what drives the session tab icons.
+pub(in crate::features) fn default_connection_icon_for_kind(kind: &str) -> IconDef {
+    match kind {
+        "Local" => IconDef::mono("icons/conn/terminal.svg", 0x4ade80),
+        "Telnet" => IconDef::mono("icons/conn/telnet.svg", 0xd29922),
+        "Serial" => IconDef::mono("icons/conn/serial.svg", 0xbc8cff),
+        _ => IconDef::mono("icons/brand/server.svg", 0x60a5fa),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::super::IconPaint;
+    use super::super::aliases::CONNECTION_ICON_ALIASES;
+    use super::*;
+
+    /// Every key the GPUI picker has ever offered. Stored connections carry these
+    /// verbatim, so none may stop resolving.
+    const PREVIOUSLY_OFFERED_KEYS: &[&str] = &[
+        "server",
+        "server-emerald",
+        "server-amber",
+        "server-rose",
+        "server-violet",
+        "server-cyan",
+        "server-slate",
+        "windows",
+        "apple",
+        "android",
+        "linux",
+        "ubuntu",
+        "debian",
+        "centos",
+        "fedora",
+        "arch",
+        "manjaro",
+        "opensuse",
+        "rocky",
+        "alma",
+        "alpine",
+        "kali",
+        "mint",
+        "nixos",
+        "gentoo",
+        "freebsd",
+        "raspberrypi",
+        // Written by code paths rather than the picker.
+        "local",
+        "terminal",
+        "telnet",
+        "serial",
+        "folder",
+        "group",
+        "docker",
+        "python",
+        "github",
+        "kubernetes",
+        "k8s",
+        "nginx",
+        "redis",
+        "postgres",
+        "mysql",
+        "mongodb",
+        "js",
+        "ts",
+        "rust",
+        "go",
+        "node",
+        "php",
+        "aws",
+        "gcp",
+        "gitlab",
+    ];
+
+    fn resolves(key: &str) -> bool {
+        resolve_connection_icon(Some(key), "SSH") != default_connection_icon_for_kind("SSH")
+            || key == "server"
+    }
+
+    #[test]
+    fn every_previously_stored_key_still_resolves() {
+        for key in PREVIOUSLY_OFFERED_KEYS {
+            assert!(
+                resolves(key),
+                "{key} fell through to the default icon; stored connections would \
+                 silently lose their icon"
+            );
+        }
+    }
+
+    #[test]
+    fn every_alias_resolves_to_a_real_icon() {
+        for (alias, canonical) in CONNECTION_ICON_ALIASES {
+            assert!(
+                lookup(canonical).is_some(),
+                "alias {alias} points at {canonical}, which is not in any table"
+            );
+            assert_eq!(
+                resolve_connection_icon(Some(alias), "SSH"),
+                resolve_connection_icon(Some(canonical), "SSH"),
+            );
+        }
+    }
+
+    #[test]
+    fn system_logos_win_over_brand_marks_on_shared_keys() {
+        for key in [
+            "apple", "linux", "ubuntu", "debian", "centos", "fedora", "k8s", "aws",
+        ] {
+            let def = resolve_connection_icon(Some(key), "SSH");
+            assert_eq!(
+                def.paint,
+                IconPaint::FullColor,
+                "{key} must use the full-color OS logo, not the brand mark"
+            );
+        }
+    }
+
+    #[test]
+    fn distros_no_longer_share_one_glyph() {
+        // The whole point of the change: these all pointed at conn/linux.svg and
+        // differed only by tint.
+        let distros = [
+            "centos",
+            "fedora",
+            "arch",
+            "manjaro",
+            "opensuse",
+            "rocky",
+            "alma",
+            "alpine",
+            "kali",
+            "mint",
+            "nixos",
+            "gentoo",
+            "raspberrypi",
+        ];
+        let mut paths: Vec<_> = distros
+            .iter()
+            .map(|key| resolve_connection_icon(Some(key), "SSH").path)
+            .collect();
+        paths.sort_unstable();
+        let total = paths.len();
+        paths.dedup();
+        assert_eq!(paths.len(), total, "some distros still share an asset");
+    }
+
+    #[test]
+    fn kubernetes_is_not_a_whale() {
+        let k8s = resolve_connection_icon(Some("k8s"), "SSH");
+        let docker = resolve_connection_icon(Some("docker"), "SSH");
+        assert_ne!(k8s.path, docker.path);
+    }
+
+    #[test]
+    fn unknown_and_empty_keys_fall_back_by_kind() {
+        let default = default_connection_icon_for_kind("SSH");
+        assert_eq!(resolve_connection_icon(None, "SSH"), default);
+        assert_eq!(resolve_connection_icon(Some(""), "SSH"), default);
+        assert_eq!(resolve_connection_icon(Some("   "), "SSH"), default);
+        assert_eq!(resolve_connection_icon(Some("nonsense"), "SSH"), default);
+        assert_eq!(
+            resolve_connection_icon(None, "Serial"),
+            default_connection_icon_for_kind("Serial"),
+        );
+    }
+
+    #[test]
+    fn picker_lists_every_hue_and_every_logo_without_duplicates() {
+        let options = &*CONNECTION_ICON_OPTIONS;
+        assert_eq!(
+            options.len(),
+            SERVER_ICONS.len() + LINUX_ICONS.len() + SYSTEM_ICONS.len()
+        );
+        let mut sorted = options.clone();
+        sorted.sort_unstable();
+        let total = sorted.len();
+        sorted.dedup();
+        assert_eq!(sorted.len(), total, "the picker offers a key twice");
+
+        for key in options {
+            assert!(
+                lookup(key).is_some(),
+                "picker offers unresolvable key {key}"
+            );
+        }
+    }
+}
diff --git a/crates/nyaterm-desktop/src/features/icons/file_kind.rs b/crates/nyaterm-desktop/src/features/icons/file_kind.rs
new file mode 100644
index 00000000..55326240
--- /dev/null
+++ b/crates/nyaterm-desktop/src/features/icons/file_kind.rs
@@ -0,0 +1,188 @@
+//! File-explorer entry icons, a port of the old `getFileIcon`.
+//!
+//! Resolution order is load-bearing: symlink, then directory, then extension,
+//! then a dotfile check, then the generic document.
+
+use super::IconDef;
+use crate::theme::ThemePalette;
+
+/// Extension groups sharing one icon. Ordered as in the old table so a reviewer
+/// can diff the two side by side.
+const EXTENSION_ICONS: &[(&[&str], &str, u32)] = &[
+    (&["js", "jsx"], "icons/brand/javascript.svg", 0xfacc15),
+    (&["ts", "tsx"], "icons/brand/typescript.svg", 0x60a5fa),
+    (&["html", "htm"], "icons/brand/html5.svg", 0xf97316),
+    (&["css", "scss", "less"], "icons/brand/css.svg", 0x38bdf8),
+    (&["py", "pyc"], "icons/brand/python.svg", 0x3776ab),
+    (
+        &["sh", "bash", "zsh", "bat", "ps1"],
+        "icons/conn/terminal.svg",
+        0x4ade80,
+    ),
+    (&["php"], "icons/brand/php.svg", 0x777bb4),
+    (
+        &["rs", "go", "c", "cpp", "java"],
+        "icons/file/code.svg",
+        0xf87171,
+    ),
+    (
+        &["json", "yaml", "yml", "toml", "xml"],
+        "icons/file/data-object.svg",
+        0xa78bfa,
+    ),
+    (&["sql", "db", "sqlite"], "icons/file/storage.svg", 0x94a3b8),
+    (&["doc", "docx"], "icons/file/description.svg", 0x3b82f6),
+    (&["pdf"], "icons/file/pdf.svg", 0xef4444),
+    (&["xls", "xlsx", "csv"], "icons/file/table.svg", 0x16a34a),
+    (&["ppt", "pptx"], "icons/file/present.svg", 0xea580c),
+    (
+        &["png", "jpg", "jpeg", "gif", "webp", "svg", "ico"],
+        "icons/file/image.svg",
+        0xec4899,
+    ),
+    (
+        &["mp4", "mkv", "avi", "mov", "webm"],
+        "icons/file/movie.svg",
+        0x8b5cf6,
+    ),
+    (
+        &["mp3", "wav", "ogg", "flac"],
+        "icons/file/audio.svg",
+        0xf59e0b,
+    ),
+    (
+        &["zip", "rar", "7z", "tar", "gz", "bz2", "xz"],
+        "icons/file/archive.svg",
+        0xf59e0b,
+    ),
+    (
+        &["exe", "apk", "dmg", "iso"],
+        "icons/file/apps.svg",
+        0x14b8a6,
+    ),
+];
+
+/// Extensions whose icon is themed rather than branded, so they recede instead of
+/// competing with the colored ones.
+fn muted_extension_icon(extension: &str, palette: ThemePalette) -> Option<IconDef> {
+    match extension {
+        "ini" | "env" | "conf" | "config" => {
+            Some(IconDef::mono("icons/settings.svg", palette.text_muted))
+        }
+        "md" | "mdx" | "txt" | "rtf" => {
+            Some(IconDef::mono("icons/file/text.svg", palette.text_dimmed))
+        }
+        "lock" => Some(IconDef::mono("icons/lock.svg", palette.text_muted)),
+        _ => None,
+    }
+}
+
+/// Icon for one file-browser row.
+pub(in crate::features) fn file_entry_icon(
+    name: &str,
+    is_directory: bool,
+    is_symlink: bool,
+    palette: ThemePalette,
+) -> IconDef {
+    if is_symlink {
+        return IconDef::mono("icons/conn/symlink.svg", 0x67e8f9);
+    }
+    if is_directory {
+        return IconDef::mono("icons/conn/folder.svg", 0xfbbf24);
+    }
+
+    // Only a name that actually contains a dot has an extension. Without this,
+    // `Makefile` would "extend" to `makefile` and miss the dotfile branch below.
+    if let Some(extension) = name
+        .contains('.')
+        .then(|| name.rsplit('.').next().unwrap_or_default().to_lowercase())
+    {
+        if let Some(def) = muted_extension_icon(&extension, palette) {
+            return def;
+        }
+        if let Some((_, path, color)) = EXTENSION_ICONS
+            .iter()
+            .find(|(extensions, _, _)| extensions.contains(&extension.as_str()))
+        {
+            return IconDef::mono(path, *color);
+        }
+    }
+
+    // Dotfiles are configuration by convention, even without a known extension.
+    if name.starts_with('.') {
+        return IconDef::mono("icons/settings.svg", palette.text_muted);
+    }
+    IconDef::mono("icons/conn/file.svg", palette.text_muted)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn palette() -> ThemePalette {
+        crate::theme::theme_palette("github-dark")
+    }
+
+    fn icon_for(name: &str) -> IconDef {
+        file_entry_icon(name, false, false, palette())
+    }
+
+    #[test]
+    fn directories_and_symlinks_win_over_any_extension() {
+        let palette = palette();
+        assert_eq!(
+            file_entry_icon("archive.zip", true, false, palette).path,
+            "icons/conn/folder.svg"
+        );
+        assert_eq!(
+            file_entry_icon("shortcut.png", false, true, palette).path,
+            "icons/conn/symlink.svg"
+        );
+        // A symlinked directory reads as a link, matching the old ordering.
+        assert_eq!(
+            file_entry_icon("link", true, true, palette).path,
+            "icons/conn/symlink.svg"
+        );
+    }
+
+    #[test]
+    fn extensions_are_matched_case_insensitively() {
+        assert_eq!(icon_for("Photo.JPEG").path, "icons/file/image.svg");
+        assert_eq!(icon_for("Main.RS").path, "icons/file/code.svg");
+    }
+
+    #[test]
+    fn extensionless_names_do_not_borrow_their_own_name() {
+        // `Makefile`.rsplit('.') yields "Makefile", which must not be treated as
+        // an extension.
+        assert_eq!(icon_for("Makefile").path, "icons/conn/file.svg");
+        assert_eq!(icon_for("LICENSE").path, "icons/conn/file.svg");
+    }
+
+    #[test]
+    fn dotfiles_read_as_configuration() {
+        assert_eq!(icon_for(".bashrc").path, "icons/settings.svg");
+        assert_eq!(icon_for(".gitignore").path, "icons/settings.svg");
+        // A dotfile with a known extension still gets the specific icon.
+        assert_eq!(
+            icon_for(".eslintrc.json").path,
+            "icons/file/data-object.svg"
+        );
+    }
+
+    #[test]
+    fn known_kinds_do_not_collapse_onto_the_generic_document() {
+        let generic = icon_for("unknown.qqq").path;
+        for name in [
+            "a.js", "a.ts", "a.html", "a.css", "a.py", "a.sh", "a.php", "a.rs", "a.json", "a.ini",
+            "a.sql", "a.md", "a.doc", "a.pdf", "a.csv", "a.pptx", "a.png", "a.mp4", "a.mp3",
+            "a.zip", "a.iso", "a.lock",
+        ] {
+            assert_ne!(
+                icon_for(name).path,
+                generic,
+                "{name} has no icon of its own"
+            );
+        }
+    }
+}
diff --git a/crates/nyaterm-desktop/src/features/icons/mod.rs b/crates/nyaterm-desktop/src/features/icons/mod.rs
new file mode 100644
index 00000000..a81fae5c
--- /dev/null
+++ b/crates/nyaterm-desktop/src/features/icons/mod.rs
@@ -0,0 +1,164 @@
+//! Icon lookup tables.
+//!
+//! This is the data half of the icon system; the element half lives in
+//! [`crate::features::view_widgets::icons`]. Keeping them apart is what stops a
+//! ~1000-line brand table from being rebuilt inside a render closure.
+//!
+//! The tables are a port of the pre-GPUI `src/components/icons.tsx`. Their keys
+//! are **persisted user data** — `SavedConnection::icon` and
+//! `QuickCommand::icon_tag` are free-form strings written by both the old and the
+//! new app and carried in `.nya` backups — so keys may be added but never
+//! repurposed or removed.
+
+mod aliases;
+mod connection;
+mod file_kind;
+mod quick;
+mod remote_system;
+mod search;
+
+pub(in crate::features) use connection::{
+    CONNECTION_ICON_OPTIONS, DEFAULT_CONNECTION_ICON, resolve_connection_icon,
+};
+pub(in crate::features) use file_kind::file_entry_icon;
+pub(in crate::features) use quick::{QUICK_COMMAND_ICON_OPTIONS, quick_command_icon};
+pub(in crate::features) use remote_system::infer_connection_icon_key_from_remote_system;
+pub(in crate::features) use search::{SEARCH_ENGINE_ICON_IDS, search_engine_icon};
+
+use crate::theme::ThemePalette;
+
+/// How an icon asset must be painted.
+///
+/// The two GPUI elements are not interchangeable: `svg()` reduces the asset to an
+/// alpha mask (so one glyph serves seven tints, but a multi-color logo is lost),
+/// while `img()` keeps the pixels (so a distro logo survives, but nothing can
+/// tint it). The path prefix encodes the same split — `icons/**` vs `color/**`.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(in crate::features) enum IconPaint {
+    /// Monochrome mask, tinted with this vendor brand color.
+    Mono(u32),
+    /// Full-color raster, painted as authored. The old UI rendered these through
+    /// an `<img>` whose `color` was inert, so losing the tint is parity, not loss.
+    FullColor,
+}
+
+/// A resolved icon: which asset, and how to paint it.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(in crate::features) struct IconDef {
+    pub path: &'static str,
+    pub paint: IconPaint,
+}
+
+impl IconDef {
+    pub(in crate::features) const fn mono(path: &'static str, color: u32) -> Self {
+        Self {
+            path,
+            paint: IconPaint::Mono(color),
+        }
+    }
+
+    pub(in crate::features) const fn full_color(path: &'static str) -> Self {
+        Self {
+            path,
+            paint: IconPaint::FullColor,
+        }
+    }
+
+    /// Tint for a monochrome icon, lifted so it stays legible on the current
+    /// surface. Full-color icons return `None` — they are painted as authored.
+    ///
+    /// Several published brand colors are near-black (`rust` is literally
+    /// `#000000`, `github` `#181717`), which disappears on a dark surface. The old
+    /// UI shipped that bug; rather than corrupting the vendor values in the table,
+    /// the correction happens here so light themes still get the true color and
+    /// any brand added later is covered automatically.
+    pub(in crate::features) fn tint(self, palette: ThemePalette) -> Option<u32> {
+        match self.paint {
+            IconPaint::Mono(color) => Some(legible_on(color, palette)),
+            IconPaint::FullColor => None,
+        }
+    }
+}
+
+/// Relative luminance (WCAG), used only to decide whether a brand color has
+/// collapsed into the background.
+fn relative_luminance(color: u32) -> f32 {
+    fn channel(value: u32) -> f32 {
+        let value = (value & 0xff) as f32 / 255.0;
+        if value <= 0.03928 {
+            value / 12.92
+        } else {
+            ((value + 0.055) / 1.055).powf(2.4)
+        }
+    }
+    0.2126 * channel(color >> 16) + 0.7152 * channel(color >> 8) + 0.0722 * channel(color)
+}
+
+fn blend(from: u32, to: u32, amount: f32) -> u32 {
+    let mix = |shift: u32| {
+        let a = ((from >> shift) & 0xff) as f32;
+        let b = ((to >> shift) & 0xff) as f32;
+        (a + (b - a) * amount).round().clamp(0.0, 255.0) as u32
+    };
+    (mix(16) << 16) | (mix(8) << 8) | mix(0)
+}
+
+/// Contrast ratio floor below which a brand color is blended toward the theme's
+/// text color. 1.6 is deliberately low: it rescues `#000000` on a dark surface
+/// without washing out colors that merely look dim, such as `debian`'s `#a81d33`.
+const MIN_CONTRAST_RATIO: f32 = 1.6;
+
+fn legible_on(color: u32, palette: ThemePalette) -> u32 {
+    let icon = relative_luminance(color);
+    let surface = relative_luminance(palette.surface);
+    let (lighter, darker) = if icon > surface {
+        (icon, surface)
+    } else {
+        (surface, icon)
+    };
+    let ratio = (lighter + 0.05) / (darker + 0.05);
+    if ratio >= MIN_CONTRAST_RATIO {
+        return color;
+    }
+    // Pull toward the theme's own text color rather than a fixed white/black, so
+    // the lift lands inside the palette instead of next to it.
+    blend(color, palette.text, 0.65)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn dark() -> ThemePalette {
+        crate::theme::theme_palette("github-dark")
+    }
+
+    #[test]
+    fn near_black_brand_colors_are_lifted_off_a_dark_surface() {
+        let palette = dark();
+        // simple-icons publishes Rust as pure black; unlifted it is invisible.
+        let lifted = legible_on(0x000000, palette);
+        assert_ne!(lifted, 0x000000);
+        assert!(relative_luminance(lifted) > relative_luminance(palette.surface));
+    }
+
+    #[test]
+    fn legible_brand_colors_are_left_alone() {
+        let palette = dark();
+        for color in [0x2496ed, 0xe95420, 0xfcc624, 0x326ce5] {
+            assert_eq!(
+                legible_on(color, palette),
+                color,
+                "{color:#08x} reads fine and must keep its published value"
+            );
+        }
+    }
+
+    #[test]
+    fn full_color_icons_report_no_tint() {
+        assert_eq!(
+            IconDef::full_color("color/os/ubuntu.svg").tint(dark()),
+            None
+        );
+    }
+}
diff --git a/crates/nyaterm-desktop/src/features/icons/quick.rs b/crates/nyaterm-desktop/src/features/icons/quick.rs
new file mode 100644
index 00000000..c6e27a46
--- /dev/null
+++ b/crates/nyaterm-desktop/src/features/icons/quick.rs
@@ -0,0 +1,106 @@
+//! Quick-command icon tags.
+//!
+//! The old app offered exactly the 24 brand marks; the GPUI build added six
+//! generic ones and has already written them into saved commands, so they stay.
+
+use super::IconDef;
+use super::connection::BRAND_ICONS;
+
+/// Generic tags with no counterpart in the old app. Listed after the brand marks
+/// so the picker reads brand-first, matching the old grid.
+const GENERIC_ICONS: &[(&str, IconDef)] = &[
+    (
+        "terminal",
+        IconDef::mono("icons/conn/terminal.svg", 0x4ade80),
+    ),
+    ("code", IconDef::mono("icons/file/code.svg", 0x58a6ff)),
+    ("server", IconDef::mono("icons/brand/server.svg", 0x60a5fa)),
+    ("folder", IconDef::mono("icons/conn/folder.svg", 0xfbbf24)),
+    ("sparkles", IconDef::mono("icons/ai.svg", 0xa78bfa)),
+    ("bolt", IconDef::mono("icons/commands.svg", 0xfbbf24)),
+];
+
+/// Picker contents: `None` clears the icon and falls back to the color dot.
+pub(in crate::features) fn quick_command_icon_options() -> impl Iterator<Item = Option<&'static str>>
+{
+    std::iter::once(None).chain(
+        BRAND_ICONS
+            .iter()
+            .chain(GENERIC_ICONS)
+            .map(|(key, _)| Some(*key)),
+    )
+}
+
+pub(in crate::features) static QUICK_COMMAND_ICON_OPTIONS: std::sync::LazyLock<
+    Vec<Option<&'static str>>,
+> = std::sync::LazyLock::new(|| quick_command_icon_options().collect());
+
+/// Resolve a stored `icon_tag`. Unlike connection icons these are always
+/// monochrome — the old app rendered them as a react-icons glyph plus a CSS
+/// color, which is exactly what an alpha mask reproduces.
+pub(in crate::features) fn quick_command_icon(icon_tag: &str) -> Option<IconDef> {
+    let key = icon_tag.trim().to_ascii_lowercase();
+    BRAND_ICONS
+        .iter()
+        .chain(GENERIC_ICONS)
+        .find(|(candidate, _)| *candidate == key)
+        .map(|(_, def)| *def)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::super::IconPaint;
+    use super::*;
+
+    /// Tags the GPUI picker has offered since the migration. Saved commands carry
+    /// them, so none may stop resolving.
+    const PREVIOUSLY_OFFERED_TAGS: &[&str] = &[
+        "terminal", "code", "server", "folder", "sparkles", "bolt", "docker", "k8s", "linux",
+        "ubuntu", "debian", "centos", "fedora", "apple", "github", "gitlab", "nginx", "redis",
+        "postgres", "mysql", "mongodb", "python", "js", "ts", "rust", "go", "node", "php", "aws",
+        "gcp",
+    ];
+
+    #[test]
+    fn every_previously_offered_tag_still_resolves() {
+        for tag in PREVIOUSLY_OFFERED_TAGS {
+            assert!(
+                quick_command_icon(tag).is_some(),
+                "{tag} no longer resolves; saved commands would lose their icon"
+            );
+        }
+    }
+
+    #[test]
+    fn tags_are_matched_case_insensitively_and_trimmed() {
+        assert_eq!(quick_command_icon(" Docker "), quick_command_icon("docker"));
+        assert!(quick_command_icon("not-a-tag").is_none());
+    }
+
+    #[test]
+    fn quick_command_icons_are_all_monochrome() {
+        // These render inside small list rows where the icon has to pick up the
+        // row's selected/dimmed treatment, so a full-color asset would look wrong.
+        for tag in PREVIOUSLY_OFFERED_TAGS {
+            let def = quick_command_icon(tag).expect("tag resolves");
+            assert!(
+                matches!(def.paint, IconPaint::Mono(_)),
+                "{tag} resolved to a full-color asset"
+            );
+            assert!(
+                def.path.starts_with("icons/"),
+                "{tag} points outside icons/"
+            );
+        }
+    }
+
+    #[test]
+    fn picker_offers_a_clear_option_then_every_tag() {
+        let options = &*QUICK_COMMAND_ICON_OPTIONS;
+        assert_eq!(options.first().copied(), Some(None));
+        assert_eq!(options.len(), 1 + BRAND_ICONS.len() + GENERIC_ICONS.len());
+        for tag in options.iter().flatten() {
+            assert!(quick_command_icon(tag).is_some());
+        }
+    }
+}
diff --git a/crates/nyaterm-desktop/src/features/icons/remote_system.rs b/crates/nyaterm-desktop/src/features/icons/remote_system.rs
new file mode 100644
index 00000000..876af245
--- /dev/null
+++ b/crates/nyaterm-desktop/src/features/icons/remote_system.rs
@@ -0,0 +1,198 @@
+//! Guess a connection's icon from what the remote host reports about itself.
+//!
+//! Port of the old `inferConnectionIconKeyFromRemoteSystem`. Kept as a pure
+//! string function so it can run wherever the stats snapshot arrives, including
+//! off the render thread.
+
+/// Distro needles in priority order. First match wins, so the more specific
+/// entries have to come before the generic ones — `alibaba cloud linux` must be
+/// tested before the bare `linux` fallback at the bottom of [`infer`].
+const DISTRO_MATCHES: &[(&[&str], &str)] = &[
+    (
+        &[
+            "alibaba cloud linux",
+            "alibaba-cloud-linux",
+            "aliyun linux",
+            "alinux",
+        ],
+        "alibaba-cloud-linux",
+    ),
+    (&["amazon linux", "amzn", "aws linux"], "aws"),
+    (&["alma linux", "almalinux"], "alma"),
+    (&["alpine"], "alpine"),
+    (&["anolis"], "anolis"),
+    (&["arch linux", "arch-linux", "archlinux", "arch"], "arch"),
+    (&["centos", "cent os"], "centos"),
+    (&["debian"], "debian"),
+    (&["deepin"], "deepin"),
+    (&["fedora"], "fedora"),
+    (&["huawei", "opencloudos"], "huawei"),
+    (&["kali"], "kali"),
+    (&["kylin"], "kylin"),
+    (&["linux mint", "linuxmint"], "mint"),
+    (&["nixos", "nix os"], "nixos"),
+    (&["open euler", "openeuler"], "openeuler"),
+    (&["opensuse", "open suse", "sles", "suse"], "opensuse"),
+    (&["rocky"], "rocky"),
+    (&["tencent", "tlinux"], "tencentos"),
+    (&["ubuntu"], "ubuntu"),
+    (&["uniontech", "uos"], "uos"),
+];
+
+fn normalize(os: &str, arch: &str) -> String {
+    let joined = format!("{os} {arch}");
+    let mut out = String::with_capacity(joined.len());
+    let mut pending_space = false;
+    for ch in joined.chars() {
+        let ch = match ch {
+            '_' | '.' | '/' => '-',
+            _ => ch,
+        };
+        if ch.is_whitespace() {
+            pending_space = !out.is_empty();
+            continue;
+        }
+        if pending_space {
+            out.push(' ');
+            pending_space = false;
+        }
+        out.extend(ch.to_lowercase());
+    }
+    out
+}
+
+/// Whole-word match, so `arch` does not fire on `search` or `aarch64`.
+fn has_token(text: &str, token: &str) -> bool {
+    let is_word_char = |ch: char| ch.is_ascii_alphanumeric();
+    text.match_indices(token).any(|(start, matched)| {
+        let before_ok = text[..start]
+            .chars()
+            .next_back()
+            .is_none_or(|ch| !is_word_char(ch));
+        let after_ok = text[start + matched.len()..]
+            .chars()
+            .next()
+            .is_none_or(|ch| !is_word_char(ch));
+        before_ok && after_ok
+    })
+}
+
+/// Alphanumeric needles are token-matched; anything containing a separator is a
+/// plain substring test. This is per-needle, not per-group, so `alinux` is
+/// token-matched while its sibling `alibaba cloud linux` is not.
+fn matches_needle(text: &str, needle: &str) -> bool {
+    if needle.chars().all(|ch| ch.is_ascii_alphanumeric()) {
+        has_token(text, needle)
+    } else {
+        text.contains(needle)
+    }
+}
+
+/// Map a remote host's reported OS/arch to a connection icon key.
+pub(in crate::features) fn infer_connection_icon_key_from_remote_system(
+    os: &str,
+    arch: &str,
+) -> Option<&'static str> {
+    let text = normalize(os, arch);
+    if text.is_empty() {
+        return None;
+    }
+
+    for (needles, icon_key) in DISTRO_MATCHES {
+        if needles.iter().any(|needle| matches_needle(&text, needle)) {
+            return Some(icon_key);
+        }
+    }
+
+    if text.contains("windows") || text.contains("mingw") || text.contains("msys") {
+        return Some("windows");
+    }
+    if text.contains("darwin")
+        || text.contains("macos")
+        || text.contains("mac os")
+        || text.contains("os x")
+    {
+        return Some("apple");
+    }
+    if text.contains("linux") || text.contains("gnu") {
+        return Some("linux");
+    }
+    None
+}
+
+#[cfg(test)]
+mod tests {
+    use super::super::connection::resolve_connection_icon;
+    use super::super::{IconPaint, connection::default_connection_icon_for_kind};
+    use super::*;
+
+    fn infer(os: &str) -> Option<&'static str> {
+        infer_connection_icon_key_from_remote_system(os, "x86_64")
+    }
+
+    #[test]
+    fn common_uname_strings_land_on_the_right_distro() {
+        assert_eq!(infer("Ubuntu 24.04.1 LTS"), Some("ubuntu"));
+        assert_eq!(infer("CentOS Linux 7"), Some("centos"));
+        assert_eq!(infer("Debian GNU/Linux 12"), Some("debian"));
+        assert_eq!(infer("Rocky Linux 9.4"), Some("rocky"));
+        assert_eq!(infer("openEuler 24.03"), Some("openeuler"));
+        assert_eq!(infer("Alibaba Cloud Linux 3"), Some("alibaba-cloud-linux"));
+        assert_eq!(infer("Amazon Linux 2023"), Some("aws"));
+        assert_eq!(infer("Kylin V10"), Some("kylin"));
+        assert_eq!(infer("UnionTech OS Server 20"), Some("uos"));
+    }
+
+    #[test]
+    fn specific_distros_beat_the_generic_linux_fallback() {
+        // Every one of these also contains "linux".
+        assert_eq!(infer("Alpine Linux v3.20"), Some("alpine"));
+        assert_eq!(infer("Kali GNU/Linux Rolling"), Some("kali"));
+        assert_eq!(infer("Linux Mint 22"), Some("mint"));
+    }
+
+    #[test]
+    fn unrecognized_unix_still_reports_something_useful() {
+        assert_eq!(infer("Linux 6.8.0-generic"), Some("linux"));
+        assert_eq!(infer("Darwin"), Some("apple"));
+        assert_eq!(infer("MINGW64_NT-10.0"), Some("windows"));
+    }
+
+    #[test]
+    fn arch_matching_respects_word_boundaries() {
+        // `aarch64` must not read as Arch Linux.
+        assert_eq!(
+            infer_connection_icon_key_from_remote_system("Ubuntu 24.04", "aarch64"),
+            Some("ubuntu")
+        );
+        assert_eq!(
+            infer_connection_icon_key_from_remote_system("Linux", "aarch64"),
+            Some("linux")
+        );
+        assert_eq!(infer("Arch Linux"), Some("arch"));
+    }
+
+    #[test]
+    fn empty_input_infers_nothing() {
+        assert_eq!(infer_connection_icon_key_from_remote_system("", ""), None);
+        assert_eq!(
+            infer_connection_icon_key_from_remote_system("   ", " "),
+            None
+        );
+        assert_eq!(infer("Plan 9"), None);
+    }
+
+    #[test]
+    fn every_inferred_key_resolves_to_a_real_icon() {
+        let generic = default_connection_icon_for_kind("SSH");
+        for (_, icon_key) in DISTRO_MATCHES {
+            let def = resolve_connection_icon(Some(icon_key), "SSH");
+            assert_ne!(def, generic, "inferred key {icon_key} has no icon");
+            assert_eq!(
+                def.paint,
+                IconPaint::FullColor,
+                "inferred key {icon_key} should land on an OS logo"
+            );
+        }
+    }
+}
diff --git a/crates/nyaterm-desktop/src/features/icons/search.rs b/crates/nyaterm-desktop/src/features/icons/search.rs
new file mode 100644
index 00000000..a1b7a1b7
--- /dev/null
+++ b/crates/nyaterm-desktop/src/features/icons/search.rs
@@ -0,0 +1,86 @@
+//! Search-engine icons for the terminal selection search menu and its settings.
+
+use super::IconDef;
+use crate::theme::ThemePalette;
+
+/// Engines offered by the settings picker, in display order. `default` is the
+/// catch-all for a custom engine with no icon chosen.
+pub(in crate::features) const SEARCH_ENGINE_ICON_IDS: &[&str] = &[
+    "google",
+    "bing",
+    "duckduckgo",
+    "github",
+    "gitlab",
+    "baidu",
+    "yahoo",
+    "youtube",
+    "bilibili",
+    "zhihu",
+    "openai",
+    "claude",
+    "gemini",
+    "default",
+];
+
+const SEARCH_ICONS: &[(&str, &str, u32)] = &[
+    ("google", "icons/brand/google.svg", 0x4285f4),
+    // Bing has no mark of its own in the icon sets we vendor; its parent brand is
+    // the closest recognizable stand-in, and it stays distinct from `default`.
+    ("bing", "icons/brand/bing.svg", 0x008373),
+    ("duckduckgo", "icons/brand/duckduckgo.svg", 0xde5833),
+    ("github", "icons/brand/github.svg", 0x181717),
+    ("gitlab", "icons/brand/gitlab.svg", 0xfc6d26),
+    ("baidu", "icons/brand/baidu.svg", 0x2932e1),
+    ("yahoo", "icons/brand/yahoo.svg", 0x410093),
+    ("youtube", "icons/brand/youtube.svg", 0xff0000),
+    ("bilibili", "icons/brand/bilibili.svg", 0x00a1d6),
+    ("zhihu", "icons/brand/zhihu.svg", 0x0084ff),
+    ("openai", "icons/brand/openai.svg", 0x10a37f),
+    ("claude", "icons/brand/claude.svg", 0xd97757),
+    ("gemini", "icons/brand/gemini.svg", 0x4285f4),
+];
+
+/// Resolve an engine's icon. Unknown and missing ids get the neutral magnifier,
+/// themed rather than branded.
+pub(in crate::features) fn search_engine_icon(
+    icon: Option<&str>,
+    palette: ThemePalette,
+) -> IconDef {
+    let key = icon.unwrap_or("default");
+    SEARCH_ICONS
+        .iter()
+        .find(|(candidate, _, _)| *candidate == key)
+        .map_or_else(
+            || IconDef::mono("icons/fe/search.svg", palette.text_muted),
+            |(_, path, color)| IconDef::mono(path, *color),
+        )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn palette() -> ThemePalette {
+        crate::theme::theme_palette("github-dark")
+    }
+
+    #[test]
+    fn every_offered_id_resolves_to_its_own_asset() {
+        let mut paths: Vec<_> = SEARCH_ENGINE_ICON_IDS
+            .iter()
+            .map(|id| search_engine_icon(Some(id), palette()).path)
+            .collect();
+        paths.sort_unstable();
+        let total = paths.len();
+        paths.dedup();
+        assert_eq!(paths.len(), total, "two engines share an icon");
+    }
+
+    #[test]
+    fn unknown_and_missing_ids_get_the_neutral_magnifier() {
+        let fallback = search_engine_icon(Some("default"), palette());
+        assert_eq!(search_engine_icon(None, palette()), fallback);
+        assert_eq!(search_engine_icon(Some("altavista"), palette()), fallback);
+        assert_eq!(fallback.path, "icons/fe/search.svg");
+    }
+}
diff --git a/crates/nyaterm-desktop/src/features/inspector/ai_widgets/transcript.rs b/crates/nyaterm-desktop/src/features/inspector/ai_widgets/transcript.rs
index 55138183..cb89fc88 100644
--- a/crates/nyaterm-desktop/src/features/inspector/ai_widgets/transcript.rs
+++ b/crates/nyaterm-desktop/src/features/inspector/ai_widgets/transcript.rs
@@ -79,9 +79,11 @@ impl NyaTermApp {
                         .flex()
                         .items_center()
                         .justify_center()
-                        .text_size(px(22.))
-                        .text_color(rgb(palette.warning))
-                        .child("!"),
+                        .child(crate::features::mono_icon(
+                            "icons/warning.svg",
+                            rgb(palette.warning).into(),
+                            22.,
+                        )),
                 )
                 .child(
                     div()
diff --git a/crates/nyaterm-desktop/src/features/inspector/commands.rs b/crates/nyaterm-desktop/src/features/inspector/commands.rs
index 44c064d5..b086460d 100644
--- a/crates/nyaterm-desktop/src/features/inspector/commands.rs
+++ b/crates/nyaterm-desktop/src/features/inspector/commands.rs
@@ -37,12 +37,11 @@ impl NyaTermApp {
                                 this.run_history_command(run_index, cx);
                             }
                         }))
-                        .child(
-                            div()
-                                .text_size(px(10.))
-                                .text_color(rgb(palette.text_dimmed))
-                                .child("›"),
-                        )
+                        .child(div().child(crate::features::mono_icon(
+                            "icons/fe/forward.svg",
+                            rgb(palette.text_dimmed).into(),
+                            10.,
+                        )))
                         .child(
                             div()
                                 .min_w_0()
diff --git a/crates/nyaterm-desktop/src/features/layout/workspace/surface/menus.rs b/crates/nyaterm-desktop/src/features/layout/workspace/surface/menus.rs
index 63195041..facbde92 100644
--- a/crates/nyaterm-desktop/src/features/layout/workspace/surface/menus.rs
+++ b/crates/nyaterm-desktop/src/features/layout/workspace/surface/menus.rs
@@ -871,6 +871,7 @@ mod tests {
             description: None,
             sort_order,
             icon: None,
+            icon_auto_detect: None,
             auth: None,
             network: None,
             post_login: None,
diff --git a/crates/nyaterm-desktop/src/features/mod.rs b/crates/nyaterm-desktop/src/features/mod.rs
index 966a5ea2..0a5e09be 100644
--- a/crates/nyaterm-desktop/src/features/mod.rs
+++ b/crates/nyaterm-desktop/src/features/mod.rs
@@ -7,6 +7,7 @@ mod commands;
 mod connection_editor_window;
 mod connections;
 mod formatting;
+mod icons;
 mod inspector;
 mod layout;
 mod pages;
@@ -46,8 +47,8 @@ pub(in crate::features) use app_state::{
     SavedConnectionStartOptions, SessionPaneState,
 };
 pub(in crate::features) use commands::{
-    QUICK_COMMAND_COLOR_OPTIONS, QUICK_COMMAND_ICON_OPTIONS, QuickCommandFeatureFocus,
-    QuickCommandFeatureState, quick_command_category_label, quick_command_sort_mode_from_setting,
+    QUICK_COMMAND_COLOR_OPTIONS, QuickCommandFeatureFocus, QuickCommandFeatureState,
+    quick_command_category_label, quick_command_sort_mode_from_setting,
     quick_command_view_mode_from_setting,
 };
 pub(in crate::features) use connection_editor_window::ConnectionEditorWindow;
@@ -56,6 +57,11 @@ pub(in crate::features) use connections::{
     ConnectionDropTarget, ConnectionEditorToggle, ConnectionFeatureFocus, ConnectionFeatureState,
 };
 pub(in crate::features) use formatting::*;
+pub(in crate::features) use icons::{
+    CONNECTION_ICON_OPTIONS, DEFAULT_CONNECTION_ICON, IconDef, QUICK_COMMAND_ICON_OPTIONS,
+    SEARCH_ENGINE_ICON_IDS, file_entry_icon, infer_connection_icon_key_from_remote_system,
+    quick_command_icon, resolve_connection_icon, search_engine_icon,
+};
 pub(in crate::features) use panels::{SendCommandFeatureFocus, SendCommandFeatureState};
 pub(in crate::features) use quick_command_window::QuickCommandWindow;
 pub(in crate::features) use remote::{RemoteOpsFeatureFocus, RemoteOpsFeatureState};
diff --git a/crates/nyaterm-desktop/src/features/pages/mod.rs b/crates/nyaterm-desktop/src/features/pages/mod.rs
index 4841a19d..2c60c86b 100644
--- a/crates/nyaterm-desktop/src/features/pages/mod.rs
+++ b/crates/nyaterm-desktop/src/features/pages/mod.rs
@@ -1,7 +1,7 @@
 mod connections;
 mod migration;
 mod remote;
-mod settings;
+pub(in crate::features) mod settings;
 mod transfers;
 mod tunnels;
 mod workspace;
diff --git a/crates/nyaterm-desktop/src/features/pages/settings/ai/section.rs b/crates/nyaterm-desktop/src/features/pages/settings/ai/section.rs
index 148b631f..9c146be3 100644
--- a/crates/nyaterm-desktop/src/features/pages/settings/ai/section.rs
+++ b/crates/nyaterm-desktop/src/features/pages/settings/ai/section.rs
@@ -233,7 +233,13 @@ impl NyaTermApp {
                                     .cursor_pointer()
                                     .hover(move |this| this.bg(rgb(hover)))
                                     .child(label)
-                                    .when(selected, |this| this.child("*"))
+                                    .when(selected, |this| {
+                                        this.child(crate::features::mono_icon(
+                                            "icons/check.svg",
+                                            rgb(palette.primary).into(),
+                                            12.,
+                                        ))
+                                    })
                                     .on_click(cx.listener(move |this, _, _, cx| {
                                         this.appearance_menu_open = None;
                                         this.update_ai_smart_auto_execute_max_risk(
diff --git a/crates/nyaterm-desktop/src/features/pages/settings/mod.rs b/crates/nyaterm-desktop/src/features/pages/settings/mod.rs
index 709eb210..b1eddee7 100644
--- a/crates/nyaterm-desktop/src/features/pages/settings/mod.rs
+++ b/crates/nyaterm-desktop/src/features/pages/settings/mod.rs
@@ -817,7 +817,7 @@ pub(super) fn settings_form_row(
 }
 
 /// Compact on/off switch control (Tauri SettingSwitch look).
-pub(super) fn settings_switch(
+pub(in crate::features::pages) fn settings_switch(
     palette: ThemePalette,
     id: impl Into<String>,
     checked: bool,
diff --git a/crates/nyaterm-desktop/src/features/pages/settings/terminal/helpers.rs b/crates/nyaterm-desktop/src/features/pages/settings/terminal/helpers.rs
index 34e8829a..836321fb 100644
--- a/crates/nyaterm-desktop/src/features/pages/settings/terminal/helpers.rs
+++ b/crates/nyaterm-desktop/src/features/pages/settings/terminal/helpers.rs
@@ -1,60 +1,3 @@
-use super::*;
-
-pub(super) const SEARCH_ENGINE_ICON_IDS: &[&str] = &[
-    "google",
-    "bing",
-    "duckduckgo",
-    "github",
-    "gitlab",
-    "baidu",
-    "yahoo",
-    "youtube",
-    "bilibili",
-    "zhihu",
-    "openai",
-    "claude",
-    "gemini",
-    "default",
-];
-
-pub(super) fn search_engine_icon_label(icon: Option<&str>) -> String {
-    match icon.unwrap_or("default") {
-        "google" => "G".into(),
-        "bing" => "B".into(),
-        "duckduckgo" => "D".into(),
-        "github" => "GH".into(),
-        "gitlab" => "GL".into(),
-        "baidu" => "Bd".into(),
-        "yahoo" => "Y!".into(),
-        "youtube" => "YT".into(),
-        "bilibili" => "Bi".into(),
-        "zhihu" => "Zh".into(),
-        "openai" => "AI".into(),
-        "claude" => "Cl".into(),
-        "gemini" => "Ge".into(),
-        _ => "?".into(),
-    }
-}
-
-pub(super) fn search_engine_icon_color(icon: Option<&str>) -> u32 {
-    match icon.unwrap_or("default") {
-        "google" => 0x4285f4,
-        "bing" => 0x008373,
-        "duckduckgo" => 0xde5833,
-        "github" => 0x8b949e,
-        "gitlab" => 0xfc6d26,
-        "baidu" => 0x2932e1,
-        "yahoo" => 0x410093,
-        "youtube" => 0xff0000,
-        "bilibili" => 0x00a1d6,
-        "zhihu" => 0x0084ff,
-        "openai" => 0x10a37f,
-        "claude" => 0xd97757,
-        "gemini" => 0x4285f4,
-        _ => 0x8b949e,
-    }
-}
-
 pub(super) fn parse_keyword_swatch(value: &str) -> Option<u32> {
     let hex = value.trim().strip_prefix('#').unwrap_or(value.trim());
     if hex.len() != 6 {
diff --git a/crates/nyaterm-desktop/src/features/pages/transfers/entry_row.rs b/crates/nyaterm-desktop/src/features/pages/transfers/entry_row.rs
index 11b97122..8d8b7c92 100644
--- a/crates/nyaterm-desktop/src/features/pages/transfers/entry_row.rs
+++ b/crates/nyaterm-desktop/src/features/pages/transfers/entry_row.rs
@@ -42,7 +42,7 @@ pub(super) fn transfer_browser_parent_entry_row(
                 .px_2()
                 .text_size(px(12.))
                 .text_color(rgb(palette.text))
-                .child(transfer_entry_icon(true, false, false))
+                .child(transfer_entry_icon(palette, "..", true, false, false))
                 .child(".."),
         )
         .child(transfer_browser_text_cell(
@@ -190,6 +190,8 @@ pub(super) fn transfer_browser_entry_row(
                     rgb(palette.text)
                 })
                 .child(transfer_entry_icon(
+                    palette,
+                    &entry.name,
                     is_directory,
                     entry.file_type == SftpFileType::Symlink,
                     is_marked_or_selected,
diff --git a/crates/nyaterm-desktop/src/features/panels/connection_import_overlay.rs b/crates/nyaterm-desktop/src/features/panels/connection_import_overlay.rs
index 1e1b6327..304749cb 100644
--- a/crates/nyaterm-desktop/src/features/panels/connection_import_overlay.rs
+++ b/crates/nyaterm-desktop/src/features/panels/connection_import_overlay.rs
@@ -3,7 +3,7 @@ use gpui::{
     rgb, rgba, svg,
 };
 
-use crate::features::{NyaTermApp, modal_close_icon_button};
+use crate::features::{NyaTermApp, color_icon, modal_close_icon_button, mono_icon};
 use crate::models::ConnectionImportSource;
 use crate::theme::ThemePalette;
 
@@ -116,7 +116,7 @@ impl NyaTermApp {
                             .child(connection_import_source_card(
                                 palette,
                                 "connection-import-xshell",
-                                "icons/import/xshell.svg",
+                                "color/brand/xshell.png",
                                 "Xshell",
                                 ".xts",
                                 cx.listener(|this, _, _, cx| {
@@ -129,7 +129,7 @@ impl NyaTermApp {
                             .child(connection_import_source_card(
                                 palette,
                                 "connection-import-mobaxterm",
-                                "icons/import/mobaxterm.svg",
+                                "color/brand/mobaxterm.png",
                                 "MobaXterm",
                                 ".mxtsessions",
                                 cx.listener(|this, _, _, cx| {
@@ -142,7 +142,7 @@ impl NyaTermApp {
                             .child(connection_import_source_card(
                                 palette,
                                 "connection-import-windterm",
-                                "icons/import/windterm.svg",
+                                "color/brand/windterm.png",
                                 "WindTerm",
                                 ".sessions",
                                 cx.listener(|this, _, _, cx| {
@@ -250,7 +250,12 @@ fn connection_import_source_card(
         .cursor_pointer()
         .hover(move |this| this.border_color(rgb(palette.primary)).bg(hover))
         .on_click(on_click)
-        .child(svg().size(px(40.)).path(icon))
+        .child(if icon.starts_with("color/") {
+            // Vendor logos are full-color rasters; they cannot go through svg().
+            color_icon(icon, 40.).into_any_element()
+        } else {
+            mono_icon(icon, rgb(palette.text).into(), 40.).into_any_element()
+        })
         .child(
             div()
                 .max_w_full()
diff --git a/crates/nyaterm-desktop/src/features/panels/helpers.rs b/crates/nyaterm-desktop/src/features/panels/helpers.rs
index 726c91c3..a63fdef8 100644
--- a/crates/nyaterm-desktop/src/features/panels/helpers.rs
+++ b/crates/nyaterm-desktop/src/features/panels/helpers.rs
@@ -127,23 +127,14 @@ pub(in crate::features::panels) fn quick_command_icon_mark(
     icon_tag: Option<&str>,
     color_tag: Option<&str>,
 ) -> impl IntoElement {
-    match icon_tag.and_then(|tag| quick_command_icon_def(palette, tag)) {
-        Some((label, color)) => div()
-            .size(px(18.))
-            .flex_none()
-            .rounded_sm()
-            .border_1()
-            .border_color(color)
-            .bg(rgb(palette.input))
-            .flex()
-            .items_center()
-            .justify_center()
-            .font_family(crate::features::gpui_code_font_family())
-            .text_size(px(8.))
-            .font_weight(FontWeight(800.))
-            .text_color(color)
-            .child(label)
-            .into_any_element(),
+    match icon_tag.and_then(quick_command_icon) {
+        Some(def) => crate::features::mono_icon(
+            def.path,
+            rgb(def.tint(palette).unwrap_or(palette.text)).into(),
+            16.,
+        )
+        .into_any_element(),
+        // No icon chosen: the command still gets its color, as a plain dot.
         None => div()
             .size(px(9.))
             .flex_none()
@@ -177,45 +168,6 @@ pub(in crate::features::panels) fn quick_command_color(
     }
 }
 
-fn quick_command_icon_def(
-    palette: crate::theme::ThemePalette,
-    icon_tag: &str,
-) -> Option<(&'static str, gpui::Rgba)> {
-    match icon_tag.trim().to_ascii_lowercase().as_str() {
-        "docker" => Some(("DK", rgb(0x2496ed))),
-        "k8s" => Some(("K8", rgb(0x326ce5))),
-        "linux" => Some(("LX", rgb(0xfcc624))),
-        "ubuntu" => Some(("UB", rgb(0xe95420))),
-        "debian" => Some(("DB", rgb(0xa81d33))),
-        "centos" => Some(("CE", rgb(0x7f3f98))),
-        "fedora" => Some(("FE", rgb(0x3c6eb4))),
-        "apple" => Some(("AP", rgb(0xa2aaad))),
-        "github" => Some(("GH", rgb(0xe5e7eb))),
-        "gitlab" => Some(("GL", rgb(0xfc6d26))),
-        "nginx" => Some(("NX", rgb(0x009639))),
-        "redis" => Some(("RD", rgb(0xdc382d))),
-        "postgres" => Some(("PG", rgb(0x4169e1))),
-        "mysql" => Some(("MY", rgb(0x4479a1))),
-        "mongodb" => Some(("MO", rgb(0x47a248))),
-        "python" => Some(("PY", rgb(0x3776ab))),
-        "js" => Some(("JS", rgb(0xf7df1e))),
-        "ts" => Some(("TS", rgb(0x3178c6))),
-        "rust" => Some(("RS", rgb(0xce412b))),
-        "go" => Some(("GO", rgb(0x00add8))),
-        "node" => Some(("ND", rgb(0x339933))),
-        "php" => Some(("PH", rgb(0x777bb4))),
-        "aws" => Some(("AWS", rgb(0xff9900))),
-        "gcp" => Some(("GC", rgb(0x4285f4))),
-        "terminal" => Some((">$", rgb(palette.success))),
-        "code" => Some(("</>", rgb(palette.link))),
-        "server" => Some(("SR", rgb(palette.link))),
-        "folder" => Some(("FD", rgb(palette.warning))),
-        "sparkles" => Some(("AI", rgb(palette.link))),
-        "bolt" => Some(("BT", rgb(palette.warning))),
-        _ => None,
-    }
-}
-
 pub(in crate::features::panels) fn quick_command_editor_field(
     palette: crate::theme::ThemePalette,
     id: &'static str,
diff --git a/crates/nyaterm-desktop/src/features/panels/temporary_ssh_link_overlay.rs b/crates/nyaterm-desktop/src/features/panels/temporary_ssh_link_overlay.rs
index 9d1b0d29..add9c06f 100644
--- a/crates/nyaterm-desktop/src/features/panels/temporary_ssh_link_overlay.rs
+++ b/crates/nyaterm-desktop/src/features/panels/temporary_ssh_link_overlay.rs
@@ -69,12 +69,11 @@ impl NyaTermApp {
                                         .flex()
                                         .items_center()
                                         .gap_2()
-                                        .child(
-                                            div()
-                                                .text_size(px(14.))
-                                                .text_color(rgb(palette.link))
-                                                .child("⚡"),
-                                        )
+                                        .child(div().child(crate::features::mono_icon(
+                                            "icons/conn/flash.svg",
+                                            rgb(palette.link).into(),
+                                            14.,
+                                        )))
                                         .child(
                                             div()
                                                 .text_sm()
diff --git a/crates/nyaterm-desktop/src/features/remote/remote_runtime/stats.rs b/crates/nyaterm-desktop/src/features/remote/remote_runtime/stats.rs
index faed7faf..cd19c4c9 100644
--- a/crates/nyaterm-desktop/src/features/remote/remote_runtime/stats.rs
+++ b/crates/nyaterm-desktop/src/features/remote/remote_runtime/stats.rs
@@ -93,6 +93,9 @@ impl NyaTermApp {
                         stats.load.load15
                     );
                     self.terminal.view.status = self.remote_ops.stats.status.clone();
+                    // The snapshot is the only place the remote OS is reported,
+                    // so this is where a connection's icon can be filled in.
+                    self.apply_auto_detected_connection_icon(&event.session_id, &stats.system);
                     self.remote_ops.stats.data = Some(stats);
                 }
                 Err(error) => {
diff --git a/crates/nyaterm-desktop/src/features/shell/activity_bar_runtime.rs b/crates/nyaterm-desktop/src/features/shell/activity_bar_runtime.rs
index bac960ad..99507ad6 100644
--- a/crates/nyaterm-desktop/src/features/shell/activity_bar_runtime.rs
+++ b/crates/nyaterm-desktop/src/features/shell/activity_bar_runtime.rs
@@ -12,6 +12,8 @@ pub(in crate::features) struct ActivityBarDragPayload {
     pub zone: ActivityBarZone,
     pub index: usize,
     pub label: String,
+    /// The dragged entry's own icon, so the preview reads as the thing being moved.
+    pub icon_path: &'static str,
 }
 
 pub(in crate::features) struct ActivityBarDragPreview {
@@ -46,13 +48,11 @@ impl Render for ActivityBarDragPreview {
                     .border_color(rgb(0x334155))
                     .bg(rgba(0x151b24dd))
                     .shadow_lg()
-                    .child(
-                        div()
-                            .text_size(px(10.))
-                            .font_weight(FontWeight(800.))
-                            .text_color(rgb(0x93c5fd))
-                            .child("ACT"),
-                    )
+                    .child(crate::features::mono_icon(
+                        self.payload.icon_path,
+                        rgb(0x93c5fd).into(),
+                        14.,
+                    ))
                     .child(
                         div()
                             .min_w_0()
diff --git a/crates/nyaterm-desktop/src/features/shell/tab_mouse.rs b/crates/nyaterm-desktop/src/features/shell/tab_mouse.rs
index 73f96caf..3b53747f 100644
--- a/crates/nyaterm-desktop/src/features/shell/tab_mouse.rs
+++ b/crates/nyaterm-desktop/src/features/shell/tab_mouse.rs
@@ -120,7 +120,11 @@ impl Render for SessionTabTooltip {
                             .text_color(rgb(0x8f98aa))
                             .hover(|style| style.bg(rgb(0x334155)).text_color(rgb(0xe5edf7)))
                             .cursor_pointer()
-                            .child("⧉")
+                            .child(crate::features::mono_icon(
+                                "icons/copy.svg",
+                                rgb(0x8f98aa).into(),
+                                11.,
+                            ))
                             .on_click(cx.listener(move |_, _, _, cx| {
                                 cx.stop_propagation();
                                 cx.write_to_clipboard(ClipboardItem::new_string(
diff --git a/crates/nyaterm-desktop/src/features/terminal/terminal_context_menu_runtime/helpers.rs b/crates/nyaterm-desktop/src/features/terminal/terminal_context_menu_runtime/helpers.rs
index f7486a5e..29eb490b 100644
--- a/crates/nyaterm-desktop/src/features/terminal/terminal_context_menu_runtime/helpers.rs
+++ b/crates/nyaterm-desktop/src/features/terminal/terminal_context_menu_runtime/helpers.rs
@@ -20,8 +20,31 @@ pub(super) fn terminal_ctx_item(
     label: impl Into<String>,
     shortcut: Option<String>,
     on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+) -> impl IntoElement {
+    terminal_ctx_item_with_icon(palette, id, label, None, shortcut, on_click)
+}
+
+pub(super) fn terminal_ctx_item_with_icon(
+    palette: crate::theme::ThemePalette,
+    id: impl Into<String>,
+    label: impl Into<String>,
+    icon: Option<crate::features::IconDef>,
+    shortcut: Option<String>,
+    on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
 ) -> impl IntoElement {
     let label = label.into();
+    let leading = div()
+        .flex()
+        .items_center()
+        .gap_2()
+        .when_some(icon, |this, def| {
+            this.child(crate::features::mono_icon(
+                def.path,
+                rgb(def.tint(palette).unwrap_or(palette.text)).into(),
+                14.,
+            ))
+        })
+        .child(label);
     let mut row = div()
         .id(SharedString::from(id.into()))
         .h(px(28.))
@@ -35,7 +58,7 @@ pub(super) fn terminal_ctx_item(
         .cursor_pointer()
         .hover(|this| this.bg(rgb(palette.hover)))
         .on_click(on_click)
-        .child(div().child(label));
+        .child(leading);
     if let Some(shortcut) = shortcut {
         row = row.child(
             div()
@@ -189,23 +212,3 @@ pub(super) fn selection_as_openable_url(selected: &str) -> Option<String> {
     }
     None
 }
-
-pub(super) fn search_engine_menu_icon_prefix(icon: Option<&str>) -> String {
-    let label = match icon.unwrap_or("default") {
-        "google" => "G",
-        "bing" => "B",
-        "duckduckgo" => "D",
-        "github" => "GH",
-        "gitlab" => "GL",
-        "baidu" => "Bd",
-        "yahoo" => "Y!",
-        "youtube" => "YT",
-        "bilibili" => "Bi",
-        "zhihu" => "Zh",
-        "openai" => "AI",
-        "claude" => "Cl",
-        "gemini" => "Ge",
-        _ => "·",
-    };
-    format!("[{label}] ")
-}
diff --git a/crates/nyaterm-desktop/src/features/terminal/terminal_context_menu_runtime/menu.rs b/crates/nyaterm-desktop/src/features/terminal/terminal_context_menu_runtime/menu.rs
index 62a5ea59..edbdeec9 100644
--- a/crates/nyaterm-desktop/src/features/terminal/terminal_context_menu_runtime/menu.rs
+++ b/crates/nyaterm-desktop/src/features/terminal/terminal_context_menu_runtime/menu.rs
@@ -415,11 +415,13 @@ impl NyaTermApp {
                     panel =
                         panel.children(search_engines.into_iter().map(|(name, template, icon)| {
                             let query = selected.clone();
-                            let icon_prefix = search_engine_menu_icon_prefix(icon.as_deref());
-                            terminal_ctx_item(
+                            let icon_def =
+                                crate::features::search_engine_icon(icon.as_deref(), palette);
+                            terminal_ctx_item_with_icon(
                                 palette,
                                 format!("term-ctx-search-{name}"),
-                                format!("{icon_prefix}{name}"),
+                                name.clone(),
+                                Some(icon_def),
                                 None,
                                 cx.listener(move |this, _, _, cx| {
                                     this.close_terminal_context_menu(cx);
diff --git a/crates/nyaterm-desktop/src/features/view_widgets/icons.rs b/crates/nyaterm-desktop/src/features/view_widgets/icons.rs
index 9daa8754..4e0af958 100644
--- a/crates/nyaterm-desktop/src/features/view_widgets/icons.rs
+++ b/crates/nyaterm-desktop/src/features/view_widgets/icons.rs
@@ -1,33 +1,47 @@
-use super::*;
+use gpui::{AnyElement, Hsla, Img, IntoElement, Svg, div, img, prelude::*, px, rgb, svg};
 
-/// Monochrome activity-bar SVG icon with glyph fallback.
+use crate::features::{IconDef, file_entry_icon};
+use crate::theme::ThemePalette;
+
+/// Paint a monochrome asset from `icons/**`.
+///
+/// GPUI rasterizes `svg()` into an alpha mask and keeps only the coverage
+/// channel, so whatever paints the file declares are discarded and `color` is the
+/// only thing that reaches the screen. That is what makes one glyph usable in
+/// seven tints, and it is also why a full-color logo cannot go through here.
+pub(in crate::features) fn mono_icon(path: &'static str, color: Hsla, size_px: f32) -> Svg {
+    debug_assert!(
+        path.starts_with("icons/"),
+        "monochrome icons live under icons/: {path}"
+    );
+    svg()
+        .size(px(size_px))
+        .flex_none()
+        .path(path)
+        .text_color(color)
+}
+
+/// Paint a full-color asset from `color/**`.
+///
+/// Unlike [`mono_icon`] this keeps the rasterized pixels, so the asset **cannot
+/// be tinted** — callers must express selection or hover with surrounding chrome
+/// instead. Decoding happens off the render thread, so the first frame after a
+/// cold start paints nothing; give the icon a reserved size to avoid a reflow.
+pub(in crate::features) fn color_icon(path: &'static str, size_px: f32) -> Img {
+    debug_assert!(
+        path.starts_with("color/"),
+        "full-color icons live under color/: {path}"
+    );
+    img(path).size(px(size_px)).flex_none()
+}
+
+/// Activity-bar icon.
 pub(in crate::features) fn activity_icon(
-    path: Option<&'static str>,
-    glyph: &'static str,
-    color: gpui::Hsla,
+    path: &'static str,
+    color: Hsla,
     size_px: f32,
-) -> gpui::AnyElement {
-    let size = px(size_px);
-    if let Some(path) = path {
-        svg()
-            .size(size)
-            .flex_none()
-            .path(path)
-            .text_color(color)
-            .into_any_element()
-    } else {
-        div()
-            .size(size)
-            .flex_none()
-            .flex()
-            .items_center()
-            .justify_center()
-            .text_size(px(size_px * 0.72))
-            .font_weight(FontWeight(700.))
-            .text_color(color)
-            .child(glyph)
-            .into_any_element()
-    }
+) -> AnyElement {
+    mono_icon(path, color, size_px).into_any_element()
 }
 
 /// Faded NyaTerm logo used by empty workspace (Tauri EmptyWorkspaceState).
@@ -36,61 +50,63 @@ pub(in crate::features) fn nyaterm_logo_mark(
     size_px: f32,
     opacity: f32,
 ) -> impl IntoElement {
-    let size = px(size_px);
     div()
-        .size(size)
+        .size(px(size_px))
         .flex_none()
         .opacity(opacity)
         .flex()
         .items_center()
         .justify_center()
-        .child(
-            svg()
-                .size(size)
-                .path("icons/logo.svg")
-                .text_color(rgb(palette.text_muted)),
-        )
+        .child(mono_icon(
+            "icons/logo.svg",
+            rgb(palette.text_muted).into(),
+            size_px,
+        ))
 }
 
-/// Colored connection/OS icon for saved connection rows (Tauri resolveConnectionIcon).
-pub(in crate::features) fn connection_type_icon(
+/// Paint a resolved [`IconDef`], honoring whichever element the asset needs.
+///
+/// `selected` only reaches monochrome icons: a full-color logo cannot be tinted,
+/// so selection has to be carried by the row's own background. That matches the
+/// pre-GPUI UI, where these were `<img>` tags and the configured color was inert.
+pub(in crate::features) fn themed_icon(
     palette: ThemePalette,
-    def: ConnectionIconDef,
+    def: IconDef,
     selected: bool,
     size_px: f32,
-) -> gpui::AnyElement {
-    let size = px(size_px);
-    let color = if selected {
-        rgb(palette.link)
-    } else {
-        rgb(def.color)
-    };
-    svg()
-        .size(size)
-        .flex_none()
-        .path(def.path)
-        .text_color(color)
-        .into_any_element()
+) -> AnyElement {
+    match def.tint(palette) {
+        Some(color) => {
+            let color = if selected { palette.link } else { color };
+            mono_icon(def.path, rgb(color).into(), size_px).into_any_element()
+        }
+        None => color_icon(def.path, size_px).into_any_element(),
+    }
 }
 
-/// Tauri file explorer entry icon (folder / symlink / file).
+/// Connection / OS icon for saved connection rows, tabs and the session header.
+pub(in crate::features) fn connection_type_icon(
+    palette: ThemePalette,
+    def: IconDef,
+    selected: bool,
+    size_px: f32,
+) -> AnyElement {
+    themed_icon(palette, def, selected, size_px)
+}
+
+/// File explorer entry icon, colored by kind and extension.
 pub(in crate::features) fn transfer_entry_icon(
+    palette: ThemePalette,
+    name: &str,
     is_directory: bool,
     is_symlink: bool,
     selected: bool,
-) -> gpui::AnyElement {
-    let (path, color) = if is_symlink {
-        ("icons/conn/symlink.svg", 0x67e8f9u32)
-    } else if is_directory {
-        ("icons/conn/folder.svg", 0xfbbf24u32)
+) -> AnyElement {
+    let def = file_entry_icon(name, is_directory, is_symlink, palette);
+    let color = if selected {
+        palette.link
     } else {
-        ("icons/conn/file.svg", 0x94a3b8u32)
+        def.tint(palette).unwrap_or(palette.text_muted)
     };
-    let color = if selected { 0x58a6ffu32 } else { color };
-    svg()
-        .size(px(16.))
-        .flex_none()
-        .path(path)
-        .text_color(rgb(color))
-        .into_any_element()
+    mono_icon(def.path, rgb(color).into(), 16.).into_any_element()
 }
diff --git a/crates/nyaterm-desktop/src/features/view_widgets/mod.rs b/crates/nyaterm-desktop/src/features/view_widgets/mod.rs
index 803367ea..6aea9596 100644
--- a/crates/nyaterm-desktop/src/features/view_widgets/mod.rs
+++ b/crates/nyaterm-desktop/src/features/view_widgets/mod.rs
@@ -13,7 +13,7 @@ use crate::models::WorkspaceSplitDirection;
 use crate::widgets::{mode_button, small_button, status_pill};
 
 use super::{
-    ConnectionIconDef, InlineMdStyle, MarkdownBlock, ThemePalette, cloud_sync_history_summary,
+    InlineMdStyle, MarkdownBlock, ThemePalette, cloud_sync_history_summary,
     cloud_sync_kind_text_color, cloud_sync_status_dot_color, cloud_sync_status_text_color,
     compact_id, docker_state_color, docker_state_label, format_history_timestamp_ms, format_rate,
     parse_inline_markdown, parse_markdown_blocks, tunnel_endpoint, tunnel_name,
diff --git a/crates/nyaterm-desktop/src/models/navigation.rs b/crates/nyaterm-desktop/src/models/navigation.rs
index d0fd920d..06804dcd 100644
--- a/crates/nyaterm-desktop/src/models/navigation.rs
+++ b/crates/nyaterm-desktop/src/models/navigation.rs
@@ -82,29 +82,9 @@ impl NavItem {
     }
 
     /// Compact monochrome glyph used as text fallback for the activity bar.
-    pub(crate) fn glyph(self) -> &'static str {
-        match self {
-            NavItem::Workspace => "▣",
-            NavItem::Connections => "⌂",
-            NavItem::Tunnels => "⇄",
-            NavItem::Stats => "◔",
-            NavItem::Processes => "☰",
-            NavItem::Docker => "🐋",
-            NavItem::Transfers => "📁",
-            NavItem::Settings => "⚙",
-            NavItem::Migration => "⇪",
-            NavItem::AiAssistant => "✦",
-            NavItem::ActiveSessions => "◉",
-            NavItem::CommandHistory => "⌛",
-            NavItem::SecurityAuth => "⛨",
-            NavItem::SyncBackupHistory => "☁",
-            NavItem::Recording => "●",
-        }
-    }
-
     /// Bundled SVG path for activity-bar / toolbar icons.
-    pub(crate) fn icon_path(self) -> Option<&'static str> {
-        Some(match self {
+    pub(crate) fn icon_path(self) -> &'static str {
+        match self {
             NavItem::Transfers => "icons/files.svg",
             NavItem::Tunnels => "icons/network.svg",
             NavItem::SecurityAuth => "icons/auth.svg",
@@ -119,8 +99,8 @@ impl NavItem {
             NavItem::Docker => "icons/docker.svg",
             NavItem::Recording => "icons/record.svg",
             NavItem::Migration => "icons/migration.svg",
-            NavItem::Workspace => return None,
-        })
+            NavItem::Workspace => "icons/workspace.svg",
+        }
     }
 
     pub(crate) fn is_left_panel(self) -> bool {
@@ -292,23 +272,13 @@ impl ActivityBarEntry {
         }
     }
 
-    pub(crate) fn glyph(self) -> &'static str {
-        match self {
-            Self::Panel(item) => item.glyph(),
-            Self::QuickCommands => "⚡",
-            Self::CommandSend => "⏎",
-            Self::Recording => "●",
-            Self::Lock => "🔒",
-        }
-    }
-
-    pub(crate) fn icon_path(self) -> Option<&'static str> {
+    pub(crate) fn icon_path(self) -> &'static str {
         match self {
             Self::Panel(item) => item.icon_path(),
-            Self::QuickCommands => Some("icons/commands.svg"),
-            Self::CommandSend => Some("icons/send.svg"),
-            Self::Recording => Some("icons/record.svg"),
-            Self::Lock => Some("icons/lock.svg"),
+            Self::QuickCommands => "icons/commands.svg",
+            Self::CommandSend => "icons/send.svg",
+            Self::Recording => "icons/record.svg",
+            Self::Lock => "icons/lock.svg",
         }
     }
 }
diff --git a/crates/nyaterm-desktop/src/models/session_event_bridge.rs b/crates/nyaterm-desktop/src/models/session_event_bridge.rs
index 04f07ff2..0063dd8b 100644
--- a/crates/nyaterm-desktop/src/models/session_event_bridge.rs
+++ b/crates/nyaterm-desktop/src/models/session_event_bridge.rs
@@ -15,6 +15,10 @@ use super::{TerminalFrameOutputSubmission, TerminalFramePipeline};
 const SESSION_EVENT_BRIDGE_DRAIN_BATCH: usize = 512;
 const SESSION_EVENT_BRIDGE_OUTPUT_BUDGET: usize = 128 * 1024;
 const SESSION_EVENT_BRIDGE_IDLE_SLEEP: Duration = Duration::from_millis(4);
+/// Upper bound on one park in the source drain. The queue wakes this thread as
+/// soon as a PTY read lands, so the timeout only bounds how long a fully idle
+/// bridge waits before re-checking its stop flag.
+const SESSION_EVENT_BRIDGE_WAIT_TIMEOUT: Duration = Duration::from_millis(50);
 const SESSION_EVENT_BRIDGE_BUSY_SLEEP: Duration = Duration::from_millis(1);
 const SESSION_EVENT_BRIDGE_UI_OUTPUT_LIMIT: usize = 1024 * 1024;
 const SESSION_EVENT_BRIDGE_UI_OUTPUT_EVENT_LIMIT: usize = 128 * 1024;
@@ -475,22 +479,20 @@ fn run_session_event_bridge(
             thread::sleep(SESSION_EVENT_BRIDGE_BUSY_SLEEP);
             continue;
         }
-        let Ok(drain) = session_manager.drain_events_with_output_budget(
+        // Park on the queue rather than polling it: a PTY read wakes this
+        // thread directly, so the first hop of the echo path no longer spends
+        // an arbitrary slice of the poll interval waiting to notice.
+        let Ok(drain) = session_manager.drain_events_blocking_with_output_budget(
             SESSION_EVENT_BRIDGE_DRAIN_BATCH,
             SESSION_EVENT_BRIDGE_OUTPUT_BUDGET,
+            SESSION_EVENT_BRIDGE_WAIT_TIMEOUT,
         ) else {
             thread::sleep(SESSION_EVENT_BRIDGE_IDLE_SLEEP);
             continue;
         };
         state.update_source_stats(&drain.stats);
         if drain.events.is_empty() {
-            thread::sleep(
-                if drain.stats.queued_events > 0 || drain.stats.queued_output_bytes > 0 {
-                    SESSION_EVENT_BRIDGE_BUSY_SLEEP
-                } else {
-                    SESSION_EVENT_BRIDGE_IDLE_SLEEP
-                },
-            );
+            // The park above already absorbed the idle wait.
             continue;
         }
         let mut pending_direct_outputs = Vec::new();
diff --git a/crates/nyaterm-ui/src/lib.rs b/crates/nyaterm-ui/src/lib.rs
index 1a6a042c..c2d16e6e 100644
--- a/crates/nyaterm-ui/src/lib.rs
+++ b/crates/nyaterm-ui/src/lib.rs
@@ -5,6 +5,6 @@ mod widgets;
 
 pub use theme::{APPEARANCE_THEME_IDS, ThemePalette, appearance_theme_label, theme_palette};
 pub use widgets::{
-    capability_line, empty_panel, icon_button, mode_button, section_header, session_info_row,
-    small_button, status_pill, svg_icon_button,
+    capability_line, empty_panel, mode_button, section_header, session_info_row, small_button,
+    status_pill, svg_icon_button,
 };
diff --git a/docs/architecture/gpui-migration-status.md b/docs/architecture/gpui-migration-status.md
index ae58c24d..767ad790 100644
--- a/docs/architecture/gpui-migration-status.md
+++ b/docs/architecture/gpui-migration-status.md
@@ -37,6 +37,26 @@ these as staged extraction candidates, not as formatting-only refactor targets.
 
 ## Completed
 
+- Icon assets are no longer hand-drawn approximations. The migration had redrawn
+  ~113 SVGs by hand in a thin-stroke style, while the pre-GPUI UI was
+  overwhelmingly Material Design (140 `react-icons/md` imports against 41 lucide,
+  and those 41 were shadcn internals) — which is why the two builds looked
+  nothing alike. Icons are now vendored from their upstream sets through
+  `scripts/icons.manifest` + `scripts/sync-icons.sh` and committed; see
+  `docs/third-party-icons.md`.
+- The monochrome/full-color split is explicit and enforced. `icons/**` goes
+  through `mono_icon()`/`svg()` as an alpha mask, `color/**` through
+  `color_icon()`/`img()` as a raster. This is what let the 33 official distro
+  logos come back: previously 14 distros shared one tinted Tux, Kubernetes wore
+  the Docker whale, and 14 services shared a tinted server rack, because `svg()`
+  cannot carry more than one color.
+- The icon lookup tables live in `features/icons/` (connection, quick-command,
+  search-engine, file-kind, alias normalization, remote-system inference), split
+  from the element construction in `features/view_widgets/icons.rs`. The
+  two-letter text badges (`"DK"`, `"K8"`, `"UB"`) and the letter search-engine
+  badges (`"G"`, `"GH"`) are gone, along with the duplicate badge table the
+  terminal context menu carried.
+
 - Workspace is already on resolver `3` for the Rust 2024 workspace.
 - `migration-dashboard` exists as an explicit desktop feature. Default desktop
   features are empty, so release/default builds do not enable the dashboard.
diff --git a/docs/third-party-icons.md b/docs/third-party-icons.md
new file mode 100644
index 00000000..2298c772
--- /dev/null
+++ b/docs/third-party-icons.md
@@ -0,0 +1,58 @@
+# Third-party icon assets
+
+Everything under `crates/nyaterm-app/assets/` is vendored from an upstream icon
+set or carried over from the pre-GPUI NyaTerm release. The mapping from each
+bundled file to its exact upstream source is `scripts/icons.manifest`; the
+pinned versions live at the top of `scripts/sync-icons.sh`, and re-running that
+script reproduces the committed tree.
+
+Assets are committed rather than fetched at build time, so the build stays
+offline. `bash scripts/sync-icons.sh --check` verifies the tree still matches the
+manifest.
+
+## Sources
+
+| Set | Used for | Version | License |
+|---|---|---|---|
+| [Material Design Icons](https://github.com/marella/material-design-icons) (`@material-design-icons/svg`) | The bulk of the UI chrome — activity bar, menus, file explorer, session and transfer controls, file-kind icons | 0.14.15 | Apache-2.0 |
+| [Simple Icons](https://github.com/simple-icons/simple-icons) | Monochrome brand marks (Docker, Kubernetes, Postgres, distro wordmarks, search engines) | 16.27.1 | CC0-1.0 |
+| [VS Code Codicons](https://github.com/microsoft/vscode-codicons) | Window title-bar controls only. Material has no thin-stroke equivalent, and the pre-GPUI UI used this same set. | 0.0.46-24 | CC BY 4.0 |
+| [Font Awesome Free](https://github.com/FortAwesome/Font-Awesome) | The default server glyph, plus the AWS and Yahoo marks that Simple Icons no longer ships | 7.3.1 | CC BY 4.0 |
+| [Remix Icon](https://github.com/Remix-Design/RemixIcon) | The OpenAI mark, likewise absent from Simple Icons | 4.9.1 | Apache-2.0 |
+| NyaTerm | `icons/logo.svg`, and the full-color OS/distro logos and importer brand marks under `color/` | — | Project assets, carried over from the Tauri release |
+
+CC BY 4.0 requires attribution; this file is that attribution. Apache-2.0
+requires the license and notice be carried; both sets are unmodified copies, and
+their upstream repositories above hold the canonical texts.
+
+## Layout, and why the prefix matters
+
+```
+crates/nyaterm-app/assets/
+├── icons/**   monochrome — painted with svg() through mono_icon()
+└── color/**   full color — painted with img() through color_icon()
+```
+
+The split is not cosmetic. GPUI's `svg()` rasterizes to an **alpha mask** and
+keeps only the coverage channel, so an asset's own paints are discarded and the
+color comes entirely from `.text_color()`. That is what lets one server glyph
+serve seven theme hues — and it is also why a multi-color distro logo cannot go
+through it, which is how the migration ended up with fourteen distros sharing one
+tinted Tux.
+
+`img()` keeps the rasterized pixels, so a logo survives intact, but it cannot be
+tinted and it is decoded asynchronously.
+
+Two consequences are enforced by tests in `crates/nyaterm-app/src/assets.rs`:
+
+- **No raster payloads under `icons/`.** GPUI builds resvg without the
+  `raster-images` feature, so an SVG wrapping a base64 PNG renders as nothing at
+  all — no error, no log line. The importer brand logos arrived in exactly that
+  shape and are extracted to real `.png` files under `color/brand/`.
+- **Full-color assets stay small.** `img()` rasterizes at twice an asset's
+  *intrinsic* size, not its display size, and the decoded image is never evicted.
+  The vendored logos are re-declared at 32px (their `viewBox` untouched), which
+  is the difference between ~0.5 MB and ~50 MB resident for a set of 16px icons.
+
+`bash scripts/check-icon-references.sh` checks the other direction: that every
+path the UI references is bundled, and that the element matches the prefix.
diff --git a/scripts/icons.manifest b/scripts/icons.manifest
new file mode 100644
index 00000000..d5249c5b
--- /dev/null
+++ b/scripts/icons.manifest
@@ -0,0 +1,245 @@
+# Icon vendoring manifest, consumed by scripts/sync-icons.sh.
+#
+# Format:  <destination under crates/nyaterm-app/assets>  <TAB>  <source spec>
+#
+# Source specs:
+#   md:<variant>/<file>   @material-design-icons/svg  (Apache-2.0)
+#   si:<slug>.svg         simple-icons                (CC0-1.0)
+#   fa:<style>/<file>     @fortawesome/fontawesome-free svgs/  (CC BY 4.0)
+#   vsc:<file>            @vscode/codicons src/icons/ (CC BY 4.0)
+#   rmx:<dir>/<file>      remixicon icons/            (Apache-2.0)
+#   local-svg:<rel>       temp/nyaterm-tauri/public/icons/<rel>, cleaned + resized
+#   local-png:<rel>       ditto, but the base64 payload is extracted to a real PNG
+#   keep                  hand-authored here; the script must not touch it
+#
+# Destination prefix encodes the render mode and is enforced by tests in
+# crates/nyaterm-app/src/assets.rs:
+#   icons/**  monochrome, painted with svg() + text_color (all paint discarded)
+#   color/**  full color, painted with img() (cannot be tinted)
+#
+# Pinned upstream versions live in scripts/sync-icons.sh.
+
+# --- Shell chrome -----------------------------------------------------------
+icons/logo.svg	keep
+icons/ai.svg	md:filled/auto_awesome.svg
+icons/auth.svg	md:filled/vpn_key.svg
+icons/arrow-down.svg	md:filled/arrow_downward.svg
+icons/check.svg	md:filled/check.svg
+icons/chevron-down.svg	md:filled/expand_more.svg
+icons/chevron-up.svg	md:filled/expand_less.svg
+icons/close.svg	md:filled/close.svg
+icons/commands.svg	md:filled/bolt.svg
+icons/connections.svg	md:filled/dns.svg
+icons/copy.svg	md:filled/content_copy.svg
+icons/docker.svg	si:docker.svg
+icons/eye.svg	md:filled/visibility.svg
+icons/files.svg	md:outlined/folder.svg
+icons/history.svg	md:filled/history.svg
+icons/import.svg	md:filled/file_download.svg
+icons/lock.svg	md:filled/lock.svg
+icons/migration.svg	md:filled/move_up.svg
+icons/network.svg	md:filled/lan.svg
+icons/pin.svg	md:filled/push_pin.svg
+icons/processes.svg	md:filled/list_alt.svg
+icons/quote.svg	md:filled/format_quote.svg
+icons/record.svg	md:filled/fiber_manual_record.svg
+icons/resources.svg	md:outlined/monitor_heart.svg
+icons/send.svg	md:filled/send.svg
+icons/sessions.svg	md:filled/link.svg
+icons/settings.svg	md:filled/settings.svg
+icons/sync.svg	md:filled/backup.svg
+icons/translation.svg	md:filled/translate.svg
+icons/view-compact.svg	md:filled/format_list_bulleted.svg
+icons/workspace.svg	md:filled/dashboard.svg
+icons/view-grid.svg	md:filled/grid_view.svg
+icons/view-list.svg	md:filled/view_list.svg
+icons/warning.svg	md:filled/warning_amber.svg
+
+# --- AI panel ---------------------------------------------------------------
+icons/ai/exec-auto.svg	md:filled/warning_amber.svg
+icons/ai/exec-confirm.svg	md:filled/rule.svg
+icons/ai/exec-smart.svg	md:filled/auto_mode.svg
+icons/ai/history.svg	md:filled/history.svg
+icons/ai/new.svg	md:filled/add.svg
+icons/ai/search.svg	md:filled/search.svg
+icons/ai/send.svg	md:filled/send.svg
+icons/ai/settings.svg	md:outlined/settings.svg
+icons/ai/stop.svg	md:filled/stop.svg
+
+# --- Connection chrome (non-brand) ------------------------------------------
+icons/conn/add.svg	md:filled/add.svg
+icons/conn/connect.svg	md:filled/link.svg
+icons/conn/file.svg	md:filled/insert_drive_file.svg
+icons/conn/flash.svg	md:filled/flash_on.svg
+icons/conn/folder.svg	md:filled/folder.svg
+icons/conn/more.svg	md:filled/more_vert.svg
+icons/conn/serial.svg	md:filled/cell_tower.svg
+icons/conn/server.svg	md:filled/dns.svg
+icons/conn/sort.svg	md:filled/sort.svg
+icons/conn/symlink.svg	md:filled/link.svg
+icons/conn/telnet.svg	md:filled/dns.svg
+icons/conn/terminal.svg	md:filled/terminal.svg
+
+# --- File explorer ----------------------------------------------------------
+icons/fe/back.svg	md:filled/chevron_left.svg
+icons/fe/bookmark-remove.svg	md:filled/bookmark_remove.svg
+icons/fe/delete.svg	md:filled/delete.svg
+icons/fe/download.svg	md:filled/download.svg
+icons/fe/forward.svg	md:filled/keyboard_arrow_right.svg
+icons/fe/new-file.svg	md:filled/note_add.svg
+icons/fe/new-folder.svg	md:filled/create_new_folder.svg
+icons/fe/paste.svg	md:filled/content_paste.svg
+icons/fe/refresh.svg	md:filled/refresh.svg
+icons/fe/search.svg	md:filled/search.svg
+icons/fe/star-outline.svg	md:filled/bookmark_border.svg
+icons/fe/star.svg	md:filled/bookmark_added.svg
+icons/fe/sync.svg	md:filled/sync_lock.svg
+icons/fe/up.svg	md:filled/arrow_upward.svg
+icons/fe/upload-folder.svg	md:filled/drive_folder_upload.svg
+icons/fe/upload.svg	md:filled/upload.svg
+
+# --- File-kind icons (getFileIcon port) -------------------------------------
+icons/file/apps.svg	md:filled/apps.svg
+icons/file/archive.svg	md:filled/folder_zip.svg
+icons/file/audio.svg	md:filled/audio_file.svg
+icons/file/code.svg	md:filled/code.svg
+icons/file/data-object.svg	md:filled/data_object.svg
+icons/file/description.svg	md:filled/description.svg
+icons/file/image.svg	md:filled/image.svg
+icons/file/movie.svg	md:filled/movie.svg
+icons/file/pdf.svg	md:filled/picture_as_pdf.svg
+icons/file/present.svg	md:filled/co_present.svg
+icons/file/storage.svg	md:filled/storage.svg
+icons/file/table.svg	md:filled/table_chart.svg
+icons/file/text.svg	md:filled/article.svg
+
+# --- App menu ---------------------------------------------------------------
+icons/menu/article.svg	md:filled/article.svg
+icons/menu/book.svg	md:filled/menu_book.svg
+icons/menu/broadcast.svg	md:filled/cell_tower.svg
+icons/menu/export.svg	md:filled/file_upload.svg
+icons/menu/fit.svg	md:filled/fit_screen.svg
+icons/menu/horizontal.svg	md:filled/horizontal_split.svg
+icons/menu/info.svg	md:filled/info.svg
+icons/menu/menu.svg	md:filled/menu.svg
+icons/menu/palette.svg	md:filled/palette.svg
+icons/menu/reset.svg	md:filled/restart_alt.svg
+icons/menu/sidebar.svg	md:filled/view_sidebar.svg
+icons/menu/split.svg	md:filled/splitscreen.svg
+icons/menu/update.svg	md:filled/update.svg
+icons/menu/vertical.svg	md:filled/vertical_split.svg
+icons/menu/zoom-in.svg	md:filled/zoom_in.svg
+icons/menu/zoom-out.svg	md:filled/zoom_out.svg
+
+# --- Tunnels / network ------------------------------------------------------
+icons/net/delete.svg	md:filled/delete.svg
+icons/net/edit.svg	md:filled/edit.svg
+icons/net/move.svg	md:filled/drive_file_move.svg
+
+# --- Session controls -------------------------------------------------------
+icons/session/disconnect.svg	md:filled/link_off.svg
+icons/session/more.svg	md:filled/more_horiz.svg
+icons/session/reconnect.svg	md:filled/refresh.svg
+icons/session/record.svg	md:filled/fiber_manual_record.svg
+icons/session/rename.svg	md:filled/drive_file_rename_outline.svg
+icons/session/save.svg	md:filled/save.svg
+icons/session/stop.svg	md:filled/stop.svg
+
+# --- Transfer queue ---------------------------------------------------------
+icons/transfer/clear-all.svg	md:filled/delete_sweep.svg
+icons/transfer/pause.svg	md:filled/pause.svg
+icons/transfer/play.svg	md:filled/play_arrow.svg
+icons/transfer/playlist-remove.svg	md:filled/playlist_remove.svg
+icons/transfer/stop.svg	md:filled/block.svg
+
+# --- Window chrome ----------------------------------------------------------
+# Deliberately codicons, not Material: these are thin-stroke title-bar glyphs and
+# Material has no equivalent. The old UI used react-icons/vsc, same source set.
+icons/window/close.svg	vsc:chrome-close.svg
+icons/window/maximize.svg	vsc:chrome-maximize.svg
+icons/window/minimize.svg	vsc:chrome-minimize.svg
+icons/window/restore.svg	vsc:chrome-restore.svg
+
+# --- Monochrome brand marks (QUICK_ICONS / SEARCH_ICONS / file kinds) --------
+icons/brand/apple.svg	si:apple.svg
+icons/brand/aws.svg	fa:brands/aws.svg
+icons/brand/baidu.svg	si:baidu.svg
+icons/brand/bilibili.svg	si:bilibili.svg
+icons/brand/bing.svg	fa:brands/microsoft.svg
+icons/brand/centos.svg	si:centos.svg
+icons/brand/claude.svg	si:claude.svg
+icons/brand/css.svg	si:css.svg
+icons/brand/debian.svg	si:debian.svg
+icons/brand/docker.svg	si:docker.svg
+icons/brand/duckduckgo.svg	si:duckduckgo.svg
+icons/brand/fedora.svg	si:fedora.svg
+icons/brand/gemini.svg	si:googlegemini.svg
+icons/brand/github.svg	si:github.svg
+icons/brand/gitlab.svg	si:gitlab.svg
+icons/brand/go.svg	si:go.svg
+icons/brand/google.svg	si:google.svg
+icons/brand/googlecloud.svg	si:googlecloud.svg
+icons/brand/html5.svg	si:html5.svg
+icons/brand/javascript.svg	si:javascript.svg
+icons/brand/kubernetes.svg	si:kubernetes.svg
+icons/brand/linux.svg	si:linux.svg
+icons/brand/mongodb.svg	si:mongodb.svg
+icons/brand/mysql.svg	si:mysql.svg
+icons/brand/nginx.svg	si:nginx.svg
+icons/brand/nodedotjs.svg	si:nodedotjs.svg
+icons/brand/openai.svg	rmx:Logos/openai-fill.svg
+icons/brand/php.svg	si:php.svg
+icons/brand/postgresql.svg	si:postgresql.svg
+icons/brand/python.svg	si:python.svg
+icons/brand/redis.svg	si:redis.svg
+icons/brand/rust.svg	si:rust.svg
+icons/brand/server.svg	fa:solid/server.svg
+icons/brand/typescript.svg	si:typescript.svg
+icons/brand/ubuntu.svg	si:ubuntu.svg
+icons/brand/yahoo.svg	fa:brands/yahoo.svg
+icons/brand/youtube.svg	si:youtube.svg
+icons/brand/zhihu.svg	si:zhihu.svg
+
+# --- Full-color OS / distro logos (Tauri SYSTEM_ICONS) ----------------------
+color/os/alibabacloudlinux.svg	local-svg:os/AlibabaCloudLinux.svg
+color/os/almalinux.svg	local-svg:os/AlmaLinux.svg
+color/os/alpine-linux.svg	local-svg:os/Alpine-Linux.svg
+color/os/android.svg	local-svg:os/android.svg
+color/os/anolisos.svg	local-svg:os/AnolisOS.svg
+color/os/apple.svg	local-svg:os/apple.svg
+color/os/archlinux.svg	local-svg:os/archlinux.svg
+color/os/aws.svg	local-svg:os/aws.svg
+color/os/centos.svg	local-svg:os/Centos.svg
+color/os/cmd.svg	local-svg:os/cmd.svg
+color/os/debian.svg	local-svg:os/Debian.svg
+color/os/deepin.svg	local-svg:os/Deepin_A.svg
+color/os/fedora.svg	local-svg:os/Fedora.svg
+color/os/gentoo.svg	local-svg:os/Gentoo.svg
+color/os/git.svg	local-svg:os/git.svg
+color/os/h3c.svg	local-svg:os/H3C.svg
+color/os/huawei.svg	local-svg:os/huawei.svg
+color/os/k8s.svg	local-svg:os/K8s.svg
+color/os/kalilinux.svg	local-svg:os/kalilinux.svg
+color/os/kylin.svg	local-svg:os/kylin.svg
+color/os/linux-mint.svg	local-svg:os/linux-mint.svg
+color/os/linux.svg	local-svg:os/linux.svg
+color/os/manjaro.svg	local-svg:os/manjaro.svg
+color/os/nixos.svg	local-svg:os/Nixos.svg
+color/os/openeuler.svg	local-svg:os/OpenEuler.svg
+color/os/opensuse.svg	local-svg:os/openSUSE.svg
+color/os/powershell.svg	local-svg:os/powershell.svg
+color/os/raspberrypi.svg	local-svg:os/Raspberrypi.svg
+color/os/rocky-linux.svg	local-svg:os/rocky-linux.svg
+color/os/tencentos.svg	local-svg:os/TencentOS.svg
+color/os/ubuntu.svg	local-svg:os/Ubuntu.svg
+color/os/uos.svg	local-svg:os/uos.svg
+color/os/windows.svg	local-svg:os/windows.svg
+
+# --- Import-source brand logos ----------------------------------------------
+# These upstream "SVGs" are base64 PNGs in an SVG wrapper. GPUI builds resvg
+# without `raster-images`, so they render blank; the payload is extracted to a
+# real PNG and painted with img(). Only the three importers the app implements
+# are vendored.
+color/brand/mobaxterm.png	local-png:brands/MobaXterm.svg
+color/brand/windterm.png	local-png:brands/WindTerm.svg
+color/brand/xshell.png	local-png:brands/Xshell.svg
diff --git a/scripts/sync-icons.sh b/scripts/sync-icons.sh
new file mode 100644
index 00000000..2f8c63c8
--- /dev/null
+++ b/scripts/sync-icons.sh
@@ -0,0 +1,209 @@
+#!/usr/bin/env bash
+#
+# Vendor the bundled icon assets described by scripts/icons.manifest.
+#
+# The build stays offline: this script is run by hand when the manifest or a
+# pinned version changes, and its output is committed. It exists so the
+# provenance of every icon is reproducible and reviewable rather than folklore.
+#
+#   bash scripts/sync-icons.sh            # sync everything
+#   bash scripts/sync-icons.sh --check    # verify the tree matches, change nothing
+#
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$ROOT_DIR"
+
+ASSET_DIR="crates/nyaterm-app/assets"
+MANIFEST="scripts/icons.manifest"
+LEGACY_ICON_DIR="temp/nyaterm-tauri/public/icons"
+
+# Pinned so a re-run reproduces the committed tree.
+MD_VERSION="0.14.15"        # @material-design-icons/svg   Apache-2.0
+SI_VERSION="16.27.1"        # simple-icons                 CC0-1.0
+FA_VERSION="7.3.1"          # @fortawesome/fontawesome-free CC BY 4.0
+VSC_VERSION="0.0.46-24"     # @vscode/codicons             CC BY 4.0
+RMX_VERSION="4.9.1"         # remixicon                    Apache-2.0
+
+# img() rasterizes at 2x an asset's *intrinsic* size and the result is cached for
+# the process lifetime, so full-color logos are re-declared at this size. The
+# viewBox is left alone, so the artwork is unchanged.
+COLOR_INTRINSIC_PX=32
+
+CHECK_ONLY=0
+[[ "${1:-}" == "--check" ]] && CHECK_ONLY=1
+
+SCRATCH="$(mktemp -d)"
+trap 'rm -rf "$SCRATCH"' EXIT
+
+failures=0
+fail() {
+  printf 'sync-icons: %s\n' "$*" >&2
+  failures=$((failures + 1))
+}
+
+require() {
+  command -v "$1" >/dev/null 2>&1 || {
+    printf 'sync-icons: %s is required\n' "$1" >&2
+    exit 1
+  }
+}
+require curl
+require tar
+require perl
+require base64
+
+# --- upstream fetch ---------------------------------------------------------
+
+fetch_pkg() {
+  # $1 npm package, $2 version, $3 scratch subdir
+  local pkg="$1" version="$2" dest="$SCRATCH/$3"
+  local tarball="${pkg##*/}-$version.tgz"
+  [[ -d "$dest" ]] && return 0
+  mkdir -p "$dest"
+  printf 'sync-icons: fetching %s@%s\n' "$pkg" "$version" >&2
+  curl -fsSL "https://registry.npmjs.org/$pkg/-/$tarball" |
+    tar -xz -C "$dest" --strip-components=1
+}
+
+pkg_root() {
+  case "$1" in
+    md) fetch_pkg "@material-design-icons/svg" "$MD_VERSION" md; printf '%s/md' "$SCRATCH" ;;
+    si) fetch_pkg "simple-icons" "$SI_VERSION" si; printf '%s/si/icons' "$SCRATCH" ;;
+    fa) fetch_pkg "@fortawesome/fontawesome-free" "$FA_VERSION" fa; printf '%s/fa/svgs' "$SCRATCH" ;;
+    vsc) fetch_pkg "@vscode/codicons" "$VSC_VERSION" vsc; printf '%s/vsc/src/icons' "$SCRATCH" ;;
+    rmx) fetch_pkg "remixicon" "$RMX_VERSION" rmx; printf '%s/rmx/icons' "$SCRATCH" ;;
+    *) return 1 ;;
+  esac
+}
+
+# --- transforms -------------------------------------------------------------
+
+# Upstream icon-set files are already optimized and correctly sized; copying them
+# byte-for-byte keeps the vendored tree diffable against upstream.
+copy_verbatim() {
+  cp "$1" "$2"
+}
+
+# The legacy logos carry editor cruft and, more importantly, declare a 256px
+# intrinsic size against a 1024 viewBox. Strip the junk and re-declare the size.
+normalize_color_svg() {
+  local src="$1" dest="$2"
+  perl -0777 -pe '
+    s/<\?xml.*?\?>//gs;
+    s/<!DOCTYPE.*?>//gs;
+    s/<!--.*?-->//gs;
+    s{(<svg\b)([^>]*?)(/?>)}{
+      my ($open, $attrs, $close) = ($1, $2, $3);
+      # Root-only: drop editor metadata and the authored intrinsic size.
+      $attrs =~ s/\s+(?:t|p-id|class|version|id|x|y|xml:space|enable-background)="[^"]*"//g;
+      $attrs =~ s/\s+(?:width|height)="[^"]*"//g;
+      $open . qq{ width="$ENV{COLOR_INTRINSIC_PX}" height="$ENV{COLOR_INTRINSIC_PX}"} . $attrs . $close;
+    }es;
+    # Child elements carry the same exporter junk; ids and gradients must survive.
+    s/\s+(?:t|p-id)="[^"]*"//g;
+    s/^\s+//;
+    s/\s+$//;
+    s/>\s+</></g;
+  ' "$src" > "$dest"
+
+  if grep -q '<image' "$dest"; then
+    fail "$dest still contains <image>; gpui builds resvg without raster-images"
+  fi
+  if grep -q '<text' "$dest"; then
+    printf 'sync-icons: warning: %s renders <text>, so it depends on system fonts\n' "$dest" >&2
+  fi
+}
+
+# Pull the raster payload out of an SVG wrapper and write it as a real image.
+# The data URI is wrapped across lines inside the xlink:href attribute, so this
+# has to read the whole file and strip whitespace rather than match per line.
+extract_embedded_png() {
+  local src="$1" dest="$2" payload
+  payload="$(perl -0777 -ne '
+    if (/data:image\/png;base64,([A-Za-z0-9+\/=\s]+?)["\x27]/s) {
+      my $data = $1;
+      $data =~ s/\s+//g;
+      print $data;
+    }
+  ' "$src")"
+  if [[ -z "$payload" ]]; then
+    fail "$src has no base64 PNG payload to extract"
+    return 0
+  fi
+  printf '%s' "$payload" | base64 -d > "$dest"
+}
+
+# --- driver -----------------------------------------------------------------
+
+export COLOR_INTRINSIC_PX
+
+emit() {
+  local dest_rel="$1" spec="$2"
+  local dest="$ASSET_DIR/$dest_rel"
+  local staged="$SCRATCH/staged/$dest_rel"
+  mkdir -p "$(dirname "$staged")"
+
+  case "$spec" in
+    keep)
+      [[ -f "$dest" ]] || fail "$dest_rel is marked 'keep' but does not exist"
+      return 0
+      ;;
+    local-svg:*)
+      local src="$LEGACY_ICON_DIR/${spec#local-svg:}"
+      [[ -f "$src" ]] || { fail "missing legacy asset $src"; return 0; }
+      normalize_color_svg "$src" "$staged"
+      ;;
+    local-png:*)
+      local src="$LEGACY_ICON_DIR/${spec#local-png:}"
+      [[ -f "$src" ]] || { fail "missing legacy asset $src"; return 0; }
+      extract_embedded_png "$src" "$staged"
+      ;;
+    *:*)
+      local kind="${spec%%:*}" rel="${spec#*:}" root
+      root="$(pkg_root "$kind")" || { fail "unknown source kind '$kind' for $dest_rel"; return 0; }
+      [[ -f "$root/$rel" ]] || { fail "missing upstream $kind:$rel for $dest_rel"; return 0; }
+      copy_verbatim "$root/$rel" "$staged"
+      ;;
+    *)
+      fail "unparseable source spec '$spec' for $dest_rel"
+      return 0
+      ;;
+  esac
+
+  if (( CHECK_ONLY )); then
+    if ! cmp -s "$staged" "$dest"; then
+      fail "$dest_rel is out of date; run bash scripts/sync-icons.sh"
+    fi
+  else
+    mkdir -p "$(dirname "$dest")"
+    cp "$staged" "$dest"
+  fi
+}
+
+count=0
+while IFS=$'\t' read -r dest_rel spec; do
+  # Tolerate a CRLF checkout; a stray \r would otherwise turn every source spec
+  # into an unknown one.
+  dest_rel="${dest_rel%$'\r'}"
+  spec="${spec%$'\r'}"
+  [[ -z "${dest_rel// }" ]] && continue
+  [[ "$dest_rel" == \#* ]] && continue
+  if [[ -z "${spec:-}" ]]; then
+    fail "manifest line for '$dest_rel' has no tab-separated source spec"
+    continue
+  fi
+  emit "$dest_rel" "$spec"
+  count=$((count + 1))
+done < "$MANIFEST"
+
+if (( failures )); then
+  printf 'sync-icons: %d problem(s) across %d manifest entries\n' "$failures" "$count" >&2
+  exit 1
+fi
+
+if (( CHECK_ONLY )); then
+  printf 'sync-icons: %d assets match the manifest\n' "$count"
+else
+  printf 'sync-icons: synced %d assets\n' "$count"
+fi