From ac7ef665a1eb583a9548edfdd065b8eff8696b30 Mon Sep 17 00:00:00 2001
From: Sam Hewitt <snwh@gnome.org>
Date: Wed, 15 Nov 2023 11:32:27 -0330
Subject: [PATCH] Use dedicated assets for ctrlAltTab

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3019>
---
 data/gnome-shell-icons.gresource.xml          |  10 +-
 .../actions/shell-focus-app-grid-symbolic.svg |   4 +
 .../actions/shell-focus-dash-symbolic-rtl.svg |   7 +
 .../actions/shell-focus-dash-symbolic.svg     |   7 +
 .../shell-focus-desktop-symbolic-rtl.svg      |   9 +
 .../actions/shell-focus-desktop-symbolic.svg  |   9 +
 .../actions/shell-focus-search-symbolic.svg   |   4 +
 .../shell-focus-top-bar-symbolic-rtl.svg      |   7 +
 .../actions/shell-focus-top-bar-symbolic.svg  |   7 +
 .../actions/shell-focus-windows-symbolic.svg  |   4 +
 data/org.gnome.Shell-symbolic.Source.svg      | 272 ++++++++++++++----
 js/ui/ctrlAltTab.js                           |   4 +-
 js/ui/dash.js                                 |   2 +-
 js/ui/overviewControls.js                     |   4 +-
 js/ui/panel.js                                |   2 +-
 js/ui/searchController.js                     |   2 +-
 16 files changed, 294 insertions(+), 60 deletions(-)
 create mode 100644 data/icons/scalable/actions/shell-focus-app-grid-symbolic.svg
 create mode 100644 data/icons/scalable/actions/shell-focus-dash-symbolic-rtl.svg
 create mode 100644 data/icons/scalable/actions/shell-focus-dash-symbolic.svg
 create mode 100644 data/icons/scalable/actions/shell-focus-desktop-symbolic-rtl.svg
 create mode 100644 data/icons/scalable/actions/shell-focus-desktop-symbolic.svg
 create mode 100644 data/icons/scalable/actions/shell-focus-search-symbolic.svg
 create mode 100644 data/icons/scalable/actions/shell-focus-top-bar-symbolic-rtl.svg
 create mode 100644 data/icons/scalable/actions/shell-focus-top-bar-symbolic.svg
 create mode 100644 data/icons/scalable/actions/shell-focus-windows-symbolic.svg

diff --git a/data/gnome-shell-icons.gresource.xml b/data/gnome-shell-icons.gresource.xml
index 272f43ceb..680cffced 100644
--- a/data/gnome-shell-icons.gresource.xml
+++ b/data/gnome-shell-icons.gresource.xml
@@ -21,6 +21,15 @@
     <file>scalable/actions/screenshot-ui-show-pointer-symbolic.svg</file>
     <file>scalable/actions/screenshot-ui-window-symbolic.svg</file>
     <file>scalable/actions/screenshot-recorded-symbolic.svg</file>
+    <file>scalable/actions/shell-focus-app-grid-symbolic.svg</file>
+    <file>scalable/actions/shell-focus-dash-symbolic.svg</file>
+    <file>scalable/actions/shell-focus-dash-symbolic-rtl.svg</file>
+    <file>scalable/actions/shell-focus-desktop-symbolic.svg</file>
+    <file>scalable/actions/shell-focus-desktop-symbolic-rtl.svg</file>
+    <file>scalable/actions/shell-focus-search-symbolic.svg</file>
+    <file>scalable/actions/shell-focus-top-bar-symbolic.svg</file>
+    <file>scalable/actions/shell-focus-top-bar-symbolic-rtl.svg</file>
+    <file>scalable/actions/shell-focus-windows-symbolic.svg</file>
     <file>scalable/status/background-app-ghost-symbolic.svg</file>
     <file>scalable/status/keyboard-brightness-high-symbolic.svg</file>
     <file>scalable/status/keyboard-brightness-medium-symbolic.svg</file>
@@ -37,4 +46,3 @@
     <file>scalable/status/screen-privacy-symbolic.svg</file>
   </gresource>
 </gresources>
