From 0ae94e1652a4dfe435391a2609dab06f99d11f5f Mon Sep 17 00:00:00 2001
From: Matthew Oliveira <m4olivei@gmail.com>
Date: Tue, 4 Mar 2025 09:40:28 -0500
Subject: [PATCH] Issue #3510801: Updates to use the core icon API override
 mechanism

---
 dist/css/components/toolbar.css               |  87 --------------
 dist/css/layout/core_navigation.css           |  87 --------------
 dist/css/layout/navigation.css                |  87 --------------
 dist/media/sprite.svg                         | Bin 35362 -> 40472 bytes
 gin.icons.yml                                 |  36 ++++++
 ...vg => announcements-feed-announcement.svg} | Bin
 media/icons/navigation/burger.svg             | Bin 0 -> 150 bytes
 media/icons/navigation/chevron.svg            | Bin 0 -> 201 bytes
 media/icons/navigation/cross.svg              | Bin 0 -> 791 bytes
 .../database.svg                              | Bin
 media/icons/navigation/dots.svg               | Bin 0 -> 221 bytes
 ...ple-new.svg => entity-user-collection.svg} | Bin
 media/icons/{toolbar => navigation}/help.svg  | Bin
 .../{blocks.svg => navigation-blocks.svg}     | Bin
 media/icons/navigation/navigation-content.svg | Bin 0 -> 331 bytes
 .../{create.svg => navigation-create.svg}     | Bin
 .../{files.svg => navigation-files.svg}       | Bin
 .../{media.svg => navigation-media.svg}       | Bin
 .../navigation-user-links-user-wrapper.svg    | Bin 0 -> 541 bytes
 media/icons/navigation/shortcuts.svg          | Bin 0 -> 310 bytes
 .../icons/navigation/system-admin-config.svg  | Bin 0 -> 1022 bytes
 .../icons/navigation/system-admin-reports.svg | Bin 0 -> 325 bytes
 .../navigation/system-admin-structure.svg     | Bin 0 -> 587 bytes
 ...extend-new.svg => system-modules-list.svg} | Bin
 media/icons/navigation/system-themes-page.svg | Bin 0 -> 617 bytes
 .../{messages => navigation}/warning.svg      | Bin
 styles/helpers/_svg-sprite.scss               | 108 +++++++++++++-----
 styles/helpers/_toolbar-icons.scss            |  87 --------------
 styles/navigation/toolbar-link.scss           |   6 +-
 29 files changed, 116 insertions(+), 382 deletions(-)
 create mode 100644 gin.icons.yml
 rename media/icons/navigation/{announcement.svg => announcements-feed-announcement.svg} (100%)
 create mode 100644 media/icons/navigation/burger.svg
 create mode 100644 media/icons/navigation/chevron.svg
 create mode 100644 media/icons/navigation/cross.svg
 rename media/icons/{status-report => navigation}/database.svg (100%)
 create mode 100644 media/icons/navigation/dots.svg
 rename media/icons/navigation/{people-new.svg => entity-user-collection.svg} (100%)
 rename media/icons/{toolbar => navigation}/help.svg (100%)
 rename media/icons/navigation/{blocks.svg => navigation-blocks.svg} (100%)
 create mode 100644 media/icons/navigation/navigation-content.svg
 rename media/icons/navigation/{create.svg => navigation-create.svg} (100%)
 rename media/icons/navigation/{files.svg => navigation-files.svg} (100%)
 rename media/icons/navigation/{media.svg => navigation-media.svg} (100%)
 create mode 100644 media/icons/navigation/navigation-user-links-user-wrapper.svg
 create mode 100644 media/icons/navigation/shortcuts.svg
 create mode 100644 media/icons/navigation/system-admin-config.svg
 create mode 100644 media/icons/navigation/system-admin-reports.svg
 create mode 100644 media/icons/navigation/system-admin-structure.svg
 rename media/icons/navigation/{extend-new.svg => system-modules-list.svg} (100%)
 create mode 100644 media/icons/navigation/system-themes-page.svg
 rename media/icons/{messages => navigation}/warning.svg (100%)

diff --git a/dist/css/components/toolbar.css b/dist/css/components/toolbar.css
index 2841718c3..d66d6056d 100644
--- a/dist/css/components/toolbar.css
+++ b/dist/css/components/toolbar.css
@@ -199,62 +199,11 @@ body.gin--classic-toolbar {
   --icon: url("../../media/sprite.svg#tool-view");
 }
 
-.toolbar .toolbar-bar .toolbar-icon-system-themes-page::before,
-.toolbar .toolbar-bar .toolbar-link--system-themes-page::before,
-.toolbar .toolbar-bar .toolbar-button--icon--system-themes-page::before {
-  --icon: url("../../media/sprite.svg#appearance-view");
-}
-
-.toolbar .toolbar-bar .toolbar-link--blocks::before,
-.toolbar .toolbar-bar .toolbar-button--icon--navigation-blocks::before {
-  --icon: url("../../media/sprite.svg#blocks-view");
-}
-
 .toolbar .toolbar-bar .toolbar-link--bookmarks::before,
 .toolbar .toolbar-bar .toolbar-button--icon--bookmarks::before {
   --icon: url("../../media/sprite.svg#bookmarks-view");
 }
 
