diff --git a/assets/winterm/icons/README.md b/assets/winterm/icons/README.md
index 35bc58507..205d2f121 100644
--- a/assets/winterm/icons/README.md
+++ b/assets/winterm/icons/README.md
@@ -2,7 +2,7 @@
 
 ## Source format
 
-`winterm.svg` is the canonical vector source. Its geometry and color values are mirrored by `generate_icons.py` for deterministic raster generation.
+`winterm.svg` is the canonical vector source. `generate_icons.py` parses its geometry and color values directly for deterministic raster generation; it does not keep a second hand-drawn copy of the normal icon.
 
 ## Generated sizes
 
@@ -11,7 +11,7 @@ The source asset set contains PNG files at 16, 20, 24, 32, 40, 44, 48, 64, 96, 1
 ## Regeneration
 
 1. Install Python 3 and Pillow in an isolated development environment.
-2. Update both `winterm.svg` and the matching geometry constants in `generate_icons.py`.
+2. Update `winterm.svg`. Keep its intentionally small supported shape vocabulary documented by generator validation.
 3. Run `python assets/winterm/icons/generate_icons.py` from any directory.
 4. Review every generated size, especially 16, 20, 24, 32, 44, 48, 150, and 310 pixels.
 5. Run `scripts/winterm/verify-branding.ps1` before committing the replacement.
diff --git a/assets/winterm/icons/generate_icons.py b/assets/winterm/icons/generate_icons.py
index 253633234..335f31814 100644
--- a/assets/winterm/icons/generate_icons.py
+++ b/assets/winterm/icons/generate_icons.py
@@ -2,6 +2,8 @@
 # Licensed under the MIT license.
 
 from pathlib import Path
+import re
+import xml.etree.ElementTree as ElementTree
 
 from PIL import Image, ImageDraw
 
@@ -9,74 +11,198 @@
 REPOSITORY_ROOT = Path(__file__).resolve().parents[3]
 SOURCE_DIRECTORY = REPOSITORY_ROOT / "assets" / "winterm" / "icons"
 PACKAGE_DIRECTORY = REPOSITORY_ROOT / "res" / "terminal" / "images-WinTerm"
+SOURCE_SVG = SOURCE_DIRECTORY / "winterm.svg"
 ICON_SIZES = (16, 20, 24, 32, 40, 44, 48, 64, 96, 128, 150, 256, 310)
 ICO_SIZES = (16, 20, 24, 32, 40, 48, 64, 96, 256)
+SVG_NAMESPACE = "{http://www.w3.org/2000/svg}"
 
 
-def _palette(variant: str) -> tuple[str, str, str, str, str]:
+def _contrast_palette(variant: str) -> tuple[str, str] | None:
     if variant == "contrast-black":
-        return ("#FFFFFF", "#000000", "#000000", "#000000", "#000000")
+        return ("#FFFFFF", "#000000")
     if variant == "contrast-white":