-
diff --git a/data/icons/scalable/actions/shell-focus-app-grid-symbolic.svg b/data/icons/scalable/actions/shell-focus-app-grid-symbolic.svg
new file mode 100644
index 000000000..c0fbc6cce
--- /dev/null
+++ b/data/icons/scalable/actions/shell-focus-app-grid-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 7.988281 6 c -1.109375 0 -2 0.890625 -2 2 s 0.890625 2 2 2 s 2 -0.890625 2 -2 s -0.890625 -2 -2 -2 z m 8 0 c -1.109375 0 -2 0.890625 -2 2 s 0.890625 2 2 2 s 2 -0.890625 2 -2 s -0.890625 -2 -2 -2 z m 8 0 c -1.109375 0 -2 0.890625 -2 2 s 0.890625 2 2 2 s 2 -0.890625 2 -2 s -0.890625 -2 -2 -2 z m -16 8 c -1.109375 0 -2 0.890625 -2 2 s 0.890625 2 2 2 s 2 -0.890625 2 -2 s -0.890625 -2 -2 -2 z m 8 0 c -1.109375 0 -2 0.890625 -2 2 s 0.890625 2 2 2 s 2 -0.890625 2 -2 s -0.890625 -2 -2 -2 z m 8 0 c -1.109375 0 -2 0.890625 -2 2 s 0.890625 2 2 2 s 2 -0.890625 2 -2 s -0.890625 -2 -2 -2 z m -16 8 c -1.109375 0 -2 0.890625 -2 2 s 0.890625 2 2 2 s 2 -0.890625 2 -2 s -0.890625 -2 -2 -2 z m 8 0 c -1.109375 0 -2 0.890625 -2 2 s 0.890625 2 2 2 s 2 -0.890625 2 -2 s -0.890625 -2 -2 -2 z m 8 0 c -1.109375 0 -2 0.890625 -2 2 s 0.890625 2 2 2 s 2 -0.890625 2 -2 s -0.890625 -2 -2 -2 z m 0 0" fill="#241f31"/>
+</svg>
diff --git a/data/icons/scalable/actions/shell-focus-dash-symbolic-rtl.svg b/data/icons/scalable/actions/shell-focus-dash-symbolic-rtl.svg
new file mode 100644
index 000000000..fcc795505
--- /dev/null
+++ b/data/icons/scalable/actions/shell-focus-dash-symbolic-rtl.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#241f31">
+        <path d="m 32 3 v 2 h -25 c -2.789062 0 -5 2.210938 -5 5 v 12 c 0 2.789062 2.210938 5 5 5 h 25 v 2 h -25 c -3.859375 0 -7 -3.140625 -7 -7 v -12 c 0 -3.859375 3.140625 -7 7 -7 z m -15 8 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 s -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m -4 0 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 s -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m -4 0 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 s -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m 8 4 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 s -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m -4 0 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 s -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m -4 0 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 s -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m 8 4 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 s -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m -4 0 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 s -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m -4 0 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 s -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m 0 0"/>
+        <path d="m 32 7 v 18 h -5 c -1.660156 0 -3 -1.339844 -3 -3 v -12 c 0 -1.660156 1.339844 -3 3 -3 z m 0 0" fill-opacity="0.2"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/shell-focus-dash-symbolic.svg b/data/icons/scalable/actions/shell-focus-dash-symbolic.svg
new file mode 100644
index 000000000..9fc75e971
--- /dev/null
+++ b/data/icons/scalable/actions/shell-focus-dash-symbolic.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#241f31">
+        <path d="m 0 3 v 2 h 25 c 2.789062 0 5 2.210938 5 5 v 12 c 0 2.789062 -2.210938 5 -5 5 h -25 v 2 h 25 c 3.859375 0 7 -3.140625 7 -7 v -12 c 0 -3.859375 -3.140625 -7 -7 -7 z m 15 8 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 s 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m 4 0 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 s 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m 4 0 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 s 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m -8 4 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 s 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m 4 0 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 s 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m 4 0 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 s 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m -8 4 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 s 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m 4 0 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 s 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m 4 0 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 s 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m 0 0"/>
+        <path d="m 0 7 v 18 h 5 c 1.660156 0 3 -1.339844 3 -3 v -12 c 0 -1.660156 -1.339844 -3 -3 -3 z m 0 0" fill-opacity="0.2"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/shell-focus-desktop-symbolic-rtl.svg b/data/icons/scalable/actions/shell-focus-desktop-symbolic-rtl.svg
new file mode 100644
index 000000000..b5008d99e
--- /dev/null
+++ b/data/icons/scalable/actions/shell-focus-desktop-symbolic-rtl.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 3 3 c -1.660156 0 -3 1.339844 -3 3 v 19 c 0 1.660156 1.339844 3 3 3 h 26 c 1.660156 0 3 -1.339844 3 -3 v -19 c 0 -1.660156 -1.339844 -3 -3 -3 z m 0 3 h 26 c 0.554688 0 1 0.445312 1 1 v 18 c 0 0.554688 -0.445312 1 -1 1 h -26 c -0.554688 0 -1 -0.445312 -1 -1 v -18 c 0 -0.554688 0.445312 -1 1 -1 z m 0 0" fill="#241f31"/>
+    <g fill="#231e2d" fill-opacity="0.2">
+        <path d="m 25.75 8 h 1.5 c 0.414062 0 0.75 0.335938 0.75 0.75 v 1.5 c 0 0.414062 -0.335938 0.75 -0.75 0.75 h -1.5 c -0.414062 0 -0.75 -0.335938 -0.75 -0.75 v -1.5 c 0 -0.414062 0.335938 -0.75 0.75 -0.75 z m 0 0"/>
+        <path d="m 25.75 12 h 1.5 c 0.414062 0 0.75 0.335938 0.75 0.75 v 1.5 c 0 0.414062 -0.335938 0.75 -0.75 0.75 h -1.5 c -0.414062 0 -0.75 -0.335938 -0.75 -0.75 v -1.5 c 0 -0.414062 0.335938 -0.75 0.75 -0.75 z m 0 0"/>
+        <path d="m 25.75 16 h 1.5 c 0.414062 0 0.75 0.335938 0.75 0.75 v 1.5 c 0 0.414062 -0.335938 0.75 -0.75 0.75 h -1.5 c -0.414062 0 -0.75 -0.335938 -0.75 -0.75 v -1.5 c 0 -0.414062 0.335938 -0.75 0.75 -0.75 z m 0 0"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/shell-focus-desktop-symbolic.svg b/data/icons/scalable/actions/shell-focus-desktop-symbolic.svg
new file mode 100644
index 000000000..add7fbaef
--- /dev/null
+++ b/data/icons/scalable/actions/shell-focus-desktop-symbolic.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 3 3 c -1.660156 0 -3 1.339844 -3 3 v 19 c 0 1.660156 1.339844 3 3 3 h 26 c 1.660156 0 3 -1.339844 3 -3 v -19 c 0 -1.660156 -1.339844 -3 -3 -3 z m 0 3 h 26 c 0.554688 0 1 0.445312 1 1 v 18 c 0 0.554688 -0.445312 1 -1 1 h -26 c -0.554688 0 -1 -0.445312 -1 -1 v -18 c 0 -0.554688 0.445312 -1 1 -1 z m 0 0" fill="#241f31"/>
+    <g fill="#231e2d" fill-opacity="0.2">
+        <path d="m 4.75 8 h 1.5 c 0.414062 0 0.75 0.335938 0.75 0.75 v 1.5 c 0 0.414062 -0.335938 0.75 -0.75 0.75 h -1.5 c -0.414062 0 -0.75 -0.335938 -0.75 -0.75 v -1.5 c 0 -0.414062 0.335938 -0.75 0.75 -0.75 z m 0 0"/>
+        <path d="m 4.75 12 h 1.5 c 0.414062 0 0.75 0.335938 0.75 0.75 v 1.5 c 0 0.414062 -0.335938 0.75 -0.75 0.75 h -1.5 c -0.414062 0 -0.75 -0.335938 -0.75 -0.75 v -1.5 c 0 -0.414062 0.335938 -0.75 0.75 -0.75 z m 0 0"/>
+        <path d="m 4.75 16 h 1.5 c 0.414062 0 0.75 0.335938 0.75 0.75 v 1.5 c 0 0.414062 -0.335938 0.75 -0.75 0.75 h -1.5 c -0.414062 0 -0.75 -0.335938 -0.75 -0.75 v -1.5 c 0 -0.414062 0.335938 -0.75 0.75 -0.75 z m 0 0"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/shell-focus-search-symbolic.svg b/data/icons/scalable/actions/shell-focus-search-symbolic.svg
new file mode 100644
index 000000000..c680c205c
--- /dev/null
+++ b/data/icons/scalable/actions/shell-focus-search-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 13.5 3 c -5.789062 0 -10.5 4.710938 -10.5 10.5 s 4.710938 10.5 10.5 10.5 c 2.621094 0 4.953125 -1.0625 6.792969 -2.65625 c -0.019531 0.117188 -0.023438 0.242188 0 0.363281 l 6 6 c 0.253906 0.246094 0.621093 0.339844 0.960937 0.25 c 0.734375 -0.203125 0.984375 -1.117187 0.453125 -1.664062 l -6 -6 c -0.121093 -0.023438 -0.246093 -0.019531 -0.367187 0.003906 c 1.597656 -1.84375 2.660156 -4.175781 2.660156 -6.796875 c 0 -5.789062 -4.710938 -10.5 -10.5 -10.5 z m 0 2 c 4.707031 0 8.5 3.792969 8.5 8.5 s -3.792969 8.5 -8.5 8.5 s -8.5 -3.792969 -8.5 -8.5 s 3.792969 -8.5 8.5 -8.5 z m 0 0" fill="#241f31"/>
+</svg>
diff --git a/data/icons/scalable/actions/shell-focus-top-bar-symbolic-rtl.svg b/data/icons/scalable/actions/shell-focus-top-bar-symbolic-rtl.svg
new file mode 100644
index 000000000..3d3097ff3
--- /dev/null
+++ b/data/icons/scalable/actions/shell-focus-top-bar-symbolic-rtl.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#241f31">
+        <path d="m 30 3 c 2 0 2 1.714844 2 2 v 22 h -2 v -17 c 0 -1 -1 -1 -1 -1 h -29 v -6 z m -2 2 h -4 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 h 4 c 0.554688 0 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m -7 0.25 c -0.414062 0 -0.75 0.335938 -0.75 0.75 s 0.335938 0.75 0.75 0.75 s 0.75 -0.335938 0.75 -0.75 s -0.335938 -0.75 -0.75 -0.75 z m 0 0"/>
+        <path d="m 21 5 h -1 c -0.554688 0 -1 0.445312 -1 1 s 0.445312 1 1 1 h 1 c 0.554688 0 1 -0.445312 1 -1 s -0.445312 -1 -1 -1 z m 0 0" fill-opacity="0.34902"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/shell-focus-top-bar-symbolic.svg b/data/icons/scalable/actions/shell-focus-top-bar-symbolic.svg
new file mode 100644
index 000000000..7e7772413
--- /dev/null
+++ b/data/icons/scalable/actions/shell-focus-top-bar-symbolic.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#241f31">
+        <path d="m 2 3 c -2 0 -2 1.714844 -2 2 v 22 h 2 v -17 c 0 -1 1 -1 1 -1 h 29 v -6 z m 2 2 h 4 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 h -4 c -0.554688 0 -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m 7 0.25 c 0.414062 0 0.75 0.335938 0.75 0.75 s -0.335938 0.75 -0.75 0.75 s -0.75 -0.335938 -0.75 -0.75 s 0.335938 -0.75 0.75 -0.75 z m 0 0"/>
+        <path d="m 11 5 h 1 c 0.554688 0 1 0.445312 1 1 s -0.445312 1 -1 1 h -1 c -0.554688 0 -1 -0.445312 -1 -1 s 0.445312 -1 1 -1 z m 0 0" fill-opacity="0.34902"/>
+    </g>
+</svg>
diff --git a/data/icons/scalable/actions/shell-focus-windows-symbolic.svg b/data/icons/scalable/actions/shell-focus-windows-symbolic.svg
new file mode 100644
index 000000000..fadcaf426
--- /dev/null
+++ b/data/icons/scalable/actions/shell-focus-windows-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 20.996094 30 c 1.644531 0 2.996094 -1.355469 3 -3 l 0.003906 -2 h -2 l -0.003906 2 c 0 0.570312 -0.429688 1 -1 1 h -17.996094 c -0.570312 0 -1 -0.429688 -1 -1 v -13 c 0 -0.570312 0.429688 -1 1 -1 h 3 v -3 h -3 c -1.644531 0 -3 1.355469 -3 3 v 14 c 0 1.644531 1.355469 3 3 3 z m 8 -7 c 1.644531 0 3 -1.355469 3 -3 v -14 c 0 -1.644531 -1.355469 -3 -3 -3 h -18 c -1.644532 0 -3 1.355469 -3 3 v 14 c 0 1.644531 1.355468 3 3 3 z m 0 -2 h -18 c -0.570313 0 -1 -0.429688 -1 -1 v -13 c 0 -0.570312 0.429687 -1 1 -1 h 18 c 0.570312 0 1 0.429688 1 1 v 13 c 0 0.570312 -0.429688 1 -1 1 z m 0 0" fill="#241f31"/>
+</svg>
diff --git a/data/org.gnome.Shell-symbolic.Source.svg b/data/org.gnome.Shell-symbolic.Source.svg
index 21bcfd8e5..0f02fdc0e 100644
--- a/data/org.gnome.Shell-symbolic.Source.svg
+++ b/data/org.gnome.Shell-symbolic.Source.svg
@@ -7,7 +7,7 @@
    viewBox="0 0 64 64"
    id="svg2"
    version="1.1"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
    sodipodi:docname="org.gnome.Shell-symbolic.Source.svg"
    xml:space="preserve"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -22,16 +22,16 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="51.5"