-.toolbar .toolbar-bar .toolbar-icon-shortcut::before,
-.toolbar .toolbar-bar .toolbar-button--icon--shortcuts::before {
-  --icon: url("../../media/sprite.svg#shortcut-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-system-admin-config::before,
-.toolbar .toolbar-bar .toolbar-link--system-admin-config::before,
-.toolbar .toolbar-bar .toolbar-button--icon--system-admin-config::before {
-  --icon: url("../../media/sprite.svg#config-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-system-admin-content::before,
-.toolbar .toolbar-bar .toolbar-link--content::before,
-.toolbar .toolbar-bar .toolbar-button--icon--navigation-content::before {
-  --icon: url("../../media/sprite.svg#content-view");
-}
-
-.toolbar .toolbar-bar .toolbar-link--create::before,
-.toolbar .toolbar-bar .toolbar-button--icon--navigation-create::before {
-  --icon: url("../../media/sprite.svg#create-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-system-modules-list::before,
-.toolbar .toolbar-bar .toolbar-link--system-modules-list::before,
-.toolbar .toolbar-bar .toolbar-button--icon--system-modules-list::before {
-  --icon: url("../../media/sprite.svg#extend-new-view");
-}
-
-.toolbar .toolbar-bar .toolbar-link--files::before,
-.toolbar .toolbar-bar .toolbar-button--icon--navigation-files::before {
-  --icon: url("../../media/sprite.svg#files-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-help-main::before,
-.toolbar .toolbar-bar .toolbar-icon-help::before,
-.toolbar .toolbar-bar .toolbar-link--help::before,
-.toolbar .toolbar-bar .toolbar-button--icon--help::before {
-  --icon: url("../../media/sprite.svg#help-view");
-}
-
 .toolbar .toolbar-bar .toolbar-icon-commerce-admin-commerce::before,
 .toolbar .toolbar-bar .toolbar-link--commerce-admin-commerce::before,
 .toolbar .toolbar-bar .toolbar-button--icon--commerce-admin-commerce::before,
@@ -264,29 +213,6 @@ body.gin--classic-toolbar {
   --icon: url("../../media/sprite.svg#commerce-view");
 }
 
-.toolbar .toolbar-bar .toolbar-link--media::before,
-.toolbar .toolbar-bar .toolbar-button--icon--navigation-media::before {
-  --icon: url("../../media/sprite.svg#media-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-entity-user-collection::before,
-.toolbar .toolbar-bar .toolbar-link--entity-user-collection::before,
-.toolbar .toolbar-bar .toolbar-button--icon--entity-user-collection::before {
-  --icon: url("../../media/sprite.svg#people-new-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-system-admin-reports::before,
-.toolbar .toolbar-bar .toolbar-link--system-admin-reports::before,
-.toolbar .toolbar-bar .toolbar-button--icon--system-admin-reports::before {
-  --icon: url("../../media/sprite.svg#reports-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-system-admin-structure::before,
-.toolbar .toolbar-bar .toolbar-link--system-admin-structure::before,
-.toolbar .toolbar-bar .toolbar-button--icon--system-admin-structure::before {
-  --icon: url("../../media/sprite.svg#structure-view");
-}
-
 .toolbar .toolbar-bar .toolbar-icon-entity-webform-collection::before,
 .toolbar .toolbar-bar .toolbar-link--entity-webform-collection::before,
 .toolbar .toolbar-bar .toolbar-button--icon--entity-webform-collection::before {
@@ -300,19 +226,6 @@ body.gin--classic-toolbar {
   --icon: url("../../media/sprite.svg#chevron-down-view");
 }
 
-.toolbar .toolbar-bar .toolbar-icon-user::before,
-.toolbar .toolbar-bar .toolbar-link--user::before,
-.toolbar .toolbar-bar .toolbar-button--icon--user::before {
-  --icon: url("../../media/sprite.svg#user-view");
-}
-
-.toolbar .toolbar-bar .toolbar-icon-announcements-feed-announcement::before,
-.toolbar .toolbar-bar .toolbar-icon-announce::before,
-.toolbar .toolbar-bar .toolbar-link--announcements-feed-announcement::before,
-.toolbar .toolbar-bar .toolbar-button--icon--announcements-feed-announcement::before {
-  --icon: url("../../media/sprite.svg#announcement-view");
-}
-
 .toolbar .toolbar-bar .toolbar-icon-system-admin-group::before,
 .toolbar .toolbar-bar .toolbar-link--system-admin-group::before,
 .toolbar .toolbar-bar .toolbar-button--icon--system-admin-group::before {
diff --git a/dist/css/layout/core_navigation.css b/dist/css/layout/core_navigation.css
index 4e2e204e6..07aad2575 100644
--- a/dist/css/layout/core_navigation.css
+++ b/dist/css/layout/core_navigation.css
@@ -241,62 +241,11 @@ body.gin--core-navigation {
   --icon: url("../../media/sprite.svg#tool-view");
 }
 
-.toolbar-icon-system-themes-page::before,
-.toolbar-link--system-themes-page::before,
-.toolbar-button--icon--system-themes-page::before {
-  --icon: url("../../media/sprite.svg#appearance-view");
-}
-
-.toolbar-link--blocks::before,
-.toolbar-button--icon--navigation-blocks::before {
-  --icon: url("../../media/sprite.svg#blocks-view");
-}
-
 .toolbar-link--bookmarks::before,
 .toolbar-button--icon--bookmarks::before {
   --icon: url("../../media/sprite.svg#bookmarks-view");
 }
 
-.toolbar-icon-shortcut::before,
-.toolbar-button--icon--shortcuts::before {
-  --icon: url("../../media/sprite.svg#shortcut-view");
-}
-
-.toolbar-icon-system-admin-config::before,
-.toolbar-link--system-admin-config::before,
-.toolbar-button--icon--system-admin-config::before {
-  --icon: url("../../media/sprite.svg#config-view");
-}
-
-.toolbar-icon-system-admin-content::before,
-.toolbar-link--content::before,
-.toolbar-button--icon--navigation-content::before {
-  --icon: url("../../media/sprite.svg#content-view");
-}
-
-.toolbar-link--create::before,
-.toolbar-button--icon--navigation-create::before {
-  --icon: url("../../media/sprite.svg#create-view");
-}
-
-.toolbar-icon-system-modules-list::before,
-.toolbar-link--system-modules-list::before,
-.toolbar-button--icon--system-modules-list::before {
-  --icon: url("../../media/sprite.svg#extend-new-view");
-}
-
-.toolbar-link--files::before,
-.toolbar-button--icon--navigation-files::before {
-  --icon: url("../../media/sprite.svg#files-view");
-}
-
-.toolbar-icon-help-main::before,
-.toolbar-icon-help::before,
-.toolbar-link--help::before,
-.toolbar-button--icon--help::before {
-  --icon: url("../../media/sprite.svg#help-view");
-}
-
 .toolbar-icon-commerce-admin-commerce::before,
 .toolbar-link--commerce-admin-commerce::before,
 .toolbar-button--icon--commerce-admin-commerce::before,
@@ -306,29 +255,6 @@ body.gin--core-navigation {
   --icon: url("../../media/sprite.svg#commerce-view");
 }
 
-.toolbar-link--media::before,
-.toolbar-button--icon--navigation-media::before {
-  --icon: url("../../media/sprite.svg#media-view");
-}
-
-.toolbar-icon-entity-user-collection::before,
-.toolbar-link--entity-user-collection::before,
-.toolbar-button--icon--entity-user-collection::before {
-  --icon: url("../../media/sprite.svg#people-new-view");
-}
-
-.toolbar-icon-system-admin-reports::before,
-.toolbar-link--system-admin-reports::before,
-.toolbar-button--icon--system-admin-reports::before {
-  --icon: url("../../media/sprite.svg#reports-view");
-}
-
-.toolbar-icon-system-admin-structure::before,
-.toolbar-link--system-admin-structure::before,
-.toolbar-button--icon--system-admin-structure::before {
-  --icon: url("../../media/sprite.svg#structure-view");
-}
-
 .toolbar-icon-entity-webform-collection::before,
 .toolbar-link--entity-webform-collection::before,
 .toolbar-button--icon--entity-webform-collection::before {
@@ -342,19 +268,6 @@ body.gin--core-navigation {
   --icon: url("../../media/sprite.svg#chevron-down-view");
 }
 
-.toolbar-icon-user::before,
-.toolbar-link--user::before,
-.toolbar-button--icon--user::before {
-  --icon: url("../../media/sprite.svg#user-view");
-}
-
-.toolbar-icon-announcements-feed-announcement::before,
-.toolbar-icon-announce::before,
-.toolbar-link--announcements-feed-announcement::before,
-.toolbar-button--icon--announcements-feed-announcement::before {
-  --icon: url("../../media/sprite.svg#announcement-view");
-}
-
 .toolbar-icon-system-admin-group::before,
 .toolbar-link--system-admin-group::before,
 .toolbar-button--icon--system-admin-group::before {
diff --git a/dist/css/layout/navigation.css b/dist/css/layout/navigation.css
index 476a766b5..79da438f3 100644
--- a/dist/css/layout/navigation.css
+++ b/dist/css/layout/navigation.css
@@ -1152,62 +1152,11 @@ button.toolbar-link--sidebar-toggle[aria-expanded=true]::before {
   --icon: url("../../media/sprite.svg#tool-view");
 }
 
-.toolbar-icon-system-themes-page::before,
-.toolbar-link--system-themes-page::before,
-.toolbar-button--icon--system-themes-page::before {
-  --icon: url("../../media/sprite.svg#appearance-view");
-}
-
-.toolbar-link--blocks::before,
-.toolbar-button--icon--navigation-blocks::before {
-  --icon: url("../../media/sprite.svg#blocks-view");
-}
-
 .toolbar-link--bookmarks::before,
 .toolbar-button--icon--bookmarks::before {
   --icon: url("../../media/sprite.svg#bookmarks-view");
 }
 
-.toolbar-icon-shortcut::before,
-.toolbar-button--icon--shortcuts::before {
-  --icon: url("../../media/sprite.svg#shortcut-view");
-}
-
-.toolbar-icon-system-admin-config::before,
-.toolbar-link--system-admin-config::before,
-.toolbar-button--icon--system-admin-config::before {
-  --icon: url("../../media/sprite.svg#config-view");
-}
-
-.toolbar-icon-system-admin-content::before,
-.toolbar-link--content::before,
-.toolbar-button--icon--navigation-content::before {
-  --icon: url("../../media/sprite.svg#content-view");
-}
-
-.toolbar-link--create::before,
-.toolbar-button--icon--navigation-create::before {
-  --icon: url("../../media/sprite.svg#create-view");
-}
-
-.toolbar-icon-system-modules-list::before,
-.toolbar-link--system-modules-list::before,
-.toolbar-button--icon--system-modules-list::before {
-  --icon: url("../../media/sprite.svg#extend-new-view");
-}
-
-.toolbar-link--files::before,
-.toolbar-button--icon--navigation-files::before {
-  --icon: url("../../media/sprite.svg#files-view");
-}
-
-.toolbar-icon-help-main::before,
-.toolbar-icon-help::before,
-.toolbar-link--help::before,
-.toolbar-button--icon--help::before {
-  --icon: url("../../media/sprite.svg#help-view");
-}
-
 .toolbar-icon-commerce-admin-commerce::before,
 .toolbar-link--commerce-admin-commerce::before,
 .toolbar-button--icon--commerce-admin-commerce::before,
@@ -1217,29 +1166,6 @@ button.toolbar-link--sidebar-toggle[aria-expanded=true]::before {
   --icon: url("../../media/sprite.svg#commerce-view");
 }
 
-.toolbar-link--media::before,
-.toolbar-button--icon--navigation-media::before {
-  --icon: url("../../media/sprite.svg#media-view");
-}
-
-.toolbar-icon-entity-user-collection::before,
-.toolbar-link--entity-user-collection::before,
-.toolbar-button--icon--entity-user-collection::before {
-  --icon: url("../../media/sprite.svg#people-new-view");
-}
-
-.toolbar-icon-system-admin-reports::before,
-.toolbar-link--system-admin-reports::before,
-.toolbar-button--icon--system-admin-reports::before {
-  --icon: url("../../media/sprite.svg#reports-view");
-}
-
-.toolbar-icon-system-admin-structure::before,
-.toolbar-link--system-admin-structure::before,
-.toolbar-button--icon--system-admin-structure::before {
-  --icon: url("../../media/sprite.svg#structure-view");
-}
-
 .toolbar-icon-entity-webform-collection::before,
 .toolbar-link--entity-webform-collection::before,
 .toolbar-button--icon--entity-webform-collection::before {
@@ -1253,19 +1179,6 @@ button.toolbar-link--sidebar-toggle[aria-expanded=true]::before {
   --icon: url("../../media/sprite.svg#chevron-down-view");
 }
 
-.toolbar-icon-user::before,
-.toolbar-link--user::before,
-.toolbar-button--icon--user::before {
-  --icon: url("../../media/sprite.svg#user-view");
-}
-
-.toolbar-icon-announcements-feed-announcement::before,
-.toolbar-icon-announce::before,
-.toolbar-link--announcements-feed-announcement::before,
-.toolbar-button--icon--announcements-feed-announcement::before {
-  --icon: url("../../media/sprite.svg#announcement-view");
-}
-
 .toolbar-icon-system-admin-group::before,
 .toolbar-link--system-admin-group::before,
 .toolbar-button--icon--system-admin-group::before {
diff --git a/dist/media/sprite.svg b/dist/media/sprite.svg
index f02c203381188516222d7545e443bb50ab37633a..60db95846b65a07f5fc94b3e3a7ba365a9ebe70b 100644
GIT binary patch
delta 3003
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

delta 1514
zcmYL}ZA@Eb6vuO)d#k9p4B2{nDWgzZP#InC?c2QyNN4z<Bff2m#wD^+E?c+00Bv9p
z!sG*iWds;!Y}T<%w@+r#OmB?FOqVV3CDW*UGEp%jGZ-_YF_|BHN%WlOX*6k?^YT3B
zf6jS+?aP<h`IGFD+IFG!MG2Cj7TDdZK{@1shuZ$B@;8ok_~TX_Uef|_FjNgQp;~Cy
zJ<i*qU5q6Rcxx~S0bPY-5zUn?qz@NiD0$3zud|Ka+sA!gArXa|U=Tt{kDQ1`;p&#H
z&Tjp8Ny55&gOHEZqqXjH!({YJ$%0q4AQWRhv{F58S9;h^m0+<U;B-CquC$4}Hm_>x
zqOY!Qk4!d}h56Y#l(xJ*3RB(pJBOaX$!hE)B|G0wF>xtMJ>T_T6oy>2vKbBYrY5jb
z^*|<T7sc5)wXIM9R-eLSao)QtXZL4PsL<qeJbsN;b5~q2X&{XU+D0-YN#8pQM>_oB
zM$@Dr?;f-ZgISw5d7{DZT(b7D&Hu-E9ShEB&9Jt7C(GN^AhUGZ1x)vTE?W^X_1J!u
z+cfp-`>!*6BzlZ9DYtCJ`8aSrb(vWvU;UeX7&dwPu-5k>3y1mYuccKf3^#l#{FeTK
zg(H0TfA@RHL_z0+ctT<^5)6XZ^pZ)Bx7}7G7B;!ya|3QUY>NF&4?H4CI&2O$!;c3v
zSr12HJyYjwJ2)vZ-QbG8tP4KLsN~X%Kb=+J&&(>*V<_DMw+~?^#%HBW%i&d7Pmp{w
zG-WZBfE$@Q*pvN*8DXwY<?^}vWCI7HO<c*l;B4+wW*B_zxx8043^DeV{1=h|SGTvo
zI|VPp;5v@|Q{iLTK#r5;AbdUOW=4XGyM}Hnx>4c2X}DfE$>DWbj|k|WD5?tDV(#&x
zBw<ESexc;UOa=3AOIs*|BOvJNNPycUymw>+Pgz2_e^kW;=N;yrta4UHBX}#SLsz*O
za^qD?V;%)vfjAwo#_pj5#4;VwFk3<R+;~4_IJwX|;l_-h)_Gy#7G*f1kejUMHok##
zep15ciE-vWJGxcYW1KeUkE0JuiXN-*wr{FVI0V4_)b}!;6Ud#M#_nQ*Ip?Ek165*z
zI^PU-7OP<Q%*=+Y<0;xi@2s2QI0&9IKfBB@F3{U`+{0~xed72{MUQj%0x&a&>g166
z`*S-{BQE$0%;Q7E1%R+;{wson0PI=tDtZD5q#FzEmPCJ7r2T7$N+wPI(t-;MC5XKs
zys@~A+o>K6HWt6Z%Sc{LcMIG)(I^}OEU@&QtfLzJ)*b-Ag0^5F4bS2nrr>UE8CPNo
z@SIJj9>o2ch+Z@Fp2nXAE(8&9mQG*9{hFM<M={FLbIN7fx>;fGuUBw7a%hUyGfmho
nGDG5}l?DZEA%1a1ql^IX=d)TZ+R;XXKK>n@?K_Gi2Ri=+o-*$G

diff --git a/gin.icons.yml b/gin.icons.yml
new file mode 100644
index 000000000..bef337f36
--- /dev/null
+++ b/gin.icons.yml
@@ -0,0 +1,36 @@
+navigation:
+  enabled: true
+  label: "Drupal Navigation Gin Overrides"
+  description: "Gin overrides for Core Navigation module icon pack."
+  version: 11.x
+  license:
+    name: GPL2-or-later
+    url: https://api.drupal.org/api/drupal/core%21LICENSE.txt/11.x
+    gpl-compatible: true
+  extractor: svg
+  config:
+    sources:
+      - media/icons/navigation/*.svg
+  settings:
+    size:
+      title: "Size"
+      description: "Set a size for this icon."
+      type: "integer"
+      default: 24
+    class:
+      title: "Class"
+      description: "Set a class for this icon."
+      type: "string"
+      default: ""
+  template: >
+    <svg
+      {{ attributes
+          .setAttribute('viewBox', attributes.viewBox|default('0 0 24 24'))
+          .setAttribute('class', class)
+          .setAttribute('width', size|default('20'))
+          .setAttribute('height', size|default('20'))
+          .setAttribute('aria-hidden', 'true')
+      }}
+    >
+      {{ content }}
+    </svg>
diff --git a/media/icons/navigation/announcement.svg b/media/icons/navigation/announcements-feed-announcement.svg
similarity index 100%
rename from media/icons/navigation/announcement.svg
rename to media/icons/navigation/announcements-feed-announcement.svg
diff --git a/media/icons/navigation/burger.svg b/media/icons/navigation/burger.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1b447e7f203d9ceac00561da373617aad2b37864
GIT binary patch
literal 150
zcmXZVK@P$o6a>(HPx13zTc8zf44*~!9>Szph!mPaN{=r_S1*~&WK`N`I2Iogq0M={
zGgeAzOW($AW*z68)ds@Lc~2N(FbKOdWsC<Q2M%HYaY5YxsP&mGq`bwqAv{SbuX4nH
da4v4jmas#Z2p@H4#ZbBZ5PcPyZq)Zqe*lemD?$JO

literal 0
HcmV?d00001

diff --git a/media/icons/navigation/chevron.svg b/media/icons/navigation/chevron.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7b4bf7433e13ae02c6b815440292c2f5e8ee635f
GIT binary patch
literal 201
zcmY+8!485j5Jc~MMbq=r?iLEwlqP!CAMi$^0TUD=g!1`rJs8c*W-o7c*3WAvw#V?C
z8`&?*wAVVusA8eUSEmgkY9^#u@3(jyw??8sVQiH~hD-=QwM#FqjXaYpRk;HyDqchG
w5FEB-fQ>B5sb-(ZGGiRLT3G^{;4ekMO4RU4AAZvCcm5)S*Qq&VK0O$+H_do3@&Et;

literal 0
HcmV?d00001

diff --git a/media/icons/navigation/cross.svg b/media/icons/navigation/cross.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c27abcbdcbca7f6de78d005c5e21bd10847477c9
GIT binary patch
literal 791
zcmYjP%WlFz47~FdtL-@(d$Z4qaOj!-KyNLjfD{M<MELyL>m(pW*@x|!*|C?``%Yc@
zZrkd^ai`Ve*qyGe-rsKL_qra2!3>S*FT2_TKuyV7{T;fl)u;Zn)eEKWhwbpwKUxh6
zl;uya=z4knzU{}<H}8G$ADpe!Z>v8s7@Ja~(3u=CZVbkN{IkYJZyfrvhTxDujdd9-
z136{mQq0vHtmZ<Bk5!f7GESj9DpWwBQpErzS^(Av3ehw+VONO`t9S*w5nNl)8QA5_
zfJ8#rK;p}u&>>Cm#0FX5Ar=D4=4V-1$`ynnbKc7X>F9EKo)f8z&#4q%Cley3s7P&N
zB4V`48)#B9ifm>UE+XclRv75SdLwIOvGJ9}6_zn2yh^pN7(t#qN){OI30vv}?`aAI
zc2y+jPE0M{S}#4GjHO;pi0r|%Cy^8O6I$G0fzpsNBlyx4;U5QuEtn^T{Nz@N3+u7l
XWMz>C(r%1jGO#sI>}s*(Az%Fi738S)

literal 0
HcmV?d00001

diff --git a/media/icons/status-report/database.svg b/media/icons/navigation/database.svg
similarity index 100%
rename from media/icons/status-report/database.svg
rename to media/icons/navigation/database.svg
diff --git a/media/icons/navigation/dots.svg b/media/icons/navigation/dots.svg
new file mode 100644
index 0000000000000000000000000000000000000000..82778cff3dc0296c9b7e6875f076936d0828a0f4
GIT binary patch
literal 221
zcmZXO%?^Sv49D+0MYFrCtwN01cJS^Ca3j%xi3pK}@%Xlr1Bpq$|GzeM^U}dOyxy}n
zeT>t^+LTh6j^+62EF+>7!oc!;r0ckPgMh$Qt!_dA;HEbAk^%1C+~|Zrd~S&)2}wW)
oVli#=B+s;N234wh$KoHW*D@;w@gDsNThynv<;H*wh10LY7q4P5SpWb4

literal 0
HcmV?d00001

diff --git a/media/icons/navigation/people-new.svg b/media/icons/navigation/entity-user-collection.svg
similarity index 100%
rename from media/icons/navigation/people-new.svg
rename to media/icons/navigation/entity-user-collection.svg
diff --git a/media/icons/toolbar/help.svg b/media/icons/navigation/help.svg
similarity index 100%
rename from media/icons/toolbar/help.svg
rename to media/icons/navigation/help.svg
diff --git a/media/icons/navigation/blocks.svg b/media/icons/navigation/navigation-blocks.svg
similarity index 100%
rename from media/icons/navigation/blocks.svg
rename to media/icons/navigation/navigation-blocks.svg
diff --git a/media/icons/navigation/navigation-content.svg b/media/icons/navigation/navigation-content.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2f135f096261e072c092b947c059aff1b2ba275f
GIT binary patch
literal 331
zcmY+AF>k{l5QTUDiqq{ja7in*G9KC`OV{j{O>J5V7A7Xiug^JE+C<!dzB}G~M?EhC
zEY{?=aMUP40&Tevjz7-N8po8TS0QrFRo+w~4uYhVf?r`%0Mr9~TIV$S;0?l@V)!;1
zyF-k|r}yAOywNh-K8+fwqNhLRtT$adX^i3E`v?3LtiSQqip{1rjnHfSP#d7#b4x%R
zm`};KMcn~z(5UEt0;r_@%Nd(mtSa|{zY9D@URfEYwzKJ^u~MA)>dUfwC3hqd#C3l$
LG)29BM^jt?P6}WH

literal 0
HcmV?d00001

diff --git a/media/icons/navigation/create.svg b/media/icons/navigation/navigation-create.svg
similarity index 100%
rename from media/icons/navigation/create.svg
rename to media/icons/navigation/navigation-create.svg
diff --git a/media/icons/navigation/files.svg b/media/icons/navigation/navigation-files.svg
similarity index 100%
rename from media/icons/navigation/files.svg
rename to media/icons/navigation/navigation-files.svg
diff --git a/media/icons/navigation/media.svg b/media/icons/navigation/navigation-media.svg
similarity index 100%
rename from media/icons/navigation/media.svg
rename to media/icons/navigation/navigation-media.svg
diff --git a/media/icons/navigation/navigation-user-links-user-wrapper.svg b/media/icons/navigation/navigation-user-links-user-wrapper.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ee1d30bf9ad37210095eecddb7f2c6fab388d8c0
GIT binary patch
literal 541
zcmZuu!EVDK488X&Ebb$ilmw=b!#MBS!){fZrP(s5lC<gP&!nN#rXd9OdwzacRO7XU
zYuC&#;bxft0dh;5!R@Q}qh+UQIzMOGJkNa2c^KME3L!F5v3dhgwea5cy=6Z5hQT-u
z;j^*qa2bZiPcHOfNa)kt9jB9Jl1uf#`p!3p{n@f1T>SAD{1G~z@MuM5=lyhoqh+rs
z0dt32E`>n~0SiD}vjU8xyx^q~n((zs0jZQTE3802N;E0-qd}^OZKKZ{gY54E6b%7V
z?9lL>mRoWxfl|y%vLfF&C<P7`M_t_CXcnvl(na#F-bwL~g^czto|=nN(U|MK5Fn$e
mky~9-2tO=E(jg=+-4O<KsRu?;;+BSK$|`H?O%*@5-h2a8y@4VC

literal 0
HcmV?d00001

diff --git a/media/icons/navigation/shortcuts.svg b/media/icons/navigation/shortcuts.svg
new file mode 100644
index 0000000000000000000000000000000000000000..17a0659bf2e259cd37d4f1c08e17040765f56958
GIT binary patch
literal 310
zcmY+A(N4oK3`O7j6;|GH64TNaHGP0DL0iZIA+FMF8GlbYRwShRbbRe=ds;6Ju3sUp
zMx1h9o~10MV0lDNPLfheR)>I#x8;SeMkr7~ZIzfCfXTtT55b7Y(F#~|;!kVD;hd6<
z`IQ5wojw$Q%qJrVsrzHWM|*f%j7WTr$A9>PecbsLRl^nz-;N_JwUq0^nt(ues74r&
zo`48Oq#krti@F6ppdNrUs_LuivG1Y7q4wR_?z{I5IO^X?+hj3M@}77*Rl2#Ewr|YM
E4^d@SnE(I)

literal 0
HcmV?d00001

diff --git a/media/icons/navigation/system-admin-config.svg b/media/icons/navigation/system-admin-config.svg
new file mode 100644
index 0000000000000000000000000000000000000000..af066324b60860727fb9c9278019b5559fe503d3
GIT binary patch
literal 1022
zcmZvb&2ED*5QOh}ik0s+wh2*E;Ye*Sx%8SlA~euaj0l0WPv2cbfDj~p<Q1OzcD#g_
z<_t}iv~Tuim;?!WjTeL4PhMOMOY6FP@w~QeMe7S&ojon3^l%s3uK>a`d}euWSYeBV
z!KJS3cVbw4t*WG`-)(NIdzH7@sZI^kLI*=F&x$0DO2aC9Elv;RFPjzjI$5DvoK<n2
z^p1}nM8Rzt#aaDpm{4dDV?#>g8w>QV4D;DO^g5MZvW)5!PKJG`omhhkA|*BfxCezH
zLHIr{w>lScgIA<MySk#N#MZ}UU*K*jbB>?UJ(uDn!#lkP53bN5P)DssbxyJqX|5a8
z+`Z26c0k~ZR_Nqd9;kcBQ5vKxQF}|!)V~AoG8u!xVxYJ>_*3SdnsQU1xlWgm*J1;^
zC*r%$7~jx+k2qoOlSbx+oZWGu+~LUt5SW6VFcale7<7Zob2{vXHqJ9}PIRI}dLwg(
zIFatgWjK-9LH2X8)yD;MXMLEChtnO*sD+fqW6tf`1@%W`Pm}I`S?|1Gh4csSSO55#
B;;8@t

literal 0
HcmV?d00001

diff --git a/media/icons/navigation/system-admin-reports.svg b/media/icons/navigation/system-admin-reports.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8a968dac8cf966665fe43f84b56e7eed745547a7
GIT binary patch
literal 325
zcmY+A-EP7#42AFe6qfJFj~P-oC6(B&_YhT^wHYC)($FxTo|Fj$vgM0U_BlsZ^D@9<
zP5umLjRFMFTWN&z(fL{9n9}sYdCr;TEemnrB!uAQ3Y!W*4e(=~)98aY2y=?zU^I58
z7>!R~!G(CIn{4|uY9vOx2Xoe&uAMZ-aPs{N{tedO`D#_nrZ$bxYy2k3NP^t4`h712
zlrE!G4aDj#Hj1yS&sYB`UvsT&6Q;Ja=}#k*CDu)xK+;3@CQU$#6qjdV#fPR+>m!=#
E3YcYI8vp<R

literal 0
HcmV?d00001

diff --git a/media/icons/navigation/system-admin-structure.svg b/media/icons/navigation/system-admin-structure.svg
new file mode 100644
index 0000000000000000000000000000000000000000..052a425272ebdcfcdb9e2492b782c14eb3483928
GIT binary patch
literal 587
zcmZ{i%Wi`(5JmU-ijns*9`j6vSu|Vv1KmYH!6~&7aYFj{wF%EfB{t{kdd`eQdVAFH
zkk#<6pMo%8zytdcc>c8NCP-sU_vU%SFwnuLy01OX81w8ak{tlj8op%P3Zk^C2;5As
zzbiqCd*4^eoOP@FIXw=tG>ssf@^HyosjA}A3DWDkDtGZ!OEu?CWo6yPG?Q;{a624z
zcPXU#6@;P{l!AO9rzf5O(jbZOY{?HIhnQd#0wRq<pKqDP4qZD(8bU<F+_uKlGWw_U
z@(5{yi4V)rl}F{Po^w8r*{<?Qz}ucQ?rMw37hO!*P8U;ur(1c{z3ML=^8d!i>pgC<
bt-$i`o((&}RG$QP&ZJ1aIy<E9cgPNZrD~Aj

literal 0
HcmV?d00001

diff --git a/media/icons/navigation/extend-new.svg b/media/icons/navigation/system-modules-list.svg
similarity index 100%
rename from media/icons/navigation/extend-new.svg
rename to media/icons/navigation/system-modules-list.svg
diff --git a/media/icons/navigation/system-themes-page.svg b/media/icons/navigation/system-themes-page.svg
new file mode 100644
index 0000000000000000000000000000000000000000..51ebed9b1e170dc5d592a59a8ce19f28dbc4e904
GIT binary patch
literal 617
zcmZ8fO;dv~5WV+T?Bwo}4fz14=|L_Y^xAu;ML>~sXe{;LyAjY)hM7&?zJ2fQ!1i)&
z;M&#GL%4Y%L4wl!3b?)Z!^Mj>#`AraP1A%^j$v#vC8f-GO6)cO+Xh~`zV~7XLoMJE
z$M9Brar_v^dWco%!?>b%Q+JB37Ydd6!TN5fkB74tWB3?Of8f{94J)3k*zA0WEu6e~
zF2SKQPc&Bn*+LlWV_X9LjgUg#h4bOq#ZNDgeiJOIBya466Ts~`;nE-y(AHhkMlUq-
z-0JlchEr&i&X)OJp)}4_j1XEPtAGkLMsek>`SM*KZDmkv=N6b73){e~uqTO>>%@~X
zHyTJ`PGHekD)^>R6@`KV%k%&lRHXEtN-UJCR#*{|H3Te{YaUl=F_xMS73FA+EmxSm
qS3Z-zmG+BpMGke&hO04eRhBksrC4d*Iq$zOvdx;^W}AMN-R29U>YJbd

literal 0
HcmV?d00001

diff --git a/media/icons/messages/warning.svg b/media/icons/navigation/warning.svg
similarity index 100%
rename from media/icons/messages/warning.svg
rename to media/icons/navigation/warning.svg
diff --git a/styles/helpers/_svg-sprite.scss b/styles/helpers/_svg-sprite.scss
index f8b6131cf..52587db00 100644
--- a/styles/helpers/_svg-sprite.scss
+++ b/styles/helpers/_svg-sprite.scss
@@ -27,23 +27,34 @@ $sprites: (
     'info': "../../media/sprite.svg#info-view",
     'question': "../../media/sprite.svg#question-view",
     'status': "../../media/sprite.svg#status-view",
-    'warning': "../../media/sprite.svg#warning-view",
-    'announcement': "../../media/sprite.svg#announcement-view",
+    'announcements-feed-announcement': "../../media/sprite.svg#announcements-feed-announcement-view",
     'block': "../../media/sprite.svg#block-view",
-    'blocks': "../../media/sprite.svg#blocks-view",
     'bookmarks': "../../media/sprite.svg#bookmarks-view",
+    'burger': "../../media/sprite.svg#burger-view",
     'chevron-down': "../../media/sprite.svg#chevron-down-view",
-    'create': "../../media/sprite.svg#create-view",
-    'extend-new': "../../media/sprite.svg#extend-new-view",
-    'files': "../../media/sprite.svg#files-view",
-    'media': "../../media/sprite.svg#media-view",
-    'people-new': "../../media/sprite.svg#people-new-view",
+    'chevron': "../../media/sprite.svg#chevron-view",
+    'database': "../../media/sprite.svg#database-view",
+    'dots': "../../media/sprite.svg#dots-view",
+    'entity-user-collection': "../../media/sprite.svg#entity-user-collection-view",
+    'help': "../../media/sprite.svg#help-view",
+    'navigation-blocks': "../../media/sprite.svg#navigation-blocks-view",
+    'navigation-content': "../../media/sprite.svg#navigation-content-view",
+    'navigation-create': "../../media/sprite.svg#navigation-create-view",
+    'navigation-files': "../../media/sprite.svg#navigation-files-view",
+    'navigation-media': "../../media/sprite.svg#navigation-media-view",
+    'navigation-user-links-user-wrapper': "../../media/sprite.svg#navigation-user-links-user-wrapper-view",
+    'shortcuts': "../../media/sprite.svg#shortcuts-view",
+    'system-admin-config': "../../media/sprite.svg#system-admin-config-view",
+    'system-admin-reports': "../../media/sprite.svg#system-admin-reports-view",
+    'system-admin-structure': "../../media/sprite.svg#system-admin-structure-view",
+    'system-modules-list': "../../media/sprite.svg#system-modules-list-view",
+    'system-themes-page': "../../media/sprite.svg#system-themes-page-view",
+    'warning': "../../media/sprite.svg#warning-view",
     'first': "../../media/sprite.svg#first-view",
     'last': "../../media/sprite.svg#last-view",
     'next': "../../media/sprite.svg#next-view",
     'prev': "../../media/sprite.svg#prev-view",
     'clock': "../../media/sprite.svg#clock-view",
-    'database': "../../media/sprite.svg#database-view",
     'php': "../../media/sprite.svg#php-view",
     'server': "../../media/sprite.svg#server-view",
     'drag-dots': "../../media/sprite.svg#drag-dots-view",
@@ -71,7 +82,6 @@ $sprites: (
     'fallback': "../../media/sprite.svg#fallback-view",
     'group': "../../media/sprite.svg#group-view",
     'hamburger': "../../media/sprite.svg#hamburger-view",
-    'help': "../../media/sprite.svg#help-view",
     'local-tasks': "../../media/sprite.svg#local-tasks-view",
     'nav-toggle-toleft': "../../media/sprite.svg#nav-toggle-toleft-view",
     'nav-toggle-totop': "../../media/sprite.svg#nav-toggle-totop-view",
@@ -196,47 +206,95 @@ $sizes: (
         'width': 24px,
         'height': 24px
     ),
-    'warning': (
+    'announcements-feed-announcement': (
         'width': 24px,
         'height': 24px
     ),
-    'announcement': (
+    'block': (
         'width': 24px,
         'height': 24px
     ),
-    'block': (
+    'bookmarks': (
         'width': 24px,
         'height': 24px
     ),
-    'blocks': (
+    'burger': (
+        'width': 18px,
+        'height': 14px
+    ),
+    'chevron-down': (
         'width': 24px,
         'height': 24px
     ),
-    'bookmarks': (
+    'chevron': (
+        'width': 256px,
+        'height': 256px
+    ),
+    'database': (
         'width': 24px,
         'height': 24px
     ),
-    'chevron-down': (
+    'dots': (
+        'width': 256px,
+        'height': 256px
+    ),
+    'entity-user-collection': (
+        'width': 24px,
+        'height': 24px
+    ),
+    'help': (
+        'width': 24px,
+        'height': 24px
+    ),
+    'navigation-blocks': (
+        'width': 24px,
+        'height': 24px
+    ),
+    'navigation-content': (
         'width': 24px,
         'height': 24px
     ),
-    'create': (
+    'navigation-create': (
         'width': 24px,
         'height': 24px
     ),
-    'extend-new': (
+    'navigation-files': (
         'width': 24px,
         'height': 24px
     ),
-    'files': (
+    'navigation-media': (
         'width': 24px,
         'height': 24px
     ),
-    'media': (
+    'navigation-user-links-user-wrapper': (
         'width': 24px,
         'height': 24px
     ),
-    'people-new': (
+    'shortcuts': (
+        'width': 24px,
+        'height': 24px
+    ),
+    'system-admin-config': (
+        'width': 24px,
+        'height': 24px
+    ),
+    'system-admin-reports': (
+        'width': 24px,
+        'height': 24px
+    ),
+    'system-admin-structure': (
+        'width': 24px,
+        'height': 24px
+    ),
+    'system-modules-list': (
+        'width': 24px,
+        'height': 24px
+    ),
+    'system-themes-page': (
+        'width': 24px,
+        'height': 24px
+    ),
+    'warning': (
         'width': 24px,
         'height': 24px
     ),
@@ -260,10 +318,6 @@ $sizes: (
         'width': 24px,
         'height': 24px
     ),
-    'database': (
-        'width': 24px,
-        'height': 24px
-    ),
     'php': (
         'width': 24px,
         'height': 24px
@@ -372,10 +426,6 @@ $sizes: (
         'width': 24px,
         'height': 24px
     ),
-    'help': (
-        'width': 24px,
-        'height': 24px
-    ),
     'local-tasks': (
         'width': 24px,
         'height': 24px
diff --git a/styles/helpers/_toolbar-icons.scss b/styles/helpers/_toolbar-icons.scss
index 248afafa0..e42918d80 100644
--- a/styles/helpers/_toolbar-icons.scss
+++ b/styles/helpers/_toolbar-icons.scss
@@ -5,62 +5,11 @@
   --icon: #{icon('tool')};
 }
 
-.toolbar-icon-system-themes-page::before,
-.toolbar-link--system-themes-page::before,
-.toolbar-button--icon--system-themes-page::before {
-  --icon: #{icon('appearance')};
-}
-
-.toolbar-link--blocks::before,
-.toolbar-button--icon--navigation-blocks::before {
-  --icon: #{icon('blocks')};
-}
-
 .toolbar-link--bookmarks::before,
 .toolbar-button--icon--bookmarks::before {
   --icon: #{icon('bookmarks')};
 }
 
-.toolbar-icon-shortcut::before,
-.toolbar-button--icon--shortcuts::before {
-  --icon: #{icon('shortcut')};
-}
-
-.toolbar-icon-system-admin-config::before,
-.toolbar-link--system-admin-config::before,
-.toolbar-button--icon--system-admin-config::before {
-  --icon: #{icon('config')};
-}
-
-.toolbar-icon-system-admin-content::before,
-.toolbar-link--content::before,
-.toolbar-button--icon--navigation-content::before {
-  --icon: #{icon('content')};
-}
-
-.toolbar-link--create::before,
-.toolbar-button--icon--navigation-create::before {
-  --icon: #{icon('create')};
-}
-
-.toolbar-icon-system-modules-list::before,
-.toolbar-link--system-modules-list::before,
-.toolbar-button--icon--system-modules-list::before {
-  --icon: #{icon('extend-new')};
-}
-
-.toolbar-link--files::before,
-.toolbar-button--icon--navigation-files::before {
-  --icon: #{icon('files')};
-}
-
-.toolbar-icon-help-main::before,
-.toolbar-icon-help::before,
-.toolbar-link--help::before,
-.toolbar-button--icon--help::before {
-  --icon: #{icon('help')};
-}
-
 .toolbar-icon-commerce-admin-commerce::before,
 .toolbar-link--commerce-admin-commerce::before,
 .toolbar-button--icon--commerce-admin-commerce::before,
@@ -70,29 +19,6 @@
   --icon: #{icon('commerce')};
 }
 
-.toolbar-link--media::before,
-.toolbar-button--icon--navigation-media::before {
-  --icon: #{icon('media')};
-}
-
-.toolbar-icon-entity-user-collection::before,
-.toolbar-link--entity-user-collection::before,
-.toolbar-button--icon--entity-user-collection::before {
-  --icon: #{icon('people-new')};
-}
-
-.toolbar-icon-system-admin-reports::before,
-.toolbar-link--system-admin-reports::before,
-.toolbar-button--icon--system-admin-reports::before {
-  --icon: #{icon('reports')};
-}
-
-.toolbar-icon-system-admin-structure::before,
-.toolbar-link--system-admin-structure::before,
-.toolbar-button--icon--system-admin-structure::before {
-  --icon: #{icon('structure')};
-}
-
 .toolbar-icon-entity-webform-collection::before,
 .toolbar-link--entity-webform-collection::before,
 .toolbar-button--icon--entity-webform-collection::before {
@@ -106,19 +32,6 @@
   --icon: #{icon('chevron-down')};
 }
 
-.toolbar-icon-user::before,
-.toolbar-link--user::before,
-.toolbar-button--icon--user::before {
-  --icon: #{icon('user')};
-}
-
-.toolbar-icon-announcements-feed-announcement::before,
-.toolbar-icon-announce::before,
-.toolbar-link--announcements-feed-announcement::before,
-.toolbar-button--icon--announcements-feed-announcement::before {
-  --icon: #{icon('announcement')};
-}
-
 .toolbar-icon-system-admin-group::before,
 .toolbar-link--system-admin-group::before,
 .toolbar-button--icon--system-admin-group::before {
diff --git a/styles/navigation/toolbar-link.scss b/styles/navigation/toolbar-link.scss
index 8b83b78d3..115237c06 100644
--- a/styles/navigation/toolbar-link.scss
+++ b/styles/navigation/toolbar-link.scss
@@ -3,7 +3,7 @@
  * Toolbar linke styles.
  */
 
- .toolbar-link {
+.toolbar-link {
   position: relative;
   padding-block: 10px;
   padding-inline: 0;
@@ -170,10 +170,6 @@ html:not(.admin-toolbar-expanded) {
 //   --icon: url(../../assets/icons/appearance.svg);
 // }
 
-// .toolbar-link--blocks::before {
-//   --icon: url(../../assets/icons/blocks.svg);
-// }
-
 // .toolbar-link--bookmarks::before {
 //   --icon: url(../../assets/icons/bookmarks.svg);
 // }
-- 
GitLab