-        return ("#000000", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#FFFFFF")
-    return ("#0B1020", "#23314D", "#F59E0B", "#5EEAD4", "#F8FAFC")
-
-
-def _render_square(size: int, variant: str = "normal") -> Image.Image:
+        return ("#000000", "#FFFFFF")
+    return None
+
+
+def _number(element: ElementTree.Element, attribute: str, default: float | None = None) -> float:
+    raw_value = element.get(attribute)
+    if raw_value is None:
+        if default is None:
+            raise ValueError(f"{element.tag} must define {attribute}.")
+        return default
+    return float(raw_value)
+
+
+def _parse_path_points(path_data: str) -> list[tuple[float, float]]:
+    tokens = re.findall(r"[MLHV]|-?(?:\d+(?:\.\d*)?|\.\d+)", path_data)
+    points: list[tuple[float, float]] = []
+    current = (0.0, 0.0)
+    index = 0
+    while index < len(tokens):
+        command = tokens[index]
+        index += 1
+        if command in {"M", "L"}:
+            if index + 1 >= len(tokens):
+                raise ValueError(f"Incomplete {command} command in SVG path: {path_data}")
+            current = (float(tokens[index]), float(tokens[index + 1]))
+            index += 2
+        elif command == "H":
+            if index >= len(tokens):
+                raise ValueError(f"Incomplete H command in SVG path: {path_data}")
+            current = (float(tokens[index]), current[1])
+            index += 1
+        elif command == "V":
+            if index >= len(tokens):
+                raise ValueError(f"Incomplete V command in SVG path: {path_data}")
+            current = (current[0], float(tokens[index]))
+            index += 1
+        else:
+            raise ValueError(
+                f"Unsupported SVG path command {command!r}; use only M, L, H, and V."
+            )
+        points.append(current)
+    if len(points) < 2:
+        raise ValueError(f"SVG path must contain at least two points: {path_data}")
+    return points
+
+
+def _load_svg() -> tuple[float, list[ElementTree.Element]]:
+    document = ElementTree.parse(SOURCE_SVG)
+    root = document.getroot()
+    view_box = [float(value) for value in root.get("viewBox", "").split()]
+    if view_box != [0.0, 0.0, 512.0, 512.0]:
+        raise ValueError("winterm.svg must keep the canonical 0 0 512 512 viewBox.")
+    shapes = [
+        element
+        for element in root
+        if element.tag in {f"{SVG_NAMESPACE}rect", f"{SVG_NAMESPACE}path"}
+    ]
+    if not shapes or shapes[0].tag != f"{SVG_NAMESPACE}rect":
+        raise ValueError("winterm.svg must begin with its background rect.")
+    return view_box[2], shapes
+
+
+def _render_square(
+    size: int,
+    source: tuple[float, list[ElementTree.Element]],
+    variant: str = "normal",
+) -> Image.Image:
     scale = 4
     canvas_size = size * scale
     image = Image.new("RGBA", (canvas_size, canvas_size), (0, 0, 0, 0))
     draw = ImageDraw.Draw(image)
-    background, border, rail, prompt, underscore = _palette(variant)
-
-    def point(value: float) -> int:
-        return round(value * canvas_size / 512)
-
-    draw.rounded_rectangle(
-        (point(16), point(16), point(496), point(496)),
-        radius=point(104),
-        fill=background,
-        outline=border,
-        width=max(1, point(16)),
-    )
-    draw.rounded_rectangle(
-        (point(72), point(128), point(92), point(384)),
-        radius=max(1, point(10)),
-        fill=rail,
-    )
-    draw.line(
-        ((point(140), point(168)), (point(240), point(256)), (point(140), point(344))),
-        fill=prompt,
-        width=max(1, point(32)),
-        joint="curve",
-    )
-    draw.line(
-        ((point(278), point(344)), (point(398), point(344))),
-        fill=underscore,
-        width=max(1, point(32)),
-    )
+    view_box_size, shapes = source
+    contrast = _contrast_palette(variant)
+
+    def point(value: float) -> float:
+        return value * canvas_size / view_box_size
+
+    for shape_index, element in enumerate(shapes):
+        foreground = contrast[1] if contrast else None
+        if element.tag == f"{SVG_NAMESPACE}rect":
+            x = point(_number(element, "x"))
+            y = point(_number(element, "y"))
+            width = point(_number(element, "width"))
+            height = point(_number(element, "height"))
+            radius = point(_number(element, "rx", 0))
+            fill = contrast[0] if contrast and shape_index == 0 else foreground
+            fill = fill or element.get("fill")
+            stroke = foreground or element.get("stroke")
+            stroke_width = point(_number(element, "stroke-width", 0))
+
+            if stroke and stroke_width > 0:
+                half_stroke = stroke_width / 2
+                draw.rounded_rectangle(
+                    (
+                        x - half_stroke,
+                        y - half_stroke,
+                        x + width + half_stroke,
+                        y + height + half_stroke,
+                    ),
+                    radius=radius + half_stroke,
+                    fill=stroke,
+                )
+                draw.rounded_rectangle(
+                    (
+                        x + half_stroke,
+                        y + half_stroke,
+                        x + width - half_stroke,
+                        y + height - half_stroke,
+                    ),
+                    radius=max(0, radius - half_stroke),
+                    fill=fill,
+                )
+            else:
+                draw.rounded_rectangle(
+                    (x, y, x + width, y + height),
+                    radius=radius,
+                    fill=fill,
+                )
+        else:
+            points = [
+                (point(x), point(y))
+                for x, y in _parse_path_points(element.get("d", ""))
+            ]
+            stroke = foreground or element.get("stroke")
+            stroke_width = max(1, round(point(_number(element, "stroke-width"))))
+            draw.line(points, fill=stroke, width=stroke_width, joint="curve")
+            if element.get("stroke-linecap") == "round":
+                cap_radius = stroke_width / 2
+                for x, y in (points[0], points[-1]):
+                    draw.ellipse(
+                        (
+                            x - cap_radius,
+                            y - cap_radius,
+                            x + cap_radius,
+                            y + cap_radius,
+                        ),
+                        fill=stroke,
+                    )
+            if element.get("stroke-linejoin") == "round":
+                join_radius = stroke_width / 2
+                for x, y in points[1:-1]:
+                    draw.ellipse(
+                        (
+                            x - join_radius,
+                            y - join_radius,
+                            x + join_radius,
+                            y + join_radius,
+                        ),
+                        fill=stroke,
+                    )
     return image.resize((size, size), Image.Resampling.LANCZOS)
 
 
-def _render_tile(width: int, height: int) -> Image.Image:
+def _render_tile(
+    width: int,
+    height: int,
+    source: tuple[float, list[ElementTree.Element]],
+) -> Image.Image:
     image = Image.new("RGBA", (width, height), (0, 0, 0, 0))
     side = min(width, height)
-    icon = _render_square(side)
+    icon = _render_square(side, source)
     image.alpha_composite(icon, ((width - side) // 2, (height - side) // 2))
     return image
 
 
-def _write_ico(path: Path, variant: str = "normal") -> None:
-    image = _render_square(256, variant)
+def _write_ico(
+    path: Path,
+    source: tuple[float, list[ElementTree.Element]],
+    variant: str = "normal",
+) -> None:
+    image = _render_square(256, source, variant)
     image.save(path, format="ICO", sizes=[(size, size) for size in ICO_SIZES])
 
 
 def main() -> None:
     SOURCE_DIRECTORY.mkdir(parents=True, exist_ok=True)
     PACKAGE_DIRECTORY.mkdir(parents=True, exist_ok=True)
+    source = _load_svg()
 
     for size in ICON_SIZES:
-        _render_square(size).save(SOURCE_DIRECTORY / f"winterm-{size}.png")
-    _write_ico(SOURCE_DIRECTORY / "winterm.ico")
+        _render_square(size, source).save(SOURCE_DIRECTORY / f"winterm-{size}.png")
+    _write_ico(SOURCE_DIRECTORY / "winterm.ico", source)
 
     package_tiles = {
         "StoreLogo.png": (50, 50),
@@ -87,11 +213,11 @@ def main() -> None:
         "LargeTile.png": (310, 310),
     }
     for filename, dimensions in package_tiles.items():
-        _render_tile(*dimensions).save(PACKAGE_DIRECTORY / filename)
+        _render_tile(*dimensions, source).save(PACKAGE_DIRECTORY / filename)
 
-    _write_ico(PACKAGE_DIRECTORY / "terminal.ico")
-    _write_ico(PACKAGE_DIRECTORY / "terminal_contrast-black.ico", "contrast-black")
-    _write_ico(PACKAGE_DIRECTORY / "terminal_contrast-white.ico", "contrast-white")
+    _write_ico(PACKAGE_DIRECTORY / "terminal.ico", source)
+    _write_ico(PACKAGE_DIRECTORY / "terminal_contrast-black.ico", source, "contrast-black")
+    _write_ico(PACKAGE_DIRECTORY / "terminal_contrast-white.ico", source, "contrast-white")
 
 
 if __name__ == "__main__":
diff --git a/assets/winterm/icons/winterm-128.png b/assets/winterm/icons/winterm-128.png
index 86e97d2fc..602123c8b 100644
Binary files a/assets/winterm/icons/winterm-128.png and b/assets/winterm/icons/winterm-128.png differ
diff --git a/assets/winterm/icons/winterm-150.png b/assets/winterm/icons/winterm-150.png
index 61c62702a..3c535fdc6 100644
Binary files a/assets/winterm/icons/winterm-150.png and b/assets/winterm/icons/winterm-150.png differ
diff --git a/assets/winterm/icons/winterm-16.png b/assets/winterm/icons/winterm-16.png
index c2605e0c8..82b5604c1 100644
Binary files a/assets/winterm/icons/winterm-16.png and b/assets/winterm/icons/winterm-16.png differ
diff --git a/assets/winterm/icons/winterm-20.png b/assets/winterm/icons/winterm-20.png
index 2d46bc694..1bac74f3f 100644
Binary files a/assets/winterm/icons/winterm-20.png and b/assets/winterm/icons/winterm-20.png differ
diff --git a/assets/winterm/icons/winterm-24.png b/assets/winterm/icons/winterm-24.png
index 47fc2d606..ff8662a98 100644
Binary files a/assets/winterm/icons/winterm-24.png and b/assets/winterm/icons/winterm-24.png differ
diff --git a/assets/winterm/icons/winterm-256.png b/assets/winterm/icons/winterm-256.png
index e055f7f42..764e4275e 100644
Binary files a/assets/winterm/icons/winterm-256.png and b/assets/winterm/icons/winterm-256.png differ
diff --git a/assets/winterm/icons/winterm-310.png b/assets/winterm/icons/winterm-310.png
index 8a95843f8..c852ecdef 100644
Binary files a/assets/winterm/icons/winterm-310.png and b/assets/winterm/icons/winterm-310.png differ
diff --git a/assets/winterm/icons/winterm-32.png b/assets/winterm/icons/winterm-32.png
index 176082e78..05c7951f3 100644
Binary files a/assets/winterm/icons/winterm-32.png and b/assets/winterm/icons/winterm-32.png differ
diff --git a/assets/winterm/icons/winterm-40.png b/assets/winterm/icons/winterm-40.png
index 133f58f13..1aa6d1201 100644
Binary files a/assets/winterm/icons/winterm-40.png and b/assets/winterm/icons/winterm-40.png differ
diff --git a/assets/winterm/icons/winterm-44.png b/assets/winterm/icons/winterm-44.png
index ebc861470..f2ec33f57 100644
Binary files a/assets/winterm/icons/winterm-44.png and b/assets/winterm/icons/winterm-44.png differ
diff --git a/assets/winterm/icons/winterm-48.png b/assets/winterm/icons/winterm-48.png
index 2a14bf82a..af74e2988 100644
Binary files a/assets/winterm/icons/winterm-48.png and b/assets/winterm/icons/winterm-48.png differ
diff --git a/assets/winterm/icons/winterm-64.png b/assets/winterm/icons/winterm-64.png
index 3db8385b6..eaafddc81 100644
Binary files a/assets/winterm/icons/winterm-64.png and b/assets/winterm/icons/winterm-64.png differ
diff --git a/assets/winterm/icons/winterm-96.png b/assets/winterm/icons/winterm-96.png
index 4f6e6fd75..b2beb0f7a 100644
Binary files a/assets/winterm/icons/winterm-96.png and b/assets/winterm/icons/winterm-96.png differ
diff --git a/assets/winterm/icons/winterm.ico b/assets/winterm/icons/winterm.ico
index 4d487f5d5..5e5da4f39 100644
Binary files a/assets/winterm/icons/winterm.ico and b/assets/winterm/icons/winterm.ico differ
diff --git a/res/terminal/images-WinTerm/LargeTile.png b/res/terminal/images-WinTerm/LargeTile.png
index 8a95843f8..c852ecdef 100644
Binary files a/res/terminal/images-WinTerm/LargeTile.png and b/res/terminal/images-WinTerm/LargeTile.png differ
diff --git a/res/terminal/images-WinTerm/SmallTile.png b/res/terminal/images-WinTerm/SmallTile.png
index a2bd6498b..6a7a2d3d5 100644
Binary files a/res/terminal/images-WinTerm/SmallTile.png and b/res/terminal/images-WinTerm/SmallTile.png differ
diff --git a/res/terminal/images-WinTerm/Square150x150Logo.png b/res/terminal/images-WinTerm/Square150x150Logo.png
index 61c62702a..3c535fdc6 100644
Binary files a/res/terminal/images-WinTerm/Square150x150Logo.png and b/res/terminal/images-WinTerm/Square150x150Logo.png differ
diff --git a/res/terminal/images-WinTerm/Square44x44Logo.png b/res/terminal/images-WinTerm/Square44x44Logo.png
index ebc861470..f2ec33f57 100644
Binary files a/res/terminal/images-WinTerm/Square44x44Logo.png and b/res/terminal/images-WinTerm/Square44x44Logo.png differ
diff --git a/res/terminal/images-WinTerm/StoreLogo.png b/res/terminal/images-WinTerm/StoreLogo.png
index b08ea3dd1..829b4e4fe 100644
Binary files a/res/terminal/images-WinTerm/StoreLogo.png and b/res/terminal/images-WinTerm/StoreLogo.png differ
diff --git a/res/terminal/images-WinTerm/Wide310x150Logo.png b/res/terminal/images-WinTerm/Wide310x150Logo.png
index 96012918a..95994e6c2 100644
Binary files a/res/terminal/images-WinTerm/Wide310x150Logo.png and b/res/terminal/images-WinTerm/Wide310x150Logo.png differ
diff --git a/res/terminal/images-WinTerm/terminal.ico b/res/terminal/images-WinTerm/terminal.ico
index 4d487f5d5..5e5da4f39 100644
Binary files a/res/terminal/images-WinTerm/terminal.ico and b/res/terminal/images-WinTerm/terminal.ico differ
diff --git a/res/terminal/images-WinTerm/terminal_contrast-black.ico b/res/terminal/images-WinTerm/terminal_contrast-black.ico
index c6a6e2955..dddea326f 100644
Binary files a/res/terminal/images-WinTerm/terminal_contrast-black.ico and b/res/terminal/images-WinTerm/terminal_contrast-black.ico differ
diff --git a/res/terminal/images-WinTerm/terminal_contrast-white.ico b/res/terminal/images-WinTerm/terminal_contrast-white.ico
index 515abcf73..8a397f3ac 100644
Binary files a/res/terminal/images-WinTerm/terminal_contrast-white.ico and b/res/terminal/images-WinTerm/terminal_contrast-white.ico differ
diff --git a/scripts/winterm/verify-branding.ps1 b/scripts/winterm/verify-branding.ps1
index 74e0407a9..464bc74f2 100644
--- a/scripts/winterm/verify-branding.ps1
+++ b/scripts/winterm/verify-branding.ps1
@@ -204,6 +204,7 @@ try
         'THIRD_PARTY_NOTICES.md',
         'src\cascadia\CascadiaPackage\NOTICE.html',
         'assets\winterm\licenses\open-source-licenses.html',
+        'assets\winterm\icons\generate_icons.py',
         'assets\winterm\icons\winterm.svg',
         'assets\winterm\icons\winterm.ico',
         'res\terminal\images-WinTerm\StoreLogo.png',
@@ -212,7 +213,9 @@ try
         'res\terminal\images-WinTerm\SmallTile.png',
         'res\terminal\images-WinTerm\Wide310x150Logo.png',
         'res\terminal\images-WinTerm\LargeTile.png',
-        'res\terminal\images-WinTerm\terminal.ico'
+        'res\terminal\images-WinTerm\terminal.ico',
+        'res\terminal\images-WinTerm\terminal_contrast-black.ico',
+        'res\terminal\images-WinTerm\terminal_contrast-white.ico'
     )
     foreach ($relativePath in $requiredFiles)
     {
@@ -232,6 +235,11 @@ try
     $wingetGenerator = Get-Content -LiteralPath (Join-Path $repositoryRoot 'scripts\winterm\generate-winget-manifests.ps1') -Raw
     $releaseGenerator = Get-Content -LiteralPath (Join-Path $repositoryRoot 'scripts\winterm\generate-release-artifacts.ps1') -Raw
     $updateGenerator = Get-Content -LiteralPath (Join-Path $repositoryRoot 'scripts\winterm\generate-stable-update-manifest.ps1') -Raw
+    $iconGenerator = Get-Content -LiteralPath (Join-Path $repositoryRoot 'assets\winterm\icons\generate_icons.py') -Raw
+    $terminalResources = Get-Content -LiteralPath (Join-Path $repositoryRoot 'src\cascadia\WindowsTerminal\WindowsTerminal.rc') -Raw
+    $windowIconRuntime = Get-Content -LiteralPath (Join-Path $repositoryRoot 'src\cascadia\WindowsTerminal\icon.cpp') -Raw
+    $islandWindow = Get-Content -LiteralPath (Join-Path $repositoryRoot 'src\cascadia\WindowsTerminal\IslandWindow.cpp') -Raw
+    $titlebarControl = Get-Content -LiteralPath (Join-Path $repositoryRoot 'src\cascadia\TerminalApp\TitlebarControl.cpp') -Raw
 
     Test-Requirement -Condition ($packageProject.Contains('Package-winTerm.appxmanifest') -and $packageProject.Contains('<OCExecutionAliasName Condition="''$(WindowsTerminalBranding)''==''WinTerm''">winterm</OCExecutionAliasName>')) -Message 'Package project selects the winTerm manifest and launcher alias'
     Test-Requirement -Condition ($brandingTargets.Contains('WT_BRANDING_WINTERM')) -Message 'Dedicated winTerm compile-time branding token exists'
@@ -248,6 +256,11 @@ try
     Test-Requirement -Condition ($wingetGenerator.Contains('Publisher: helloThisWorld') -and $wingetGenerator.Contains('PackageIdentifier: HelloThisWorld.winTerm') -and $wingetGenerator.Contains('InstallerType: inno')) -Message 'WinGet generation uses protected publisher, product ID, and Inno type'
     Test-Requirement -Condition ($releaseGenerator.Contains("publisher = 'helloThisWorld'") -and $releaseGenerator.Contains("productId = 'HelloThisWorld.winTerm'")) -Message 'Release SBOM and metadata generation use protected winTerm identity'
     Test-Requirement -Condition ($updateGenerator.Contains("publisher = 'helloThisWorld'") -and $updateGenerator.Contains("productId = 'HelloThisWorld.winTerm'")) -Message 'Update metadata generation uses protected winTerm identity'
+    Test-Requirement -Condition ($iconGenerator.Contains('SOURCE_SVG = SOURCE_DIRECTORY / "winterm.svg"') -and $iconGenerator.Contains('ElementTree.parse(SOURCE_SVG)')) -Message 'Generated application artwork is parsed from the canonical winterm.svg source'
+    Test-Requirement -Condition ($terminalResources -match '(?s)#if defined\(WT_BRANDING_WINTERM\).*images-WinTerm\\\\terminal\.ico.*images-WinTerm\\\\terminal_contrast-black\.ico.*images-WinTerm\\\\terminal_contrast-white\.ico.*#elif defined\(WT_BRANDING_RELEASE\)') -Message 'WinTerm executable resources select normal and High Contrast canonical icons only in the WinTerm branding branch'
+    Test-Requirement -Condition ($windowIconRuntime.Contains('WM_SETICON') -and $islandWindow.Contains('UpdateWindowIconForActiveMetrics(_window.get())')) -Message 'Runtime applies WinTerm small and large window icons after HWND creation'
+    Test-Requirement -Condition ($titlebarControl.Contains('ms-appx:///Images/Square44x44Logo.png') -and $titlebarControl.Contains('#if defined(WT_BRANDING_WINTERM)')) -Message 'Custom titlebar displays the packaged WinTerm icon only for WinTerm branding'
+    Test-Requirement -Condition ($installerDefinition.Contains('SetupIconFile=..\..\assets\winterm\icons\winterm.ico') -and $installerDefinition.Contains('Filename: "{app}\winTerm.exe"')) -Message 'Installer and installed shortcuts use canonical WinTerm icon sources'
 
     if (-not [string]::IsNullOrWhiteSpace($PackageOutput))
     {
diff --git a/src/cascadia/TerminalApp/App.xaml b/src/cascadia/TerminalApp/App.xaml
index 17e5d54ac..182ee0342 100644
--- a/src/cascadia/TerminalApp/App.xaml
+++ b/src/cascadia/TerminalApp/App.xaml
@@ -49,11 +49,15 @@
 
                     <Thickness x:Key="TabViewItemBorderThickness">1,1,1,0</Thickness>
                     <x:Double x:Key="WinTermTitlebarHeight">35</x:Double>
-                    <x:Double x:Key="WinTermTabHeight">32</x:Double>
+                    <x:Double x:Key="WinTermTitlebarIconSize">22</x:Double>
+                    <x:Double x:Key="WinTermCaptionButtonWidth">42</x:Double>
+                    <x:Double x:Key="WinTermTabRowHeight">32</x:Double>
+                    <x:Double x:Key="WinTermTabHeight">27</x:Double>
+                    <x:Double x:Key="WinTermChromeButtonSize">27</x:Double>
                     <x:Double x:Key="WinTermPaneHeaderHeight">27</x:Double>
                     <CornerRadius x:Key="WinTermCompactControlRadius">5</CornerRadius>
-
-                    <!--
+
+                    <!--
                         Disable the EntranceThemeTransition for our muxc:TabView, which would slowly slide in the tabs
                         while the window opens. The difference is especially noticeable if window fade-in transitions are
                         disabled system-wide. On my system this shaves off about 10% of the startup cost and looks better.
@@ -193,7 +197,7 @@
                                              Color="#111820" />
 
                             <SolidColorBrush x:Key="UnfocusedBorderBrush"
-                                             Color="#22303D" />
+                                             Color="#2A3945" />
 
                             <SolidColorBrush x:Key="SettingsUiTabBrush"
                                              Color="#090E14" />
@@ -202,14 +206,34 @@
                                              Color="#090E14" />
                             <SolidColorBrush x:Key="WinTermTitlebarBrush"
                                              Color="#131C25" />
+                            <LinearGradientBrush x:Key="WinTermTitlebarGradientBrush"
+                                                 StartPoint="0,0"
+                                                 EndPoint="0,1">
+                                <GradientStop Offset="0"
+                                              Color="#17212B" />
+                                <GradientStop Offset="1"
+                                              Color="#131C25" />
+                            </LinearGradientBrush>
                             <SolidColorBrush x:Key="WinTermTitlebarBorderBrush"
                                              Color="#24313C" />
                             <SolidColorBrush x:Key="WinTermActiveTabBrush"
                                              Color="#1A2530" />
                             <SolidColorBrush x:Key="WinTermTabHoverBrush"
                                              Color="#172230" />
+                            <SolidColorBrush x:Key="WinTermTabRowBorderBrush"
+                                             Color="#1D2A35" />
+                            <SolidColorBrush x:Key="WinTermPaneHeaderBrush"
+                                             Color="#101821" />
+                            <SolidColorBrush x:Key="WinTermPaneHeaderBorderBrush"
+                                             Color="#1F2D38" />
+                            <SolidColorBrush x:Key="WinTermDividerBrush"
+                                             Color="#2A3945" />
+                            <SolidColorBrush x:Key="WinTermDividerHoverBrush"
+                                             Color="#34485A" />
                             <SolidColorBrush x:Key="WinTermTextBrush"
                                              Color="#F2F7FB" />
+                            <SolidColorBrush x:Key="WinTermSecondaryTextBrush"
+                                             Color="#C5D0DA" />
                             <SolidColorBrush x:Key="WinTermMutedTextBrush"
                                              Color="#8E9EAD" />
                             <SolidColorBrush x:Key="WinTermAccentBrush"
@@ -238,14 +262,28 @@
                                              Color="#F5F8FA" />
                             <SolidColorBrush x:Key="WinTermTitlebarBrush"
                                              Color="#EDF2F5" />
+                            <SolidColorBrush x:Key="WinTermTitlebarGradientBrush"
+                                             Color="#EDF2F5" />
                             <SolidColorBrush x:Key="WinTermTitlebarBorderBrush"
                                              Color="#CBD6DE" />
                             <SolidColorBrush x:Key="WinTermActiveTabBrush"
                                              Color="#FFFFFF" />
                             <SolidColorBrush x:Key="WinTermTabHoverBrush"
                                              Color="#E2EBF0" />
+                            <SolidColorBrush x:Key="WinTermTabRowBorderBrush"
+                                             Color="#CBD6DE" />
+                            <SolidColorBrush x:Key="WinTermPaneHeaderBrush"
+                                             Color="#EDF2F5" />
+                            <SolidColorBrush x:Key="WinTermPaneHeaderBorderBrush"
+                                             Color="#CBD6DE" />
+                            <SolidColorBrush x:Key="WinTermDividerBrush"
+                                             Color="#B7C5CF" />
+                            <SolidColorBrush x:Key="WinTermDividerHoverBrush"
+                                             Color="#8FA4B3" />
                             <SolidColorBrush x:Key="WinTermTextBrush"
                                              Color="#17212A" />
+                            <SolidColorBrush x:Key="WinTermSecondaryTextBrush"
+                                             Color="#334652" />
                             <SolidColorBrush x:Key="WinTermMutedTextBrush"
                                              Color="#5F6F7C" />
                             <SolidColorBrush x:Key="WinTermAccentBrush"
@@ -275,14 +313,28 @@
                                             ResourceKey="SystemColorWindowColorBrush" />
                             <StaticResource x:Key="WinTermTitlebarBrush"
                                             ResourceKey="SystemColorButtonFaceColorBrush" />
+                            <StaticResource x:Key="WinTermTitlebarGradientBrush"
+                                            ResourceKey="SystemColorButtonFaceColorBrush" />
                             <StaticResource x:Key="WinTermTitlebarBorderBrush"
                                             ResourceKey="SystemColorWindowTextColorBrush" />
                             <StaticResource x:Key="WinTermActiveTabBrush"
                                             ResourceKey="SystemColorHighlightColorBrush" />
                             <StaticResource x:Key="WinTermTabHoverBrush"
                                             ResourceKey="SystemColorHighlightColorBrush" />
+                            <StaticResource x:Key="WinTermTabRowBorderBrush"
+                                            ResourceKey="SystemColorWindowTextColorBrush" />
+                            <StaticResource x:Key="WinTermPaneHeaderBrush"
+                                            ResourceKey="SystemColorButtonFaceColorBrush" />
+                            <StaticResource x:Key="WinTermPaneHeaderBorderBrush"
+                                            ResourceKey="SystemColorWindowTextColorBrush" />
+                            <StaticResource x:Key="WinTermDividerBrush"
+                                            ResourceKey="SystemColorWindowTextColorBrush" />
+                            <StaticResource x:Key="WinTermDividerHoverBrush"
+                                            ResourceKey="SystemColorHighlightColorBrush" />
                             <StaticResource x:Key="WinTermTextBrush"
                                             ResourceKey="SystemColorWindowTextColorBrush" />
+                            <StaticResource x:Key="WinTermSecondaryTextBrush"
+                                            ResourceKey="SystemColorWindowTextColorBrush" />
                             <StaticResource x:Key="WinTermMutedTextBrush"
                                             ResourceKey="SystemColorGrayTextColorBrush" />
                             <StaticResource x:Key="WinTermAccentBrush"
diff --git a/src/cascadia/TerminalApp/MinMaxCloseControl.xaml b/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
index d5cee6b93..bd22eb5d0 100644
--- a/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
@@ -156,7 +156,8 @@
                 tabs will be flush with the top of the window. See GH#2541 for
                 details.
             -->
-            <x:Double x:Key="CaptionButtonHeightWindowed">40.0</x:Double>
+            <StaticResource x:Key="CaptionButtonHeightWindowed"
+                            ResourceKey="WinTermTitlebarHeight" />
             <!--  32 + (1 to compensate for GH#10746) + (-1 for GH#15164)  -->
             <x:Double x:Key="CaptionButtonHeightMaximized">32.0</x:Double>
 
@@ -271,9 +272,9 @@
 
     <Button x:Name="MinimizeButton"
             x:Uid="MinimizeButton"
-            Width="46.0"
+            Width="{ThemeResource WinTermCaptionButtonWidth}"
             Height="{StaticResource CaptionButtonHeightWindowed}"
-            MinWidth="46.0"
+            MinWidth="{ThemeResource WinTermCaptionButtonWidth}"
             AutomationProperties.AccessibilityView="Raw"
             Click="_MinimizeClick"
             Style="{StaticResource CaptionButton}">
@@ -303,9 +304,9 @@
     </Button>
     <Button x:Name="MaximizeButton"
             x:Uid="MaximizeButton"
-            Width="46.0"
+            Width="{ThemeResource WinTermCaptionButtonWidth}"
             Height="{StaticResource CaptionButtonHeightWindowed}"
-            MinWidth="46.0"
+            MinWidth="{ThemeResource WinTermCaptionButtonWidth}"
             AutomationProperties.AccessibilityView="Raw"
             Click="_MaximizeClick"
             Style="{StaticResource CaptionButton}">
@@ -337,9 +338,9 @@
     </Button>
     <Button x:Name="CloseButton"
             x:Uid="CloseButton"
-            Width="46.0"
+            Width="{ThemeResource WinTermCaptionButtonWidth}"
             Height="{StaticResource CaptionButtonHeightWindowed}"
-            MinWidth="46.0"
+            MinWidth="{ThemeResource WinTermCaptionButtonWidth}"
             AutomationProperties.AccessibilityView="Raw"
             Click="_CloseClick"
             Style="{StaticResource CaptionButton}">
diff --git a/src/cascadia/TerminalApp/Pane.cpp b/src/cascadia/TerminalApp/Pane.cpp
index 617c2dc9b..de7e663d4 100644
--- a/src/cascadia/TerminalApp/Pane.cpp
+++ b/src/cascadia/TerminalApp/Pane.cpp
@@ -1427,20 +1427,54 @@ void Pane::UpdateVisuals()
     _borderSecond.BorderBrush(brush);
     if (_paneHeader)
     {
-        _paneHeader.Background(TokenBrush(winTerm::Design::ColorTokens::PaneHeaderSurface));
+        _paneHeader.Background(
+            _themeResources.paneHeaderBackgroundBrush ?
+                _themeResources.paneHeaderBackgroundBrush :
+                TokenBrush(winTerm::Design::ColorTokens::PaneHeaderSurface));
+        if (_paneHeaderBorder)
+        {
+            _paneHeaderBorder.Background(
+                _themeResources.paneHeaderBorderBrush ?
+                    _themeResources.paneHeaderBorderBrush :
+                    TokenBrush(winTerm::Design::ColorTokens::PaneHeaderBorder));
+        }
         if (_paneIcon)
         {
-            _paneIcon.Foreground(TokenBrush(
-                _lastActive ?
-                    winTerm::Design::ColorTokens::AccentMint :
-                    winTerm::Design::ColorTokens::TextMuted));
+            _paneIcon.Foreground(
+                _lastActive && _themeResources.accentBrush ?
+                    _themeResources.accentBrush :
+                    !_lastActive && _themeResources.mutedTextBrush ?
+                        _themeResources.mutedTextBrush :
+                        TokenBrush(
+                            _lastActive ?
+                                winTerm::Design::ColorTokens::AccentMint :
+                                winTerm::Design::ColorTokens::TextMuted));
         }
         if (_paneTitle)
         {
-            _paneTitle.Foreground(TokenBrush(
-                _lastActive ?
-                    winTerm::Design::ColorTokens::TextPrimary :
-                    winTerm::Design::ColorTokens::TextSecondary));
+            _paneTitle.Foreground(
+                _lastActive && _themeResources.primaryTextBrush ?
+                    _themeResources.primaryTextBrush :
+                    !_lastActive && _themeResources.secondaryTextBrush ?
+                        _themeResources.secondaryTextBrush :
+                        TokenBrush(
+                            _lastActive ?
+                                winTerm::Design::ColorTokens::TextPrimary :
+                                winTerm::Design::ColorTokens::TextSecondary));
+        }
+        if (_paneStatus)
+        {
+            _paneStatus.Foreground(
+                _themeResources.accentBrush ?
+                    _themeResources.accentBrush :
+                    TokenBrush(winTerm::Design::ColorTokens::AccentMint));
+        }
+        if (_paneOverflow)
+        {
+            _paneOverflow.Foreground(
+                _themeResources.mutedTextBrush ?
+                    _themeResources.mutedTextBrush :
+                    TokenBrush(winTerm::Design::ColorTokens::TextMuted));
         }
         _UpdatePaneHeader();
     }
@@ -2041,6 +2075,7 @@ void Pane::_AttachLeafVisual()
 
     _leafLayout = Controls::Grid{};
     _paneHeader = Controls::Grid{};
+    _paneHeaderBorder = Controls::Border{};
     _contentHost = Controls::Border{};
     _paneIcon = Controls::Button{};
     _paneOverflow = Controls::Button{};
@@ -2080,6 +2115,9 @@ void Pane::_AttachLeafVisual()
     _paneIcon.Height(_paneHeaderHeight);
     _paneIcon.Visibility(_showPaneProfileIcon ? Visibility::Visible : Visibility::Collapsed);
     _paneIcon.Padding(ThicknessHelper::FromLengths(0, 0, 0, 0));
+    _paneIcon.BorderThickness(ThicknessHelper::FromUniformLength(0));
+    _paneIcon.CornerRadius(CornerRadiusHelper::FromUniformRadius(
+        winTerm::Design::RadiusTokens::CompactControl));
     Automation::AutomationProperties::SetHelpText(
         _paneIcon,
         L"Focus this pane. Right-click for pane commands.");
@@ -2101,8 +2139,19 @@ void Pane::_AttachLeafVisual()
     _paneOverflow.Width(PaneHeaderButtonWidth);
     _paneOverflow.Height(_paneHeaderHeight);
     _paneOverflow.Padding(ThicknessHelper::FromLengths(0, 0, 0, 0));
+    _paneOverflow.BorderThickness(ThicknessHelper::FromUniformLength(0));
+    _paneOverflow.CornerRadius(CornerRadiusHelper::FromUniformRadius(
+        winTerm::Design::RadiusTokens::CompactControl));
     Automation::AutomationProperties::SetName(_paneOverflow, L"Open pane menu");
 
+    _paneHeaderBorder.Height(1);
+    _paneHeaderBorder.VerticalAlignment(VerticalAlignment::Bottom);
+    _paneHeaderBorder.IsHitTestVisible(false);
+    Controls::Grid::SetColumnSpan(_paneHeaderBorder, 4);
+    Automation::AutomationProperties::SetAccessibilityView(
+        _paneHeaderBorder,
+        Automation::Peers::AccessibilityView::Raw);
+
     Controls::Grid::SetColumn(_paneIcon, 0);
     Controls::Grid::SetColumn(_paneTitle, 1);
     Controls::Grid::SetColumn(_paneStatus, 2);
@@ -2111,6 +2160,7 @@ void Pane::_AttachLeafVisual()
     _paneHeader.Children().Append(_paneTitle);
     _paneHeader.Children().Append(_paneStatus);
     _paneHeader.Children().Append(_paneOverflow);
+    _paneHeader.Children().Append(_paneHeaderBorder);
     _paneHeader.Visibility(_paneHeadersVisible ? Visibility::Visible : Visibility::Collapsed);
 
     Controls::Grid::SetRow(_paneHeader, 0);
@@ -2281,7 +2331,10 @@ void Pane::_CreateDividerVisual()
         _dividerPointerTarget,
         Automation::Peers::AccessibilityView::Raw);
     _dividerVisual.IsHitTestVisible(false);
-    _dividerVisual.Background(TokenBrush(winTerm::Design::ColorTokens::BorderIdle));
+    _dividerVisual.Background(
+        _themeResources.dividerBrush ?
+            _themeResources.dividerBrush :
+            TokenBrush(winTerm::Design::ColorTokens::BorderIdle));
 
     _snapIndicatorText.FontSize(winTerm::Design::TypographyTokens::SnapIndicatorSize);
     _snapIndicatorText.Foreground(TokenBrush(winTerm::Design::ColorTokens::TextPrimary));
@@ -2534,23 +2587,27 @@ void Pane::_UpdateDividerState(const bool active, const bool snapped)
         return;
     }
 
-    const auto highContrast =
-        winrt::Windows::UI::ViewManagement::AccessibilitySettings{}.HighContrast();
-    if (highContrast)
+    if (active || snapped)
     {
         _dividerVisual.Background(
-            active && _themeResources.focusedBorderBrush ?
-                _themeResources.focusedBorderBrush :
-                _themeResources.unfocusedBorderBrush);
-        return;
+            _themeResources.accentBrush ?
+                _themeResources.accentBrush :
+                TokenBrush(winTerm::Design::ColorTokens::AccentMint));
+    }
+    else if (_dividerPointerOver)
+    {
+        _dividerVisual.Background(
+            _themeResources.dividerHoverBrush ?
+                _themeResources.dividerHoverBrush :
+                TokenBrush(winTerm::Design::ColorTokens::BorderHover));
+    }
+    else
+    {
+        _dividerVisual.Background(
+            _themeResources.dividerBrush ?
+                _themeResources.dividerBrush :
+                TokenBrush(winTerm::Design::ColorTokens::BorderIdle));
     }
-
-    const auto color = active || snapped ?
-                           winTerm::Design::ColorTokens::AccentMint :
-                           _dividerPointerOver ?
-                               winTerm::Design::ColorTokens::BorderHover :
-                               winTerm::Design::ColorTokens::BorderIdle;
-    _dividerVisual.Background(TokenBrush(color));
 }
 
 void Pane::_DividerPointerPressed(const XamlInput::PointerRoutedEventArgs& e)
diff --git a/src/cascadia/TerminalApp/Pane.h b/src/cascadia/TerminalApp/Pane.h
index fdf2e69a1..007267b35 100644
--- a/src/cascadia/TerminalApp/Pane.h
+++ b/src/cascadia/TerminalApp/Pane.h
@@ -53,12 +53,20 @@ enum class SplitState : int
     Vertical = 2
 };
 
