Revert co clean class

core/modules/navigation/components/toolbar-button/toolbar-button.css

@@ -133,7 +133,7 @@
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-[dir="ltr"] .toolbar-button--icon--announcement .toolbar-button__icon {
+[dir="ltr"] .toolbar-button--icon--announcements-feed-announcement .toolbar-button__icon {
   scale: -1 1;
 }
 .toolbar-button--collapsible .toolbar-button__chevron {

core/modules/navigation/components/toolbar-button/toolbar-button.pcss.css

@@ -155,7 +155,7 @@
   }
 }
 
-[dir="ltr"] .toolbar-button--icon--announcement .toolbar-button__icon {
+[dir="ltr"] .toolbar-button--icon--announcements-feed-announcement .toolbar-button__icon {
   scale: -1 1;
 }
 

core/modules/navigation/templates/navigation-menu.html.twig

@@ -9,13 +9,6 @@
 {% macro menu_items(items, attributes, menu_level) %}
   {% for item in items %}
 
-    {% set icon_id = null %}
-    {% if item.original_link.pluginId is defined %}
-      {% set icon_id = item.original_link.pluginId|split('.')|last %}
-    {% elseif item.class is defined %}
-      {% set icon_id = item.class|split('.')|last %}
-    {% endif %}
-
     {% set item_link_tag = 'a' %}
 
     {% if item.url.isRouted %}
@@ -38,7 +31,7 @@
         <li id="{{ item_id }}" class="toolbar-block__list-item">
           {% include 'navigation:toolbar-button' with {
             attributes: item_link_attributes.setAttribute('href', item.url|render|default(null)).setAttribute('data-drupal-tooltip', item.title).setAttribute('data-drupal-tooltip-class', 'admin-toolbar__tooltip'),
-            icon: icon_id,
+            icon: item.class|clean_class,
             html_tag: item_link_tag,
             text: item.title,
             modifiers: [
@@ -57,7 +50,7 @@
               'data-toolbar-popover-control': true,
               'data-has-safe-triangle': true,
             }),
-            icon: icon_id,
+            icon: item.class|clean_class,
             text: item.title,
             modifiers: [
               'expand--side',