-     inkscape:cy="258"
+     inkscape:cx="224.5"
+     inkscape:cy="258.5"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
      units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1011"
+     inkscape:window-width="2560"
+     inkscape:window-height="1531"
      inkscape:window-x="0"
-     inkscape:window-y="32"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:snap-bbox="true"
      inkscape:bbox-paths="true"
@@ -55,7 +55,13 @@
        color="#5e57ff"
        opacity="0.1254902"
        empcolor="#5e57ff"
-       empopacity="0.25098039" /></sodipodi:namedview><g
+       empopacity="0.25098039"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px"
+       visible="false" /></sodipodi:namedview><g
      inkscape:label="status"
      inkscape:groupmode="layer"
      id="layer1"
@@ -187,20 +193,6 @@
          d="m 109,467 v 19 h 2 v -8 h 4.383 l 0.722,1.447 c 0.16942,0.33905 0.51597,0.55318 0.895,0.553 h 7 c 0.55228,0 1,-0.44772 1,-1 v -9 c 0,-0.55228 -0.44772,-1 -1,-1 h -5.383 l -0.722,-1.447 C 117.72558,467.21395 117.37903,466.99982 117,467 h -7 z"
          id="path1085"
          style="fill:#241f31;fill-opacity:1" /></g><g
-       id="g13678"
-       inkscape:label="keyboard keys hide "
-       transform="translate(-40,-214.46669)"><title
-         id="title14947">keyboard-hide</title><path
-         d="m 139.99985,472 a 1,1 0 0 0 -0.70703,0.29297 1,1 0 0 0 0,1.41406 l 8,8 a 1.0001,1.0001 0 0 0 1.41406,0 l 8,-8 a 1,1 0 0 0 0,-1.41406 1,1 0 0 0 -1.41406,0 l -7.29297,7.29297 -7.29297,-7.29297 A 1,1 0 0 0 139.99985,472 Z"
-         id="path4931"
-         style="fill:#241f31;fill-opacity:1" /><rect
-         width="23.999996"
-         height="23.999996"
-         x="-487.99997"
-         y="-159.99998"
-         id="rect13562"
-         transform="matrix(0,-1,-1,0,0,0)"
-         style="fill:none" /></g><g
        id="g13796"
        inkscape:label="on-screen keyboard keys"
        transform="translate(-40,-214.46669)"><title