-struct PaneResources
-{
-    winrt::Windows::UI::Xaml::Media::SolidColorBrush focusedBorderBrush{ nullptr };
-    winrt::Windows::UI::Xaml::Media::SolidColorBrush unfocusedBorderBrush{ nullptr };
-    winrt::Windows::UI::Xaml::Media::SolidColorBrush broadcastBorderBrush{ nullptr };
-};
+struct PaneResources
+{
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush focusedBorderBrush{ nullptr };
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush unfocusedBorderBrush{ nullptr };
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush broadcastBorderBrush{ nullptr };
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush paneHeaderBackgroundBrush{ nullptr };
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush paneHeaderBorderBrush{ nullptr };
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush primaryTextBrush{ nullptr };
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush secondaryTextBrush{ nullptr };
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush mutedTextBrush{ nullptr };
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush accentBrush{ nullptr };
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush dividerBrush{ nullptr };
+    winrt::Windows::UI::Xaml::Media::SolidColorBrush dividerHoverBrush{ nullptr };
+};
 
 class Pane : public std::enable_shared_from_this<Pane>
 {
@@ -247,6 +255,7 @@ class Pane : public std::enable_shared_from_this<Pane>
     winrt::Windows::UI::Xaml::Controls::Border _borderSecond{};
     winrt::Windows::UI::Xaml::Controls::Grid _leafLayout{ nullptr };
     winrt::Windows::UI::Xaml::Controls::Grid _paneHeader{ nullptr };
+    winrt::Windows::UI::Xaml::Controls::Border _paneHeaderBorder{ nullptr };
     winrt::Windows::UI::Xaml::Controls::Border _contentHost{ nullptr };
     winrt::Windows::UI::Xaml::Controls::Button _paneIcon{ nullptr };
     winrt::Windows::UI::Xaml::Controls::Button _paneOverflow{ nullptr };
diff --git a/src/cascadia/TerminalApp/Tab.cpp b/src/cascadia/TerminalApp/Tab.cpp
index f1486581c..994a2c9bd 100644
--- a/src/cascadia/TerminalApp/Tab.cpp
+++ b/src/cascadia/TerminalApp/Tab.cpp
@@ -6,9 +6,10 @@
 #include "Tab.h"
 #include "SettingsPaneContent.h"
 #include "Tab.g.cpp"
-#include "Utils.h"
-#include "AppLogic.h"
-#include "../../types/inc/ColorFix.hpp"
+#include "Utils.h"
+#include "AppLogic.h"
+#include "../../winterm/Design/DesignTokens.h"
+#include "../../types/inc/ColorFix.hpp"
 
 using namespace winrt;
 using namespace winrt::Windows::UI::Xaml;
@@ -130,11 +131,17 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     // Return Value:
     // - <none>
-    void Tab::_MakeTabViewItem()
-    {
-        TabViewItem(::winrt::MUX::Controls::TabViewItem{});
-
-        // GH#3609 If the tab was tapped, and no one else was around to handle
+    void Tab::_MakeTabViewItem()
+    {
+        TabViewItem(::winrt::MUX::Controls::TabViewItem{});
+        TabViewItem().Height(winTerm::Design::DensityTokens::CompactTabHeight);
+        TabViewItem().MinHeight(winTerm::Design::DensityTokens::CompactTabHeight);
+        TabViewItem().Resources().Insert(
+            winrt::box_value(L"OverlayCornerRadius"),
+            winrt::box_value(CornerRadiusHelper::FromUniformRadius(
+                winTerm::Design::RadiusTokens::ActiveTabTop)));
+
+        // GH#3609 If the tab was tapped, and no one else was around to handle
         // it, then ask our parent to toss focus into the active control.
         TabViewItem().Tapped([weakThis{ get_weak() }](auto&&, auto&&) {
             if (auto tab{ weakThis.get() })
diff --git a/src/cascadia/TerminalApp/TabHeaderControl.xaml b/src/cascadia/TerminalApp/TabHeaderControl.xaml
index 43951f0bc..62651de3a 100644
--- a/src/cascadia/TerminalApp/TabHeaderControl.xaml
+++ b/src/cascadia/TerminalApp/TabHeaderControl.xaml
@@ -58,7 +58,6 @@
                   Visibility="{x:Bind TabStatus.IsInputBroadcastActive, Mode=OneWay}" />
         <TextBlock x:Name="HeaderTextBlock"
                    MaxWidth="180"
-                   Foreground="{ThemeResource WinTermTextBrush}"
                    TextTrimming="CharacterEllipsis"
                    Text="{x:Bind Title, Mode=OneWay}"
                    Visibility="Visible" />
diff --git a/src/cascadia/TerminalApp/TabRowControl.xaml b/src/cascadia/TerminalApp/TabRowControl.xaml
index 566c03ba2..708d9f7bd 100644
--- a/src/cascadia/TerminalApp/TabRowControl.xaml
+++ b/src/cascadia/TerminalApp/TabRowControl.xaml
@@ -7,8 +7,9 @@
                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                   xmlns:local="using:TerminalApp"
-                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                   xmlns:mux="using:Microsoft.UI.Xaml.Controls"
+                  MinHeight="{ThemeResource WinTermTabRowHeight}"
                   Background="{ThemeResource TabViewBackground}"
                   mc:Ignorable="d">
 
@@ -21,6 +22,14 @@
                         ResourceKey="WinTermTextBrush" />
         <StaticResource x:Key="TabViewItemHeaderForeground"
                         ResourceKey="WinTermMutedTextBrush" />
+        <StaticResource x:Key="TabViewItemIconForegroundSelected"
+                        ResourceKey="WinTermAccentBrush" />
+        <StaticResource x:Key="TabViewItemIconForegroundPointerOver"
+                        ResourceKey="WinTermAccentBrush" />
+        <StaticResource x:Key="TabViewItemIconForegroundPressed"
+                        ResourceKey="WinTermAccentBrush" />
+        <StaticResource x:Key="TabViewItemIconForeground"
+                        ResourceKey="WinTermMutedTextBrush" />
     </ContentPresenter.Resources>
 
     <!--
@@ -35,9 +44,11 @@
         tab row.
     -->
 
-    <mux:TabView x:Name="TabView"
-                 VerticalAlignment="Bottom"
-                 HorizontalContentAlignment="Stretch"
+    <Grid>
+    <mux:TabView x:Name="TabView"
+                 Height="{ThemeResource WinTermTabRowHeight}"
+                 VerticalAlignment="Bottom"
+                 HorizontalContentAlignment="Stretch"
                  AllowDropTabs="True"
                  Background="Transparent"
                  CanDragTabs="True"
@@ -56,23 +67,24 @@
                       Visibility="{x:Bind ShowElevationShield, Mode=OneWay}" />
         </mux:TabView.TabStripHeader>
 
-        <mux:TabView.TabStripFooter>
-            <Grid>
-                <!--  Remove this border after WinUI 2.8  -->
-                <Border Height="1"
-                        VerticalAlignment="Bottom"
-                        Background="{ThemeResource CardStrokeColorDefaultBrush}" />
-
+        <mux:TabView.TabStripFooter>
+            <Grid Height="{ThemeResource WinTermTabRowHeight}">
+                <!--  Remove this border after WinUI 2.8  -->
+                <Border Height="1"
+                        VerticalAlignment="Bottom"
+                        Background="{ThemeResource WinTermTabRowBorderBrush}" />
+
                 <mux:SplitButton x:Name="NewTabButton"
-                                 x:Uid="NewTabSplitButton"
-                                 Height="27"
-                                 Margin="0,2"
-                                 Padding="0"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Stretch"
-                                 AllowDrop="True"
-                                 AutomationProperties.AccessibilityView="Control"
-                                 BorderThickness="0"
+                                 x:Uid="NewTabSplitButton"
+                                 Height="{ThemeResource WinTermChromeButtonSize}"
+                                 Margin="3,4,0,1"
+                                 Padding="0"
+                                 HorizontalAlignment="Left"
+                                 VerticalAlignment="Top"
+                                 AllowDrop="True"
+                                 AutomationProperties.AccessibilityView="Control"
+                                 BorderThickness="0"
+                                 CornerRadius="{ThemeResource WinTermCompactControlRadius}"
                                  Click="OnNewTabButtonClick"
                                  Content="&#xE710;"
                                  DragOver="OnNewTabButtonDragOver"
@@ -138,14 +150,21 @@
                                                     ResourceKey="TabViewButtonForegroundPointerOver" />
                                 </ResourceDictionary>
                             </ResourceDictionary.ThemeDictionaries>
-                            <x:Double x:Key="SplitButtonPrimaryButtonSize">31</x:Double>
-                            <x:Double x:Key="SplitButtonSecondaryButtonSize">31</x:Double>
-                        </ResourceDictionary>
-                    </mux:SplitButton.Resources>
-                </mux:SplitButton>
-            </Grid>
-        </mux:TabView.TabStripFooter>
-
-    </mux:TabView>
-
-</ContentPresenter>
+                            <StaticResource x:Key="SplitButtonPrimaryButtonSize"
+                                            ResourceKey="WinTermChromeButtonSize" />
+                            <x:Double x:Key="SplitButtonSecondaryButtonSize">22</x:Double>
+                        </ResourceDictionary>
+                    </mux:SplitButton.Resources>
+                </mux:SplitButton>
+            </Grid>
+        </mux:TabView.TabStripFooter>
+
+    </mux:TabView>
+
+    <Border Height="1"
+            VerticalAlignment="Bottom"
+            Background="{ThemeResource WinTermTabRowBorderBrush}"
+            IsHitTestVisible="False" />
+    </Grid>
+
+</ContentPresenter>
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index 4fa464166..9f29d54bd 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -25,6 +25,7 @@
 #include "SnippetsPaneContent.h"
 #include "TabRowControl.h"
 #include "TerminalSettingsCache.h"
+#include "../../winterm/Design/DesignTokens.h"
 
 #include "LaunchPositionRequest.g.cpp"
 #include "RenameWindowRequestedArgs.g.cpp"
@@ -5160,6 +5161,23 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_updatePaneResources(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme)
     {
         const auto res = Application::Current().Resources();
+        const auto loadWinTermBrush = [&](const wchar_t* key,
+                                          SolidColorBrush& destination,
+                                          const uint32_t fallbackArgb) {
+            const auto resourceKey = winrt::box_value(key);
+            if (res.HasKey(resourceKey))
+            {
+                destination = ThemeLookup(res, requestedTheme, resourceKey).try_as<SolidColorBrush>();
+            }
+            if (!destination)
+            {
+                destination = SolidColorBrush{ ColorHelper::FromArgb(
+                    static_cast<uint8_t>((fallbackArgb >> 24) & 0xff),
+                    static_cast<uint8_t>((fallbackArgb >> 16) & 0xff),
+                    static_cast<uint8_t>((fallbackArgb >> 8) & 0xff),
+                    static_cast<uint8_t>(fallbackArgb & 0xff)) };
+            }
+        };
         const auto accentColorKey = winrt::box_value(L"SystemAccentColor");
         if (res.HasKey(accentColorKey))
         {
@@ -5209,6 +5227,39 @@ namespace winrt::TerminalApp::implementation
             // will eat focus.
             _paneResources.broadcastBorderBrush = SolidColorBrush{ Colors::Black() };
         }
+
+        loadWinTermBrush(
+            L"WinTermPaneHeaderBrush",
+            _paneResources.paneHeaderBackgroundBrush,
+            winTerm::Design::ColorTokens::PaneHeaderSurface);
+        loadWinTermBrush(
+            L"WinTermPaneHeaderBorderBrush",
+            _paneResources.paneHeaderBorderBrush,
+            winTerm::Design::ColorTokens::PaneHeaderBorder);
+        loadWinTermBrush(
+            L"WinTermTextBrush",
+            _paneResources.primaryTextBrush,
+            winTerm::Design::ColorTokens::TextPrimary);
+        loadWinTermBrush(
+            L"WinTermSecondaryTextBrush",
+            _paneResources.secondaryTextBrush,
+            winTerm::Design::ColorTokens::TextSecondary);
+        loadWinTermBrush(
+            L"WinTermMutedTextBrush",
+            _paneResources.mutedTextBrush,
+            winTerm::Design::ColorTokens::TextMuted);
+        loadWinTermBrush(
+            L"WinTermAccentBrush",
+            _paneResources.accentBrush,
+            winTerm::Design::ColorTokens::AccentMint);
+        loadWinTermBrush(
+            L"WinTermDividerBrush",
+            _paneResources.dividerBrush,
+            winTerm::Design::ColorTokens::BorderIdle);
+        loadWinTermBrush(
+            L"WinTermDividerHoverBrush",
+            _paneResources.dividerHoverBrush,
+            winTerm::Design::ColorTokens::BorderHover);
     }
 
     void TerminalPage::_adjustProcessPriority() const
diff --git a/src/cascadia/TerminalApp/TitlebarControl.cpp b/src/cascadia/TerminalApp/TitlebarControl.cpp
index 21b71590c..8f33ca843 100644
--- a/src/cascadia/TerminalApp/TitlebarControl.cpp
+++ b/src/cascadia/TerminalApp/TitlebarControl.cpp
@@ -20,6 +20,13 @@ namespace winrt::TerminalApp::implementation
     {
         InitializeComponent();
 
+#if defined(WT_BRANDING_WINTERM)
+        WinTermTitlebarSurface().Visibility(Visibility::Visible);
+        WinTermBrandRoot().Visibility(Visibility::Visible);
+        WindowTitle().Visibility(Visibility::Visible);
+        _updateBrandIcon();
+#endif
+
         // Register our event handlers on the MMC buttons.
         MinMaxCloseControl().MinimizeClick({ this, &TitlebarControl::Minimize_Click });
         MinMaxCloseControl().MaximizeClick({ this, &TitlebarControl::Maximize_Click });
@@ -61,6 +68,15 @@ namespace winrt::TerminalApp::implementation
     void TitlebarControl::Focused(bool focused)
     {
         MinMaxCloseControl().Focused(focused);
+
+#if defined(WT_BRANDING_WINTERM)
+        const auto highContrast =
+            winrt::Windows::UI::ViewManagement::AccessibilitySettings{}.HighContrast();
+        const auto opacity = focused || highContrast ? 1.0 : 0.68;
+        WinTermBrandRoot().Opacity(opacity);
+        WindowTitle().Opacity(opacity);
+        ContentRoot().Opacity(focused || highContrast ? 1.0 : 0.82);
+#endif
     }
 
     IInspectable TitlebarControl::Content()
@@ -73,13 +89,19 @@ namespace winrt::TerminalApp::implementation
         ContentRoot().Content(content);
     }
 
+    void TitlebarControl::SetWindowTitle(const winrt::hstring& title)
+    {
+        WindowTitle().Text(title);
+    }
+
     void TitlebarControl::Root_SizeChanged(const IInspectable& /*sender*/,
                                            const Windows::UI::Xaml::SizeChangedEventArgs& /*e*/)
     {
         const auto windowWidth = ActualWidth();
         const auto minMaxCloseWidth = MinMaxCloseControl().ActualWidth();
         const auto dragBarMinWidth = DragBar().MinWidth();
-        const auto maxWidth = windowWidth - minMaxCloseWidth - dragBarMinWidth;
+        const auto brandWidth = WinTermBrandRoot().ActualWidth();
+        const auto maxWidth = windowWidth - minMaxCloseWidth - dragBarMinWidth - brandWidth;
         // Only set our MaxWidth if it's greater than 0. Setting it to a
         // negative value will cause a crash.
         if (maxWidth >= 0)
@@ -183,6 +205,10 @@ namespace winrt::TerminalApp::implementation
 
     void TitlebarControl::_backgroundChanged(winrt::Windows::UI::Xaml::Media::Brush brush)
     {
+#if defined(WT_BRANDING_WINTERM)
+        _updateBrandIcon();
+#endif
+
         // Loosely cribbed from TerminalPage::_SetNewTabButtonColor
         til::color c;
         if (auto acrylic = brush.try_as<winrt::Windows::UI::Xaml::Media::AcrylicBrush>())
@@ -204,4 +230,24 @@ namespace winrt::TerminalApp::implementation
                                                             winrt::Windows::UI::Xaml::ElementTheme::Dark);
     }
 
+    void TitlebarControl::_updateBrandIcon()
+    {
+#if defined(WT_BRANDING_WINTERM)
+        auto iconUri = L"ms-appx:///Images/Square44x44Logo.png";
+        const auto highContrast =
+            winrt::Windows::UI::ViewManagement::AccessibilitySettings{}.HighContrast();
+        if (highContrast)
+        {
+            iconUri = GetSysColor(COLOR_WINDOW) == 0x00FFFFFF ?
+                          L"ms-appx:///Images/terminal_contrast-white.ico" :
+                          L"ms-appx:///Images/terminal_contrast-black.ico";
+        }
+
+        winrt::Windows::UI::Xaml::Media::Imaging::BitmapImage image{
+            winrt::Windows::Foundation::Uri{ iconUri }
+        };
+        WinTermAppIcon().Source(image);
+#endif
+    }
+
 }
diff --git a/src/cascadia/TerminalApp/TitlebarControl.h b/src/cascadia/TerminalApp/TitlebarControl.h
index 1b0e2593f..09516fe1e 100644
--- a/src/cascadia/TerminalApp/TitlebarControl.h
+++ b/src/cascadia/TerminalApp/TitlebarControl.h
@@ -22,6 +22,7 @@ namespace winrt::TerminalApp::implementation
 
         IInspectable Content();
         void Content(IInspectable content);
+        void SetWindowTitle(const winrt::hstring& title);
 
         void SetWindowVisualState(WindowVisualState visualState);
         void Root_SizeChanged(const IInspectable& sender, const Windows::UI::Xaml::SizeChangedEventArgs& e);
@@ -37,6 +38,7 @@ namespace winrt::TerminalApp::implementation
         HWND _window{ nullptr }; // non-owning handle; should not be freed in the dtor.
 
         void _backgroundChanged(winrt::Windows::UI::Xaml::Media::Brush brush);
+        void _updateBrandIcon();
     };
 }
 
diff --git a/src/cascadia/TerminalApp/TitlebarControl.idl b/src/cascadia/TerminalApp/TitlebarControl.idl
index 6cdae62dd..70135361e 100644
--- a/src/cascadia/TerminalApp/TitlebarControl.idl
+++ b/src/cascadia/TerminalApp/TitlebarControl.idl
@@ -32,6 +32,7 @@ namespace TerminalApp
         Boolean Focused { get; set; };
 
         IInspectable Content;
+        void SetWindowTitle(String title);
         Windows.UI.Xaml.Controls.Border DragBar { get; };
     }
 }