@@ -214,7 +206,24 @@
          style="fill:none" /><path
          id="path955"
          style="fill:#241f31;fill-opacity:1"
-         d="m 187,470 v 6.00391 c 0.006,0.996 -1,0.99609 -1,0.99609 h -11.58594 l 1.29297,-1.29297 a 1,1 0 0 0 0,-1.41406 A 1,1 0 0 0 175,474 a 1,1 0 0 0 -0.70703,0.29297 l -3,3 a 1.0001,1.0001 0 0 0 0,1.41406 l 3,3 a 1,1 0 0 0 1.41406,0 1,1 0 0 0 0,-1.41406 L 174.41602,479 H 186 c 3.006,0 3,-3 3,-3 v -6 z" /></g></g><g
+         d="m 187,470 v 6.00391 c 0.006,0.996 -1,0.99609 -1,0.99609 h -11.58594 l 1.29297,-1.29297 a 1,1 0 0 0 0,-1.41406 A 1,1 0 0 0 175,474 a 1,1 0 0 0 -0.70703,0.29297 l -3,3 a 1.0001,1.0001 0 0 0 0,1.41406 l 3,3 a 1,1 0 0 0 1.41406,0 1,1 0 0 0 0,-1.41406 L 174.41602,479 H 186 c 3.006,0 3,-3 3,-3 v -6 z" /></g><g
+       id="g14"
+       transform="translate(-64,-6.3362101e-5)"
+       inkscape:label="on-screen keyboard keys"><title
+         id="title14">keyboard-hide</title><rect
+         width="23.999996"
+         height="23.999996"
+         x="-273.53329"
+         y="-183.99998"
+         id="rect14"
+         transform="matrix(0,-1,-1,0,0,0)"
+         style="fill:none" /><path
+         d="m 162.49704,251.53995 c -0.554,0 -1,0.446 -1,1 v 11 c 0,0.554 0.446,1 1,1 h 19.0059 c 0.554,0 1,-0.446 1,-1 v -11 c 0,-0.554 -0.446,-1 -1,-1 z m 1.3653,2 h 1.6562 v 2 h -2 v -1.6074 c 0,-0.218 0.1538,-0.3926 0.3438,-0.3926 z m 2.6562,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 1.6563 c 0.19,0 0.3437,0.1746 0.3437,0.3926 v 1.6074 h -2 z m 2.9844,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m -13.9844,3 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 2.9844,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m -9.6621,4 h 10.3125 c 0.19,0 0.3437,0.1746 0.3437,0.3926 v 1.2148 c 0,0.218 -0.1537,0.3926 -0.3437,0.3926 h -10.3125 c -0.19,0 -0.3438,-0.1746 -0.3438,-0.3926 v -1.2148 c 0,-0.218 0.1538,-0.3926 0.3438,-0.3926 z"
+         fill="#241f31"
+         id="path1" /><path
+         d="m 176.99999,267.52665 -4.99512,4 -5.00488,-4 z"
+         fill="#241f31"
+         id="path2-6" /></g></g><g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="actions"><text
@@ -229,7 +238,7 @@
          y="184"
          style="font-size:16px;fill:#241f31;fill-opacity:1">actions</tspan></text><g
        id="g13439"
-       transform="matrix(-1,0,0,1,95.99998,-240)"
+       transform="matrix(-1,0,0,1,111.99998,-144)"
        inkscape:label="overview next right forward"><title
          id="title15446">carousel-arrow-next</title><rect
          width="15.999988"
@@ -244,7 +253,7 @@
          style="fill:#241f31;fill-opacity:1" /></g><g
        id="g29998"
        inkscape:label="mouse pointer dwell click"
-       transform="translate(28,-344)"><title
+       transform="translate(28,-244)"><title
          id="title39373">pointer-secondary-click</title><path
          d="m 16,640 v 19.77148 l -4.24414,-4.14258 c -0.612408,1.21538 -1.173049,2.46023 -1.819709,3.6561 -1.141947,1.47628 -3.975266,0.38901 -3.846009,-1.47361 0.09413,-0.82252 0.594755,-1.52142 0.899969,-2.2776 l 0.896608,-1.92051 H 2.617188 Z m -1.5,3.72656 -8.359375,8.38672 h 4.101563 c -0.885072,1.9032 -1.781799,3.80152 -2.659622,5.70774 -0.0349,0.56609 1.149057,0.98883 1.282093,0.29797 l 2.455699,-5.01348 3.179687,3.10351 z"
          id="path5851"
@@ -257,7 +266,7 @@
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1.781;marker:none;enable-background:new" /></g><g
        id="g29992"
        inkscape:label="mouse pointer dwell click"
-       transform="translate(-28,-344)"><title
+       transform="translate(-28,-244)"><title
          id="title39371">pointer-primary-click</title><rect
          width="20"
          height="20"
@@ -270,7 +279,7 @@
          style="fill:#241f31;fill-opacity:1" /></g><g
        id="g14643"
        inkscape:label="mouse pointer dwell click drag"
-       transform="translate(0,-344)"><title
+       transform="translate(0,-244)"><title
          id="title39369">pointer-drag</title><rect
          width="20"
          height="20"
@@ -283,7 +292,7 @@
          style="fill:#241f31;fill-opacity:1" /></g><g
        id="g30454"
        inkscape:label="mouse pointer dwell click double"
-       transform="translate(0,-344)"><title
+       transform="translate(0,-244)"><title
          id="title39367">pointer-double-click</title><rect
          width="20"
          height="20"
@@ -295,7 +304,7 @@
          id="path5565-5"
          style="fill:#241f31;fill-opacity:1" /></g><g
        id="g1429"
-       transform="translate(-132,-248)"
+       transform="translate(-132,-148)"
        inkscape:label="screenshooter capture area "><title
          id="title1423">screenshot-ui-area</title><rect
          width="31.999998"
@@ -309,7 +318,7 @@
          id="path2-3"
          style="fill:#241f31;fill-opacity:1" /></g><g
        id="g4349"
-       transform="translate(-92,-248)"
+       transform="translate(-92,-148)"
        inkscape:label="screenshooter capture display screen "><title
          id="title4343">screenshot-ui-display</title><rect
          width="31.999998"
@@ -323,7 +332,7 @@
          d="m 136,464 c -1.662,0 -3,1.338 -3,3 v 14 c 0,1.662 1.338,3 3,3 h 10 v 2.99805 h -3.00195 c -1.0901,-7e-5 -1.99805,0.90995 -1.99805,2 H 142.99805 153 155 C 155,487.908 154.09,487.00007 153,487 h -2.99805 v -3 H 160 c 1.662,0 3,-1.338 3,-3 v -14 c 0,-1.662 -1.338,-3 -3,-3 z m 0,2 h 24 c 0.554,0 1,0.446 1,1 v 14 c 0,0.554 -0.446,1 -1,1 h -24 c -0.554,0 -1,-0.446 -1,-1 v -14 c 0,-0.554 0.446,-1 1,-1 z"
          style="fill:#241f31;fill-opacity:1" /></g><g
        id="g4445"
-       transform="translate(-52,-248)"
+       transform="translate(-52,-148)"
        inkscape:label="screenshooter capture windows"><title
          id="title4439">screenshot-ui-window</title><path
          id="rect28516"
@@ -337,12 +346,13 @@
          transform="matrix(0,-1,-1,0,0,0)"
          style="fill:none;stroke-width:1" /></g><g
        id="g42319"
-       transform="translate(-12,-248)"
-       inkscape:label="screenshooter capture windows"><title
-         id="title42313">screenshot-ui-window</title><path
+       transform="matrix(1,0,0,-1,-11.999985,703.99988)"
+       inkscape:label="focus management windows"><title
+         id="title42313">shell-focus-windows</title><path
          id="path42315"
-         d="m 135,463 c -1.6447,0 -3,1.3553 -3,3 v 14 c 0,1.6447 1.3553,3 3,3 h 3.99805 v 3 c 0,1.6447 1.3553,3 3,3 h 18.99804 c 1.6447,0 3,-1.3553 3,-3 v -14 c 0,-1.6447 -1.3553,-3 -3,-3 h -4 v -3 c 0,-1.6447 -1.3553,-3 -3,-3 z m 0,2 h 18.99609 c 0.5713,0 1,0.4287 1,1 v 3 h -12.99804 c -1.6447,0 -3,1.3553 -3,3 v 9 H 135 c -0.5713,0 -1,-0.4287 -1,-1 v -14 c 0,-0.5713 0.4287,-1 1,-1 z m 6.99805,6 h 18.99804 c 0.5713,0 1,0.4287 1,1 v 14 c 0,0.5713 -0.4287,1 -1,1 h -18.99804 c -0.5713,0 -1,-0.4287 -1,-1 v -14 c 0,-0.5713 0.4287,-1 1,-1 z"
-         style="fill:#241f31;fill-opacity:1" /><rect
+         style="fill:#241f31;fill-opacity:1"
+         d="m 152.99597,462 c 1.6447,0 2.99671,1.3553 3,3 l 0.004,2 h -2 l -0.004,-2 c -0.001,-0.5713 -0.4287,-1 -1,-1 h -17.996 c -0.5713,0 -1,0.4287 -1,1 v 13 c 0,0.5713 0.4287,1 1,1 h 3 v 3 h -3 c -1.6447,0 -3,-1.3553 -3,-3 v -14 c 0,-1.6447 1.3553,-3 3,-3 z m 8.00009,7 c 1.6447,0 3,1.3553 3,3 v 14 c 0,1.6447 -1.3553,3 -3,3 h -17.99804 c -1.6447,0 -3,-1.3553 -3,-3 v -14 c 0,-1.6447 1.3553,-3 3,-3 z m 0,2 h -17.99804 c -0.5713,0 -1,0.4287 -1,1 v 13 c 0,0.5713 0.4287,1 1,1 h 17.99804 c 0.5713,0 1,-0.4287 1,-1 v -13 c 0,-0.5713 -0.4287,-1 -1,-1 z"
+         sodipodi:nodetypes="ssccssssssccsssssssssssssssssssssss" /><rect
          width="31.999998"
          height="31.999998"
          x="-491.99994"