diff --git a/src/cascadia/TerminalApp/TitlebarControl.xaml b/src/cascadia/TerminalApp/TitlebarControl.xaml
index 274fbdda2..9e140546b 100644
--- a/src/cascadia/TerminalApp/TitlebarControl.xaml
+++ b/src/cascadia/TerminalApp/TitlebarControl.xaml
@@ -27,29 +27,71 @@
         accent color. (which is GH#1963)
     -->
 
-    <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition Width="Auto" />
-    </Grid.ColumnDefinitions>
-
-    <ContentPresenter x:Name="ContentRoot"
-                      Grid.Column="0" />
-
-    <Border x:Name="DragBar"
-            Grid.Column="1"
-            MinWidth="45.0"
-            DoubleTapped="DragBar_DoubleTapped" />
-
-    <local:MinMaxCloseControl x:Name="MinMaxCloseControl"
-                              Grid.Column="2"
-                              HorizontalAlignment="Right" />
+    <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="*" />
+        <ColumnDefinition Width="Auto" />
+    </Grid.ColumnDefinitions>
+
+    <Border x:Name="WinTermTitlebarSurface"
+            Grid.ColumnSpan="4"
+            Background="{ThemeResource WinTermTitlebarGradientBrush}"
+            IsHitTestVisible="False"
+            Visibility="Collapsed" />
+
+    <Grid x:Name="WinTermBrandRoot"
+          Grid.Column="0"
+          MinWidth="0"
+          Margin="10,0,8,0"
+          VerticalAlignment="Center"
+          IsHitTestVisible="False"
+          Visibility="Collapsed">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <Image x:Name="WinTermAppIcon"
+               Width="{ThemeResource WinTermTitlebarIconSize}"
+               Height="{ThemeResource WinTermTitlebarIconSize}"
+               VerticalAlignment="Center"
+               Stretch="Uniform" />
+        <TextBlock Grid.Column="1"
+                   Margin="7,0,0,0"
+                   VerticalAlignment="Center"
+                   FontSize="12"
+                   FontWeight="SemiBold"
+                   Foreground="{ThemeResource WinTermTextBrush}"
+                   Text="winTerm" />
+    </Grid>
+
+    <ContentPresenter x:Name="ContentRoot"
+                      Grid.Column="1" />
+
+    <Border x:Name="DragBar"
+            Grid.Column="2"
+            MinWidth="45.0"
+            DoubleTapped="DragBar_DoubleTapped">
+        <TextBlock x:Name="WindowTitle"
+                   Margin="12,0"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   FontSize="11"
+                   Foreground="{ThemeResource WinTermMutedTextBrush}"
+                   IsHitTestVisible="False"
+                   TextTrimming="CharacterEllipsis"
+                   Visibility="Collapsed" />
+    </Border>
+
+    <local:MinMaxCloseControl x:Name="MinMaxCloseControl"
+                              Grid.Column="3"
+                              HorizontalAlignment="Right" />
 
     <!--  This border needs to be added manually until GH#10320 is fixed  -->
-    <Border Grid.Column="1"
-            Grid.ColumnSpan="2"
+    <Border Grid.ColumnSpan="4"
             Height="1"
             VerticalAlignment="Bottom"
+            IsHitTestVisible="False"
             Background="{ThemeResource WinTermTitlebarBorderBrush}" />
-</Grid>
+</Grid>
 
diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp
index 522e90c7d..a0d124d4a 100644
--- a/src/cascadia/WindowsTerminal/AppHost.cpp
+++ b/src/cascadia/WindowsTerminal/AppHost.cpp
@@ -298,7 +298,12 @@ void AppHost::Initialize()
             _window->ShowWindowChanged(show);
         });
 