@@ -352,7 +362,7 @@
          style="fill:none;stroke-width:1" /></g><g
        id="g42429"
        inkscape:label="screenshooter capture display screen "
-       transform="translate(-80,-335.53331)"><title
+       transform="translate(-80,-235.53331)"><title
          id="title42423">screenshot-ui-show-pointer</title><rect
          transform="scale(-1,1)"
          y="663.53333"
@@ -364,22 +374,26 @@
          d="m 82.95312,664.60753 2.41797,13.21094 3.23828,-2.39844 2.05469,2.64844 c 1.03125,1.43359 3.14844,-0.21094 2.01172,-1.5625 l -2.01562,-2.59375 2.98437,-2.17579 z m 0,0"
          fill="#2e3436"
          id="path2-35" /></g><g
-       id="g14227"
-       transform="translate(-71.999987,-207.99997)"
-       inkscape:label="overview window close"><title
-         id="title15444">preview-close</title><rect
-         width="23.999996"
-         height="23.999996"
-         x="-487.99997"
-         y="-159.99998"
-         id="rect14223"
-         transform="matrix(0,-1,-1,0,0,0)"
-         style="fill:none" /></g><path
-       id="path986"
-       d="M 71 262 A 1 1 0 0 0 70.292969 262.29297 A 1 1 0 0 0 70.292969 263.70703 L 74.585938 268 L 70.292969 272.29297 A 1 1 0 0 0 70.292969 273.70703 A 1 1 0 0 0 71.707031 273.70703 L 76 269.41406 L 80.292969 273.70703 A 1 1 0 0 0 81.707031 273.70703 A 1 1 0 0 0 81.707031 272.29297 L 77.414062 268 L 81.707031 263.70703 A 1 1 0 0 0 81.707031 262.29297 A 1 1 0 0 0 81 262 A 1 1 0 0 0 80.292969 262.29297 L 76 266.58594 L 71.707031 262.29297 A 1 1 0 0 0 71 262 z "
-       style="fill:#241f31;fill-opacity:1" /><g
+       id="g13"
+       inkscape:label="window close exit"
+       transform="translate(-64,60)"><title
+         id="title13">preview-close</title><g
+         id="g14227"
+         transform="translate(-71.999987,-167.99997)"
+         inkscape:label="overview window close"><title
+           id="title15444">preview-close</title><rect
+           width="23.999996"
+           height="23.999996"
+           x="-487.99997"
+           y="-159.99998"
+           id="rect14223"
+           transform="matrix(0,-1,-1,0,0,0)"
+           style="fill:none" /></g><path
+         id="path986"
+         d="m 71,302 a 1,1 0 0 0 -0.707031,0.29297 1,1 0 0 0 0,1.41406 L 74.585938,308 l -4.292969,4.29297 a 1,1 0 0 0 0,1.41406 1,1 0 0 0 1.414062,0 L 76,309.41406 l 4.292969,4.29297 a 1,1 0 0 0 1.414062,0 1,1 0 0 0 0,-1.41406 L 77.414062,308 l 4.292969,-4.29297 a 1,1 0 0 0 0,-1.41406 A 1,1 0 0 0 81,302 1,1 0 0 0 80.292969,302.29297 L 76,306.58594 71.707031,302.29297 A 1,1 0 0 0 71,302 Z"
+         style="fill:#241f31;fill-opacity:1" /></g><g
        id="g691"
-       transform="translate(-19.999992,-240)"
+       transform="translate(-3.999992,-144)"
        inkscape:label="overview previous left backward"><title
          id="title685">carousel-arrow-previous</title><rect
          width="15.999988"
@@ -391,4 +405,158 @@
          d="m 50.999976,505 v 1 c 0,0.29687 -0.125,0.55859 -0.328125,0.74219 L 45.414038,512 l 5.257813,5.26172 0.03516,0.0312 c 0.179688,0.18359 0.292969,0.43359 0.292969,0.70703 v 1 h -1 c -0.277344,0 -0.527344,-0.10938 -0.707031,-0.29297 l -0.03516,-0.0312 L 42.585911,512 49.257788,505.32812 C 49.441382,505.12891 49.707007,505 49.999976,505 Z m 0,0"
          fill="#222222"
          id="path689"