-    _window->UpdateTitle(_windowLogic.Title());
+    const auto title = _windowLogic.Title();
+    _window->UpdateTitle(title);
+    if (_useNonClientArea)
+    {
+        static_cast<NonClientIslandWindow*>(_window.get())->SetTitlebarTitle(title);
+    }
 
     // Set up the content of the application. If the app has a custom titlebar,
     // set that content as well.
@@ -398,7 +403,12 @@ void AppHost::_revokeWindowCallbacks()
 //   a window message so we can update the window's title on the main thread.
 void AppHost::_AppTitleChanged(const winrt::Windows::Foundation::IInspectable& /*sender*/, const winrt::Windows::Foundation::IInspectable& /*args*/)
 {
-    _window->UpdateTitle(_windowLogic.Title());
+    const auto title = _windowLogic.Title();
+    _window->UpdateTitle(title);
+    if (_useNonClientArea)
+    {
+        static_cast<NonClientIslandWindow*>(_window.get())->SetTitlebarTitle(title);
+    }
 }
 
 // The terminal page is responsible for persisting its own state, but it does
diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
index 07eba616f..599e1a22a 100644
--- a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
+++ b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
@@ -430,6 +430,11 @@ void NonClientIslandWindow::SetTitlebarContent(winrt::Windows::UI::Xaml::UIEleme
     }
 }
 
+void NonClientIslandWindow::SetTitlebarTitle(const winrt::hstring& title)
+{
+    _titlebar.SetWindowTitle(title);
+}
+
 // Method Description:
 // - This method computes the height of the little border above the title bar
 //   and returns it. If the border is disabled, then this method will return 0.
diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.h b/src/cascadia/WindowsTerminal/NonClientIslandWindow.h
index 6fc0761a3..cf58cee80 100644
--- a/src/cascadia/WindowsTerminal/NonClientIslandWindow.h
+++ b/src/cascadia/WindowsTerminal/NonClientIslandWindow.h
@@ -43,6 +43,7 @@ class NonClientIslandWindow : public IslandWindow
     void OnAppInitialized() override;
     void SetContent(winrt::Windows::UI::Xaml::UIElement content) override;
     void SetTitlebarContent(winrt::Windows::UI::Xaml::UIElement content);
+    void SetTitlebarTitle(const winrt::hstring& title);
     void OnApplicationThemeChanged(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme) override;
 
     void SetTitlebarBackground(winrt::Windows::UI::Xaml::Media::Brush brush);
diff --git a/src/winterm/Design/ColorTokens.h b/src/winterm/Design/ColorTokens.h
index 47190a3c6..a4f69d8b1 100644
--- a/src/winterm/Design/ColorTokens.h
+++ b/src/winterm/Design/ColorTokens.h
@@ -12,11 +12,14 @@ namespace winTerm::Design::ColorTokens
     inline constexpr uint32_t WindowSurface{ 0xFF090E14 };
     inline constexpr uint32_t TitlebarTop{ 0xFF17212B };
     inline constexpr uint32_t TitlebarBottom{ 0xFF131C25 };