-         style="fill:#241f31;fill-opacity:1" /></g></g></svg>
+         style="fill:#241f31;fill-opacity:1" /></g><g
+       id="g8"
+       inkscape:label="focus dash dock"
+       transform="translate(-80)"><title
+         id="title8">shell-focus-dash</title><rect
+         width="31.999998"
+         height="31.999998"
+         x="-243.99994"
+         y="119.99999"
+         id="rect4"
+         transform="rotate(-90)"
+         style="fill:none;stroke-width:1" /><path
+         id="rect5"
+         style="color:#000000;fill:#241f31;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2;-inkscape-stroke:none"
+         d="m 120,215 v 2 h 25 c 2.78729,0 5,2.21271 5,5 v 12 c 0,2.78729 -2.21271,5 -5,5 h -25 v 2 h 25 c 3.8607,0 7,-3.1393 7,-7 v -12 c 0,-3.8607 -3.1393,-7 -7,-7 z m 15,8 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z" /><path
+         id="rect9"
+         style="opacity:1;fill:#241f31;fill-opacity:0.2;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1"
+         d="m 120,219 v 18 h 5 c 1.662,0 3,-1.338 3,-3 v -12 c 0,-1.662 -1.338,-3 -3,-3 z" /></g><g
+       inkscape:label="focus applications grid overview"
+       transform="matrix(2,0,0,2,-304.01212,-764)"
+       id="g3941"
+       style="stroke-width:0.5"><title
+         id="title9844">shell-focus-app-grid</title><rect
+         id="rect3966"
+         width="16"
+         height="16"
+         x="192.00606"
+         y="488"
+         style="fill:none;stroke-width:0.5" /><path
+         id="rect3972"
+         d="m 196,491 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z"
+         style="fill:#241f31;fill-opacity:1;stroke-width:0.5" /></g><g
+       id="g19"
+       inkscape:label="focus management search"><title
+         id="title19">shell-focus-search</title><rect
+         width="31.999998"
+         height="31.999998"
+         x="-243.99994"
+         y="159.99998"
+         id="rect10"
+         transform="rotate(-90)"
+         style="fill:none;stroke-width:1" /><path
+         style="color:#000000;fill:#241f31;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2;-inkscape-stroke:none"
+         d="m 173.5,215 c -5.78714,0 -10.5,4.71286 -10.5,10.5 0,5.78714 4.71286,10.5 10.5,10.5 2.6227,0 4.95218,-1.06098 6.79492,-2.6582 -0.0231,0.12059 -0.0238,0.2444 -0.002,0.36523 l 6,6 c 0.2538,0.24699 0.6193,0.34134 0.96094,0.24805 0.73461,-0.2008 0.98418,-1.11626 0.45312,-1.66211 l -6,-6 c -0.12083,-0.0218 -0.24464,-0.0211 -0.36523,0.002 C 182.93902,230.45218 184,228.1227 184,225.5 184,219.71286 179.28714,215 173.5,215 Z m 0,2 c 4.70626,0 8.5,3.79374 8.5,8.5 0,4.70626 -3.79374,8.5 -8.5,8.5 -4.70626,0 -8.5,-3.79374 -8.5,-8.5 0,-4.70626 3.79374,-8.5 8.5,-8.5 z"
+         id="path11"
+         sodipodi:nodetypes="ssscccccccsssssss" /></g><g
+       id="g15"
+       transform="matrix(-1,0,0,1,163.99997,-248)"
+       inkscape:label="focus management top bar panel"><title
+         id="title15">shell-focus-top-bar</title><path
+         id="path15"
+         style="fill:#241f31;fill-opacity:1;stroke-width:1"
+         d="m 161.99997,463 c 2,0 2,1.71498 2,2 v 22 h -2 v -17 c 0,-1 -1,-1 -1,-1 h -29 v -6 z m -2,2 h -4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 h 4 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -7,0.25 c -0.41421,0 -0.75,0.33579 -0.75,0.75 0,0.41421 0.33579,0.75 0.75,0.75 0.41421,0 0.75,-0.33579 0.75,-0.75 0,-0.41421 -0.33579,-0.75 -0.75,-0.75 z"
+         sodipodi:nodetypes="scccccccsssssssssssss" /><rect
+         width="31.999998"
+         height="31.999998"
+         x="-491.99994"
+         y="-163.99998"
+         id="rect15"
+         transform="matrix(0,-1,-1,0,0,0)"
+         style="fill:none;stroke-width:1" /><path
+         id="path23"
+         style="fill:#241f31;fill-opacity:0.35;stroke-width:1"
+         d="m 152.99997,465 h -1 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 h 1 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z"
+         sodipodi:nodetypes="sssssss" /></g><g
+       id="g3"
+       transform="translate(68,-248)"
+       inkscape:label="focus desktop tasks screen "><title
+         id="title1">shell-focus-desktop</title><rect
+         width="31.999998"
+         height="31.999998"
+         x="-491.99994"
+         y="-163.99998"
+         id="rect1"
+         transform="matrix(0,-1,-1,0,0,0)"
+         style="fill:none;stroke-width:1" /><path
+         id="path3"
+         d="m 135,463 c -1.662,0 -3,1.338 -3,3 v 19 c 0,1.662 1.338,3 3,3 h 26 c 1.662,0 3,-1.338 3,-3 v -19 c 0,-1.662 -1.338,-3 -3,-3 z m 0,3 h 26 c 0.554,0 1,0.446 1,1 v 18 c 0,0.554 -0.446,1 -1,1 h -26 c -0.554,0 -1,-0.446 -1,-1 v -18 c 0,-0.554 0.446,-1 1,-1 z"
+         style="fill:#241f31;fill-opacity:1"
+         sodipodi:nodetypes="ssssssssssssssssss" /><path
+         id="rect6"
+         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
+         d="m 136.75,468 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
+         sodipodi:nodetypes="sssssssss" /><path
+         id="path4"
+         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
+         d="m 136.75,472 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
+         sodipodi:nodetypes="sssssssss" /><path
+         id="path5"
+         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
+         d="m 136.75,476 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
+         sodipodi:nodetypes="sssssssss" /></g><g
+       id="g17"
+       inkscape:label="focus dash dock"
+       transform="matrix(-1,0,0,1,191.99999,40)"><title
+         id="title16">shell-focus-dash-rtl</title><rect
+         width="31.999998"
+         height="31.999998"
+         x="-243.99994"
+         y="119.99999"
+         id="rect16"
+         transform="rotate(-90)"
+         style="fill:none;stroke-width:1" /><path
+         id="path16"
+         style="color:#000000;fill:#241f31;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2;-inkscape-stroke:none"
+         d="m 120,215 v 2 h 25 c 2.78729,0 5,2.21271 5,5 v 12 c 0,2.78729 -2.21271,5 -5,5 h -25 v 2 h 25 c 3.8607,0 7,-3.1393 7,-7 v -12 c 0,-3.8607 -3.1393,-7 -7,-7 z m 15,8 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z" /><path
+         id="path17"
+         style="opacity:1;fill:#241f31;fill-opacity:0.2;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1"
+         d="m 120,219 v 18 h 5 c 1.662,0 3,-1.338 3,-3 v -12 c 0,-1.662 -1.338,-3 -3,-3 z" /></g><g
+       id="g20"
+       transform="translate(-131.99998,-208)"
+       inkscape:label="focus management top bar panel"><title
+         id="title17">shell-focus-top-bar-rtl</title><path
+         id="path18"
+         style="fill:#241f31;fill-opacity:1;stroke-width:1"
+         d="m 161.99997,463 c 2,0 2,1.71498 2,2 v 22 h -2 v -17 c 0,-1 -1,-1 -1,-1 h -29 v -6 z m -2,2 h -4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 h 4 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -7,0.25 c -0.41421,0 -0.75,0.33579 -0.75,0.75 0,0.41421 0.33579,0.75 0.75,0.75 0.41421,0 0.75,-0.33579 0.75,-0.75 0,-0.41421 -0.33579,-0.75 -0.75,-0.75 z"
+         sodipodi:nodetypes="scccccccsssssssssssss" /><rect
+         width="31.999998"
+         height="31.999998"
+         x="-491.99994"
+         y="-163.99998"
+         id="rect18"
+         transform="matrix(0,-1,-1,0,0,0)"
+         style="fill:none;stroke-width:1" /><path
+         id="path19"
+         style="fill:#241f31;fill-opacity:0.35;stroke-width:1"
+         d="m 152.99997,465 h -1 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 h 1 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z"
+         sodipodi:nodetypes="sssssss" /></g><g
+       id="g10"
+       transform="translate(68,-208)"
+       inkscape:label="focus desktop tasks screen "><title
+         id="title7">shell-focus-desktop-rtl</title><rect
+         width="31.999998"
+         height="31.999998"
+         x="-491.99994"
+         y="-163.99998"
+         id="rect7"
+         transform="matrix(0,-1,-1,0,0,0)"
+         style="fill:none;stroke-width:1" /><path
+         id="path7"
+         d="m 135,463 c -1.662,0 -3,1.338 -3,3 v 19 c 0,1.662 1.338,3 3,3 h 26 c 1.662,0 3,-1.338 3,-3 v -19 c 0,-1.662 -1.338,-3 -3,-3 z m 0,3 h 26 c 0.554,0 1,0.446 1,1 v 18 c 0,0.554 -0.446,1 -1,1 h -26 c -0.554,0 -1,-0.446 -1,-1 v -18 c 0,-0.554 0.446,-1 1,-1 z"
+         style="fill:#241f31;fill-opacity:1"
+         sodipodi:nodetypes="ssssssssssssssssss" /><path
+         id="path8"
+         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
+         d="m 157.75,468 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
+         sodipodi:nodetypes="sssssssss" /><path
+         id="path9"
+         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
+         d="m 157.75,472 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
+         sodipodi:nodetypes="sssssssss" /><path
+         id="path10"
+         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
+         d="m 157.75,476 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
+         sodipodi:nodetypes="sssssssss" /></g></g></svg>
diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index 16becf19f..a802501b2 100644
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -23,7 +23,7 @@ export class CtrlAltTabManager {
         this._items = [];
         this.addGroup(global.window_group,
             _('Windows'),
-            'focus-windows-symbolic', {
+            'shell-focus-windows-symbolic', {
                 sortGroup: SortGroup.TOP,
                 focusCallback: this._focusWindows.bind(this),
             });
@@ -95,7 +95,7 @@ export class CtrlAltTabManager {
                 let icon = null;
                 let iconName = null;
                 if (windows[i].get_window_type() === Meta.WindowType.DESKTOP) {
-                    iconName = 'video-display-symbolic';
+                    iconName = 'shell-focus-desktop-symbolic';
                 } else {
                     let app = windowTracker.get_window_app(windows[i]);
                     if (app) {
diff --git a/js/ui/dash.js b/js/ui/dash.js
index 3cdc0b5af..dac2a99a7 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -407,7 +407,7 @@ export const Dash = GObject.registerClass({
 
         // Translators: this is the name of the dock/favorites area on
         // the bottom of the overview
-        Main.ctrlAltTabManager.addGroup(this, _('Dash'), 'user-bookmarks-symbolic');
+        Main.ctrlAltTabManager.addGroup(this, _('Dash'), 'shell-focus-dash-symbolic');
     }
 
     _onItemDragBegin() {
diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 29471ee6f..4eb6c92e6 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -398,7 +398,7 @@ class ControlsManager extends St.Widget {
         Main.ctrlAltTabManager.addGroup(
             this.appDisplay,
             _('Apps'),
-            'view-app-grid-symbolic', {
+            'shell-focus-app-grid-symbolic', {
                 proxy: this,
                 focusCallback: () => {
                     this.dash.showAppsButton.checked = true;
@@ -410,7 +410,7 @@ class ControlsManager extends St.Widget {
         Main.ctrlAltTabManager.addGroup(
             this._workspacesDisplay,
             _('Windows'),
-            'focus-windows-symbolic', {
+            'shell-focus-windows-symbolic', {
                 proxy: this,
                 focusCallback: () => {
                     this.dash.showAppsButton.checked = false;
diff --git a/js/ui/panel.js b/js/ui/panel.js
index a15290771..9f4313b54 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -679,7 +679,7 @@ class Panel extends St.Widget {
 
         Main.layoutManager.panelBox.add_child(this);
         Main.ctrlAltTabManager.addGroup(this,
-            _('Top Bar'), 'focus-top-bar-symbolic',
+            _('Top Bar'), 'shell-focus-top-bar-symbolic',
             {sortGroup: CtrlAltTab.SortGroup.TOP});
 
         Main.sessionMode.connect('updated', this._updatePanel.bind(this));
diff --git a/js/ui/searchController.js b/js/ui/searchController.js
index 53a8cb863..532a6d3ed 100644
--- a/js/ui/searchController.js
+++ b/js/ui/searchController.js
@@ -86,7 +86,7 @@ export const SearchController = GObject.registerClass({
 
         this._searchResults = new Search.SearchResultsView();
         this.add_child(this._searchResults);
-        Main.ctrlAltTabManager.addGroup(this._entry, _('Search'), 'edit-find-symbolic');
+        Main.ctrlAltTabManager.addGroup(this._entry, _('Search'), 'shell-focus-search-symbolic');
 
         // Since the entry isn't inside the results container we install this
         // dummy widget as the last results container child so that we can