+    inline constexpr uint32_t TitlebarBorder{ 0xFF24313C };
     inline constexpr uint32_t TabSurface{ 0xFF111820 };
     inline constexpr uint32_t ActiveTabSurface{ 0xFF1A2530 };
+    inline constexpr uint32_t TabBorder{ 0xFF1D2A35 };
     inline constexpr uint32_t PaneHeaderSurface{ 0xFF101821 };
+    inline constexpr uint32_t PaneHeaderBorder{ 0xFF1F2D38 };
     inline constexpr uint32_t TerminalSurface{ 0xFF0A1016 };
-    inline constexpr uint32_t BorderIdle{ 0xFF22303D };
+    inline constexpr uint32_t BorderIdle{ 0xFF2A3945 };
     inline constexpr uint32_t BorderHover{ 0xFF34485A };
     inline constexpr uint32_t AccentMint{ 0xFF63E6BE };
     inline constexpr uint32_t AccentMintStrong{ 0xFF41D8AA };
diff --git a/src/winterm/Design/DensityTokens.h b/src/winterm/Design/DensityTokens.h
index 186a97b95..7dcb1bbab 100644
--- a/src/winterm/Design/DensityTokens.h
+++ b/src/winterm/Design/DensityTokens.h
@@ -16,7 +16,11 @@ namespace winTerm::Design
         inline constexpr InterfaceDensity Default{ InterfaceDensity::Compact };
         inline constexpr double CompactPaneHeaderHeight{ 27.0 };
         inline constexpr double ComfortablePaneHeaderHeight{ 32.0 };
-        inline constexpr double CompactTabHeight{ 32.0 };
+        inline constexpr double CompactTabRowHeight{ 32.0 };
+        inline constexpr double CompactTabHeight{ 27.0 };
         inline constexpr double CompactTitlebarHeight{ 35.0 };
+        inline constexpr double CompactTitlebarIconSize{ 22.0 };
+        inline constexpr double CompactCaptionButtonWidth{ 42.0 };
+        inline constexpr double CompactChromeButtonSize{ 27.0 };
     }
 }
diff --git a/src/winterm/Design/RadiusTokens.h b/src/winterm/Design/RadiusTokens.h
index 62789c6aa..92bdd21b3 100644
--- a/src/winterm/Design/RadiusTokens.h
+++ b/src/winterm/Design/RadiusTokens.h
@@ -6,6 +6,7 @@
 namespace winTerm::Design::RadiusTokens
 {
     inline constexpr double CompactControl{ 4.0 };
+    inline constexpr double ActiveTabTop{ 7.0 };
     inline constexpr double MenuItem{ 5.0 };
     inline constexpr double Flyout{ 9.0 };
 }