diff --git a/components/ILIAS/COPage/PC/Paragraph/MenuGUI.php b/components/ILIAS/COPage/PC/Paragraph/MenuGUI.php
index f23144e14949..8609ca05de04 100755
--- a/components/ILIAS/COPage/PC/Paragraph/MenuGUI.php
+++ b/components/ILIAS/COPage/PC/Paragraph/MenuGUI.php
@@ -131,19 +131,19 @@ public function render(
 
 
         $numbered_list = $ui->renderer()->render(
-            $ui->factory()->symbol()->glyph()->numberedlist(null)
+            $ui->factory()->symbol()->glyph()->numberedlist()
         );
 
         $bullet_list = $ui->renderer()->render(
-            $ui->factory()->symbol()->glyph()->bulletlist(null)
+            $ui->factory()->symbol()->glyph()->bulletlist()
         );
 
         $indent = $ui->renderer()->render(
-            $ui->factory()->symbol()->glyph()->listindent(null)
+            $ui->factory()->symbol()->glyph()->listindent()
         );
 
         $outdent = $ui->renderer()->render(
-            $ui->factory()->symbol()->glyph()->listoutdent(null)
+            $ui->factory()->symbol()->glyph()->listoutdent()
         );
 
         // menu
diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarDayGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarDayGUI.php
index 7c3217d16860..d63319f8ca3a 100755
--- a/components/ILIAS/Calendar/classes/class.ilCalendarDayGUI.php
+++ b/components/ILIAS/Calendar/classes/class.ilCalendarDayGUI.php
@@ -138,7 +138,12 @@ protected function show(): void
             $this->tpl->setCurrentBlock("new_app1");
             $this->tpl->setVariable(
                 'H_NEW_APP_GLYPH',
-                $this->ui_renderer->render($this->ui_factory->symbol()->glyph()->add($new_app_url))
+                $this->ui_renderer->render(
+                    $this->ui_factory->link()->standard(
+                        '',
+                        $new_app_url,
+                    )->withSymbol($this->ui_factory->symbol()->glyph()->add())
+                )
             );
             $this->tpl->parseCurrentBlock();
 
@@ -186,9 +191,12 @@ protected function show(): void
                     $this->ctrl->setParameterByClass('ilcalendarappointmentgui', 'hour', floor($numeric / 60));
                     $this->tpl->setVariable(
                         'NEW_APP_GLYPH',
-                        $this->ui_renderer->render($this->ui_factory->symbol()->glyph()->add(
-                            $this->ctrl->getLinkTargetByClass('ilcalendarappointmentgui', 'add')
-                        ))
+                        $this->ui_renderer->render(
+                            $this->ui_factory->link()->standard(
+                                '',
+                                $this->ctrl->getLinkTargetByClass('ilcalendarappointmentgui', 'add')
+                            )->withSymbol($this->ui_factory->symbol()->glyph()->add())
+                        )
                     );
                     $this->tpl->parseCurrentBlock();
                 }
diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarMonthGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarMonthGUI.php
index 1035bf9cc2ee..62f017ce59e1 100755
--- a/components/ILIAS/Calendar/classes/class.ilCalendarMonthGUI.php
+++ b/components/ILIAS/Calendar/classes/class.ilCalendarMonthGUI.php
@@ -162,7 +162,12 @@ public function show(): void
                 $this->tpl->setCurrentBlock("new_app");
                 $this->tpl->setVariable(
                     'NEW_GLYPH',
-                    $this->ui_renderer->render($this->ui_factory->symbol()->glyph()->add($new_app_url))
+                    $this->ui_renderer->render(
+                        $this->ui_factory->link()->standard(
+                            '',
+                            $new_app_url
+                        )->withSymbol($this->ui_factory->symbol()->glyph()->add())
+                    )
                 );
                 $this->tpl->parseCurrentBlock();
 
diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarWeekGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarWeekGUI.php
index 7106c07c6210..a897260e6738 100755
--- a/components/ILIAS/Calendar/classes/class.ilCalendarWeekGUI.php
+++ b/components/ILIAS/Calendar/classes/class.ilCalendarWeekGUI.php
@@ -403,9 +403,14 @@ protected function addAppointmentLink(ilDateTime $date): void
 
         $this->tpl->setCurrentBlock("new_app");
         //$this->tpl->setVariable('NEW_APP_LINK',$new_app_url);
-        $this->tpl->setVariable('NEW_APP_GLYPH', $this->ui_renderer->render(
-            $this->ui_factory->symbol()->glyph()->add($new_app_url)
-        ));
+        $this->tpl->setVariable(
+            'NEW_APP_GLYPH', $this->ui_renderer->render(
+            $this->ui_factory->link()->standard(
+                '',
+                $new_app_url
+            )->withSymbol($this->ui_factory->symbol()->glyph()->add())
+        )
+        );
         // $this->tpl->setVariable('NEW_APP_ALT',$this->lng->txt('cal_new_app'));
         $this->tpl->parseCurrentBlock();
 
@@ -523,7 +528,12 @@ protected function addTimedEvents(array $hours, int $morning_aggr, int $evening_
                     $new_app_url = $this->ctrl->getLinkTargetByClass('ilcalendarappointmentgui', 'add');
                     $this->tpl->setVariable(
                         "DAY_NEW_APP_LINK",
-                        $this->ui_renderer->render($this->ui_factory->symbol()->glyph()->add($new_app_url))
+                        $this->ui_renderer->render(
+                            $this->ui_factory->link()->standard(
+                                '',
+                                $new_app_url
+                            )->withSymbol($this->ui_factory->symbol()->glyph()->add())
+                        )
                     );
                     $this->tpl->setVariable('DAY_NEW_ID', ++$new_link_counter);
                     $this->tpl->parseCurrentBlock();
diff --git a/components/ILIAS/DataCollection/classes/Content/class.ilDclRecordListTableGUI.php b/components/ILIAS/DataCollection/classes/Content/class.ilDclRecordListTableGUI.php
index fd4f8fb9db7b..81472cf42232 100755
--- a/components/ILIAS/DataCollection/classes/Content/class.ilDclRecordListTableGUI.php
+++ b/components/ILIAS/DataCollection/classes/Content/class.ilDclRecordListTableGUI.php
@@ -258,7 +258,12 @@ protected function fillRow(array $a_set): void
             $this->tpl->setCurrentBlock('view');
             $this->tpl->setVariable(
                 "VIEW_DETAILS",
-                $this->ui->renderer()->render($this->ui->factory()->symbol()->glyph()->enlarge($a_set["_front"]))
+                $this->ui->renderer()->render(
+                    $this->ui->factory()->link()->standard(
+                        '',
+                        $a_set["_front"]
+                    )->withSymbol($this->ui->factory()->symbol()->glyph()->enlarge())
+                )
             );
             $this->tpl->parseCurrentBlock();
         }
diff --git a/components/ILIAS/Exercise/Submission/class.ilExerciseSubmissionTableGUI.php b/components/ILIAS/Exercise/Submission/class.ilExerciseSubmissionTableGUI.php
index df54803041e7..ae6c7619fa0e 100755
--- a/components/ILIAS/Exercise/Submission/class.ilExerciseSubmissionTableGUI.php
+++ b/components/ILIAS/Exercise/Submission/class.ilExerciseSubmissionTableGUI.php
@@ -306,7 +306,8 @@ protected function parseRow(
                         $this->tpl->setCurrentBlock("team_member_removal_bl");
                         $this->tpl->setVariable("URL_TEAM_MEMBER_REMOVAL", $url);
 
-                        $rem_gl = $this->ui_factory->symbol()->glyph()->remove($url);
+                        $rem_gl = $this->ui_factory->link()->standard('', $url)
+                                                   ->withSymbol($this->ui_factory->symbol()->glyph()->remove());
                         $this->tpl->setVariable(
                             "TXT_TEAM_MEMBER_REMOVAL",
                             $this->ui_renderer->render($rem_gl)
diff --git a/components/ILIAS/Forum/classes/class.ilObjForumGUI.php b/components/ILIAS/Forum/classes/class.ilObjForumGUI.php
index 285ea39dbe1a..6f33954bcacf 100755
--- a/components/ILIAS/Forum/classes/class.ilObjForumGUI.php
+++ b/components/ILIAS/Forum/classes/class.ilObjForumGUI.php
@@ -1105,7 +1105,7 @@ private function renderDraftContent(
                 $tpl->setVariable(
                     'DOWNLOAD_IMG',
                     $this->uiRenderer->render(
-                        $this->uiFactory->symbol()->glyph()->attachment($this->lng->txt('forums_download_attachment'))
+                        $this->uiFactory->symbol()->glyph()->attachment()
                     )
                 );
                 if (count($filesOfDraft) > 1) {
@@ -1298,7 +1298,7 @@ protected function renderPostContent(
             $tpl->setVariable(
                 'DOWNLOAD_IMG',
                 $this->uiRenderer->render(
-                    $this->uiFactory->symbol()->glyph()->attachment($this->lng->txt('forums_download_attachment'))
+                    $this->uiFactory->symbol()->glyph()->attachment()
                 )
             );
             if (count($filesOfPost) > 1) {
diff --git a/components/ILIAS/ILIASObject/classes/class.ilObjectListGUI.php b/components/ILIAS/ILIASObject/classes/class.ilObjectListGUI.php
index 38448398ebe0..ba46f1fc43bb 100755
--- a/components/ILIAS/ILIASObject/classes/class.ilObjectListGUI.php
+++ b/components/ILIAS/ILIASObject/classes/class.ilObjectListGUI.php
@@ -2324,7 +2324,7 @@ public function getHeaderAction(?ilGlobalTemplateInterface $main_tpl = null): st
                 $f = $this->ui->factory();
                 $this->addHeaderGlyph(
                     'tags',
-                    $f->symbol()->glyph()->tag('#')
+                    $f->symbol()->glyph()->tag()
                       ->withCounter($f->counter()->status(count($tags))),
                     ilTaggingGUI::getListTagsJSCall($this->ajax_hash, $redraw_js)
                 );
@@ -2346,7 +2346,7 @@ public function getHeaderAction(?ilGlobalTemplateInterface $main_tpl = null): st
                 $f = $this->ui->factory();
                 $this->addHeaderGlyph(
                     'notes',
-                    $f->symbol()->glyph()->note('#')
+                    $f->symbol()->glyph()->note()
                       ->withCounter($f->counter()->status((int) $cnt[$this->obj_id][Note::PRIVATE])),
                     ilNoteGUI::getListNotesJSCall($this->ajax_hash, $redraw_js)
                 );
@@ -2361,7 +2361,7 @@ public function getHeaderAction(?ilGlobalTemplateInterface $main_tpl = null): st
                 $f = $this->ui->factory();
                 $this->addHeaderGlyph(
                     'comments',
-                    $f->symbol()->glyph()->comment('#')
+                    $f->symbol()->glyph()->comment()
                       ->withCounter($f->counter()->status((int) $cnt[$this->obj_id][Note::PUBLIC])),
                     ilNoteGUI::getListCommentsJSCall($this->ajax_hash, $redraw_js)
                 );
diff --git a/components/ILIAS/Like/classes/class.ilLikeGUI.php b/components/ILIAS/Like/classes/class.ilLikeGUI.php
index 4ed58c19136f..9fcd3b161a7e 100755
--- a/components/ILIAS/Like/classes/class.ilLikeGUI.php
+++ b/components/ILIAS/Like/classes/class.ilLikeGUI.php
@@ -169,11 +169,15 @@ protected function renderEmoCounters(
         $comps = array();
         foreach ($this->data->getExpressionTypes() as $k => $txt) {
             if ($cnts[$k] > 0) {
-                $glyph = $this->getGlyphForConst($k, $unavailable);
+                $glyph = $this->getGlyphForConst($k)->withCounter($f->counter()->status($cnts[$k]));
+                $comp = $f->button()->shy('', '#')->withSymbol($glyph);
                 if ($modal_signal !== null) {
-                    $glyph = $glyph->withOnClick($modal_signal);
+                    $comp = $comp->withOnClick($modal_signal);
                 }
-                $comps[] = $glyph->withCounter($f->counter()->status($cnts[$k]));
+                if ($unavailable) {
+                    $comp = $comp->withUnavailableAction();
+                }
+                $comps[] = $comp;
             }
         }
 
@@ -193,10 +197,8 @@ protected function renderEmoCounters(
         return $tpl->get();
     }
 
-    protected function getGlyphForConst(
-        int $a_const,
-        bool $unavailable = false
-    ): ?\ILIAS\UI\Component\Symbol\Glyph\Glyph {
+    protected function getGlyphForConst(int $a_const): ?\ILIAS\UI\Component\Symbol\Glyph\Glyph
+    {
         $f = $this->ui->factory();
         $like = null;
         switch ($a_const) {
@@ -215,9 +217,6 @@ protected function getGlyphForConst(
             case ilLikeData::TYPE_ANGRY: $like = $f->symbol()->glyph()->angry();
                 break;
         }
-        if ($unavailable) {
-            $like = $like->withUnavailableAction();
-        }
         return $like;
     }
 
@@ -332,7 +331,8 @@ public function renderModal(): void
                 $name
             );
 
-            $g = $this->getGlyphForConst($exp["expression"], true);
+            $g = $f->button()->shy('', '#')->withSymbol($this->getGlyphForConst($exp["expression"]))
+                ->withUnavailableAction();
             $placeholder = "###" . $exp["expression"] . "###";
             $glyph_renderings[$placeholder] = $r->render($g);
 
diff --git a/components/ILIAS/Notes/Note/class.ilNoteGUI.php b/components/ILIAS/Notes/Note/class.ilNoteGUI.php
index 4b34c1257a04..744cd201793a 100755
--- a/components/ILIAS/Notes/Note/class.ilNoteGUI.php
+++ b/components/ILIAS/Notes/Note/class.ilNoteGUI.php
@@ -1364,13 +1364,15 @@ public function getGlyph(): string
         $query_url = $ctrl->getLinkTarget($this, "getListHtml", "", true, false);
         $comps = array();
         $c = $f->counter()->status((int) $cnt);
-        $comps[] = $f->symbol()->glyph()->comment()->withCounter($c)->withAdditionalOnLoadCode(function ($id) use ($hash, $query_url) {
-            $code = "$('#$id').attr('data-note-key','$hash');\n";
-            $code .= "$('#$id').attr('data-note-ui-type','trigger');\n";
-            $code .= "$('#$id').attr('data-note-query-url','" . $query_url . "');\n";
-            $code .= "$(\"#$id\").click(function(event) { ilNotes.clickTrigger(event)});";
-            return $code;
-        });
+        $comps[] = $f->button()->shy('', '#')
+            ->withSymbol($f->symbol()->glyph()->comment()->withCounter($c))
+            ->withAdditionalOnLoadCode(function ($id) use ($hash, $query_url) {
+                $code = "$('#$id').attr('data-note-key','$hash');\n";
+                $code .= "$('#$id').attr('data-note-ui-type','trigger');\n";
+                $code .= "$('#$id').attr('data-note-query-url','" . $query_url . "');\n";
+                $code .= "$(\"#$id\").click(function(event) { ilNotes.clickTrigger(event)});";
+                return $code;
+            });
         if ($this->ctrl->isAsynch()) {
             $html = $r->renderAsync($comps);
         } else {
@@ -1504,13 +1506,15 @@ public function getWidget(): string
         $comps = array();
         if ($cnt > 0) {
             $c = $f->counter()->status((int) $cnt);
-            $comps[] = $f->symbol()->glyph()->comment()->withCounter($c)->withAdditionalOnLoadCode(function ($id) use ($hash, $query_url) {
-                $code = "$('#$id').attr('data-note-key','$hash');\n";
-                $code .= "$('#$id').attr('data-note-ui-type','trigger');\n";
-                $code .= "$('#$id').attr('data-note-query-url','" . $query_url . "');\n";
-                $code .= "$(\"#$id\").click(function(event) { ilNotes.clickTrigger(event)});";
-                return $code;
-            });
+            $comps[] = $f->button()->standard( '', '#')
+                ->withSymbol($f->symbol()->glyph()->comment()->withCounter($c))
+                ->withAdditionalOnLoadCode(function ($id) use ($hash, $query_url) {
+                    $code = "$('#$id').attr('data-note-key','$hash');\n";
+                    $code .= "$('#$id').attr('data-note-ui-type','trigger');\n";
+                    $code .= "$('#$id').attr('data-note-query-url','" . $query_url . "');\n";
+                    $code .= "$(\"#$id\").click(function(event) { ilNotes.clickTrigger(event)});";
+                    return $code;
+                });
             $comps[] = $f->divider()->vertical();
             $tpl->setVariable("GLYPH", $r->render($comps));
             $tpl->setVariable("TXT_LATEST", $this->getLatestItemText());
diff --git a/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatGUI.php b/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatGUI.php
index 27164a96e7ea..9c547d70e89d 100755
--- a/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatGUI.php
+++ b/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatGUI.php
@@ -200,9 +200,10 @@ public static function initializeFrontend(ilGlobalTemplateInterface $page): void
             $chatWindowTemplate->setVariable('SUBMIT_ACTION', $renderer->render(
                 $factory->button()->standard($DIC->language()->txt('chat_osc_send'), 'onscreenchat-submit')
             ));
-            $chatWindowTemplate->setVariable('ADD_ACTION', $renderer->render(
-                $factory->symbol()->glyph()->add('addUser')
-            ));
+            $add_button = $factory->button()->shy('', 'addUser')
+                        ->withSymbol($factory->symbol()->glyph()->add());
+
+            $chatWindowTemplate->setVariable('ADD_ACTION', $renderer->render($add_button));
             $chatWindowTemplate->setVariable('MINIMIZE_ACTION', $renderer->render(
                 $factory->button()->minimize()
             ));
diff --git a/components/ILIAS/OnScreenChat/resources/onscreenchat.js b/components/ILIAS/OnScreenChat/resources/onscreenchat.js
index 9dd6a4b72bef..276589f88309 100644
--- a/components/ILIAS/OnScreenChat/resources/onscreenchat.js
+++ b/components/ILIAS/OnScreenChat/resources/onscreenchat.js
@@ -435,7 +435,7 @@
 			const setAttributes = obj => node => Object.entries(obj)
 			      .forEach(([k, v]) => node.setAttribute(k, v));
 
-			dummyParent.querySelectorAll('[href="addUser"]').forEach(setAttributes({
+			dummyParent.querySelectorAll('[data-action="addUser"]').forEach(setAttributes({
 				"title":                 il.Language.txt('chat_osc_add_user'),
 				"data-onscreenchat-add": conversation.id,
 				"data-toggle":           "tooltip",
diff --git a/components/ILIAS/TestQuestionPool/classes/class.assLongMenuGUI.php b/components/ILIAS/TestQuestionPool/classes/class.assLongMenuGUI.php
index ebf403bb2fe9..54cd0d584e52 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.assLongMenuGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.assLongMenuGUI.php
@@ -274,10 +274,10 @@ public function populateQuestionSpecificFormPart(ilPropertyFormGUI $form): ilPro
         $tpl->setVariable('SAVE', $this->lng->txt('save'));
         $tpl->setVariable('CANCEL', $this->lng->txt('cancel'));
         $tpl->setVariable('ADD_BUTTON', $this->ui_renderer->render(
-            $this->ui_factory->symbol()->glyph()->add()->withAction('#')
+            $this->ui_factory->link()->standard('', '#')->withSymbol($this->ui_factory->symbol()->glyph()->add())
         ));
         $tpl->setVariable('REMOVE_BUTTON', $this->ui_renderer->render(
-            $this->ui_factory->symbol()->glyph()->remove()->withAction('#')
+            $this->ui_factory->link()->standard('', '#')->withSymbol($this->ui_factory->symbol()->glyph()->remove())
         ));
         $tag_input = new ilTagInputGUI();
         $tag_input->setPostVar('taggable');
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilAnswerWizardInputGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilAnswerWizardInputGUI.php
index ad876b74dbae..e3899f3d754d 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilAnswerWizardInputGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilAnswerWizardInputGUI.php
@@ -19,6 +19,7 @@
 use ILIAS\TestQuestionPool\ilTestLegacyFormsHelper;
 use ILIAS\UI\Renderer;
 use ILIAS\UI\Component\Symbol\Glyph\Factory as GlyphFactory;
+use ILIAS\UI\Component\Link\Factory as LinkFactory;
 
 /**
 * This class represents a single choice wizard property in a property form.
@@ -39,6 +40,7 @@ class ilAnswerWizardInputGUI extends ilTextInputGUI
 
     protected ilTestLegacyFormsHelper $forms_helper;
     protected GlyphFactory $glyph_factory;
+    protected LinkFactory $button_factory;
     protected Renderer $renderer;
 
     /**
@@ -54,6 +56,7 @@ public function __construct($a_title = "", $a_postvar = "")
         global $DIC;
 
         $this->forms_helper = new ilTestLegacyFormsHelper();
+        $this->link_factory = $DIC->ui()->factory()->link();
         $this->glyph_factory = $DIC->ui()->factory()->symbol()->glyph();
         $this->renderer = $DIC->ui()->renderer();
 
@@ -315,10 +318,10 @@ public function insert(ilTemplate $a_tpl): void
                 $tpl->setVariable("CMD_DOWN", "cmd[down" . $this->getFieldId() . "][$i]");
                 $tpl->setVariable("ID", $this->getPostVar() . "[$i]");
                 $tpl->setVariable("UP_BUTTON", $this->renderer->render(
-                    $this->glyph_factory->up()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->up())
                 ));
                 $tpl->setVariable("DOWN_BUTTON", $this->renderer->render(
-                    $this->glyph_factory->down()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->down())
                 ));
                 $tpl->parseCurrentBlock();
             }
@@ -332,10 +335,10 @@ public function insert(ilTemplate $a_tpl): void
                 $tpl->setVariable("CMD_ADD", "cmd[add" . $this->getFieldId() . "][$i]");
                 $tpl->setVariable("CMD_REMOVE", "cmd[remove" . $this->getFieldId() . "][$i]");
                 $tpl->setVariable("ADD_BUTTON", $this->renderer->render(
-                    $this->glyph_factory->add()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->add())
                 ));
                 $tpl->setVariable("REMOVE_BUTTON", $this->renderer->render(
-                    $this->glyph_factory->remove()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->remove())
                 ));
             }
             if ($this->getDisabled()) {
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilEssayKeywordWizardInputGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilEssayKeywordWizardInputGUI.php
index e306e859f1ee..a4fdd1746423 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilEssayKeywordWizardInputGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilEssayKeywordWizardInputGUI.php
@@ -125,10 +125,10 @@ public function insert(ilTemplate $a_tpl): void
                 $tpl->setVariable("DISABLED_POINTS", " disabled=\"disabled\"");
             }
             $tpl->setVariable("ADD_BUTTON", $this->renderer->render(
-                $this->glyph_factory->add()->withAction('#')
+                $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->add())
             ));
             $tpl->setVariable("REMOVE_BUTTON", $this->renderer->render(
-                $this->glyph_factory->remove()->withAction('#')
+                $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->remove())
             ));
             $tpl->parseCurrentBlock();
             $i++;
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilKprimChoiceWizardInputGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilKprimChoiceWizardInputGUI.php
index d9f50a2d9bfb..ad4a5c77445b 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilKprimChoiceWizardInputGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilKprimChoiceWizardInputGUI.php
@@ -219,10 +219,10 @@ public function insert(ilTemplate $a_tpl): void
                 $tpl->setVariable("UP_ID", "up_{$this->getPostVar()}[{$value->getPosition()}]");
                 $tpl->setVariable("DOWN_ID", "down_{$this->getPostVar()}[{$value->getPosition()}]");
                 $tpl->setVariable("UP_BUTTON", $this->renderer->render(
-                    $this->glyph_factory->up()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->up())
                 ));
                 $tpl->setVariable("DOWN_BUTTON", $this->renderer->render(
-                    $this->glyph_factory->down()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->down())
                 ));
                 $tpl->parseCurrentBlock();
             }
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilMatchingPairWizardInputGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilMatchingPairWizardInputGUI.php
index 09a58662e981..c1f9c412c96d 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilMatchingPairWizardInputGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilMatchingPairWizardInputGUI.php
@@ -19,6 +19,7 @@
 use ILIAS\TestQuestionPool\QuestionPoolDIC;
 use ILIAS\TestQuestionPool\ilTestLegacyFormsHelper;
 use ILIAS\UI\Renderer;
+use ILIAS\UI\Component\Link\Factory as LinkFactory;
 use ILIAS\UI\Component\Symbol\Glyph\Factory as GlyphFactory;
 
 /**
@@ -37,6 +38,7 @@ class ilMatchingPairWizardInputGUI extends ilTextInputGUI
 
     protected ilTestLegacyFormsHelper $forms_helper;
     protected GlyphFactory $glyph_factory;
+    protected LinkFactory $link_factory;
     protected Renderer $renderer;
 
     /**
@@ -53,6 +55,7 @@ public function __construct($a_title = "", $a_postvar = "")
 
         $this->forms_helper = new ilTestLegacyFormsHelper();
         $this->glyph_factory = $DIC->ui()->factory()->symbol()->glyph();
+        $this->link_factory = $DIC->ui()->factory()->link();
         $this->renderer = $DIC->ui()->renderer();
     }
 
@@ -226,10 +229,10 @@ public function insert(ilTemplate $a_tpl): void
                 $tpl->setCurrentBlock("move");
                 $tpl->setVariable("ID", $this->getPostVar() . "[$i]");
                 $tpl->setVariable("UP_BUTTON", $this->renderer->render(
-                    $this->glyph_factory->up()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->up())
                 ));
                 $tpl->setVariable("DOWN_BUTTON", $this->renderer->render(
-                    $this->glyph_factory->down()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->down())
                 ));
                 $tpl->parseCurrentBlock();
             }
@@ -239,10 +242,10 @@ public function insert(ilTemplate $a_tpl): void
 
             $tpl->setVariable("ID", $this->getPostVar() . "[$i]");
             $tpl->setVariable("ADD_BUTTON", $this->renderer->render(
-                $this->glyph_factory->add()->withAction('#')
+                $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->add())
             ));
             $tpl->setVariable("REMOVE_BUTTON", $this->renderer->render(
-                $this->glyph_factory->remove()->withAction('#')
+                $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->remove())
             ));
 
             $tpl->setVariable("POST_VAR", $this->getPostVar());
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilMatchingWizardInputGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilMatchingWizardInputGUI.php
index eee7163d2761..edc494db430f 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilMatchingWizardInputGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilMatchingWizardInputGUI.php
@@ -19,6 +19,7 @@
 use ILIAS\TestQuestionPool\ilTestLegacyFormsHelper;
 use ILIAS\UI\Renderer;
 use ILIAS\UI\Component\Symbol\Glyph\Factory as GlyphFactory;
+use ILIAS\UI\Component\Link\Factory as LinkFactory;
 use ILIAS\UI\Implementation\Component\Input\UploadLimitResolver;
 
 /**
@@ -43,6 +44,7 @@ class ilMatchingWizardInputGUI extends ilTextInputGUI
 
     protected ilTestLegacyFormsHelper $forms_helper;
     protected GlyphFactory $glyph_factory;
+    protected LinkFactory $link_factory;
     protected Renderer $renderer;
     protected UploadLimitResolver $upload_limit;
 
@@ -54,6 +56,7 @@ public function __construct($a_title = "", $a_postvar = "")
 
         $this->forms_helper = new ilTestLegacyFormsHelper();
         $this->glyph_factory = $DIC->ui()->factory()->symbol()->glyph();
+        $this->link_factory = $DIC->ui()->factory()->link();
         $this->renderer = $DIC->ui()->renderer();
         $this->upload_limit = $DIC['ui.upload_limit_resolver'];
 
@@ -331,10 +334,10 @@ public function insert(ilTemplate $a_tpl): void
             $tpl->setVariable("ROW_IDENTIFIER", $value->getIdentifier());
             $tpl->setVariable("ID", $this->getPostVar() . "[answer][$i]");
             $tpl->setVariable("ADD_BUTTON", $this->renderer->render(
-                $this->glyph_factory->add()->withAction('#')
+                $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->add())
             ));
             $tpl->setVariable("REMOVE_BUTTON", $this->renderer->render(
-                $this->glyph_factory->remove()->withAction('#')
+                $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->remove())
             ));
             $tpl->parseCurrentBlock();
             $i++;
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilMultipleChoiceWizardInputGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilMultipleChoiceWizardInputGUI.php
index 0a0a76394021..345cb942e12f 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilMultipleChoiceWizardInputGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilMultipleChoiceWizardInputGUI.php
@@ -293,10 +293,10 @@ public function insert(ilTemplate $a_tpl): void
                 $tpl->setCurrentBlock("move");
                 $tpl->setVariable("ID", $this->getPostVar() . "[$i]");
                 $tpl->setVariable("UP_BUTTON", $this->renderer->render(
-                    $this->glyph_factory->up()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->up())
                 ));
                 $tpl->setVariable("DOWN_BUTTON", $this->renderer->render(
-                    $this->glyph_factory->down()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->down())
                 ));
                 $tpl->parseCurrentBlock();
             }
@@ -310,10 +310,10 @@ public function insert(ilTemplate $a_tpl): void
                 $tpl->setVariable("DISABLED_POINTS", " disabled=\"disabled\"");
             }
             $tpl->setVariable("ADD_BUTTON", $this->renderer->render(
-                $this->glyph_factory->add()->withAction('#')
+                $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->add())
             ));
             $tpl->setVariable("REMOVE_BUTTON", $this->renderer->render(
-                $this->glyph_factory->remove()->withAction('#')
+                $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->remove())
             ));
             $tpl->parseCurrentBlock();
             $i++;
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilSingleChoiceWizardInputGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilSingleChoiceWizardInputGUI.php
index dc7c0d57d816..772d3f152ce5 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilSingleChoiceWizardInputGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilSingleChoiceWizardInputGUI.php
@@ -19,6 +19,7 @@
 use ILIAS\TestQuestionPool\ilTestLegacyFormsHelper;
 use ILIAS\UI\Renderer;
 use ILIAS\UI\Component\Symbol\Glyph\Factory as GlyphFactory;
+use ILIAS\UI\Component\Link\Factory as LinkFactory;
 use ILIAS\UI\Implementation\Component\Input\UploadLimitResolver;
 
 /**
@@ -40,6 +41,7 @@ class ilSingleChoiceWizardInputGUI extends ilTextInputGUI
 
     protected ilTestLegacyFormsHelper $forms_helper;
     protected GlyphFactory $glyph_factory;
+    protected LinkFactory $link_factory;
     protected Renderer $renderer;
     protected UploadLimitResolver $upload_limit;
 
@@ -59,6 +61,7 @@ public function __construct($a_title = '', $a_postvar = '')
 
         global $DIC;
         $this->glyph_factory = $DIC->ui()->factory()->symbol()->glyph();
+        $this->link_factory = $DIC->ui()->factory()->link();
         $this->renderer = $DIC->ui()->renderer();
         $this->upload_limit = $DIC['ui.upload_limit_resolver'];
         $this->forms_helper = new ilTestLegacyFormsHelper();
@@ -465,10 +468,10 @@ public function insert(ilTemplate $a_tpl): void
                 $tpl->setCurrentBlock('move');
                 $tpl->setVariable('ID', $this->getPostVar() . "[$i]");
                 $tpl->setVariable('UP_BUTTON', $this->renderer->render(
-                    $this->glyph_factory->up()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->up())
                 ));
                 $tpl->setVariable('DOWN_BUTTON', $this->renderer->render(
-                    $this->glyph_factory->down()->withAction('#')
+                    $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->down())
                 ));
                 $tpl->parseCurrentBlock();
             }
@@ -486,11 +489,12 @@ public function insert(ilTemplate $a_tpl): void
             if ($this->getDisabled()) {
                 $tpl->setVariable('DISABLED_POINTS', ' disabled="disabled"');
             }
+            global $DIC;
             $tpl->setVariable('ADD_BUTTON', $this->renderer->render(
-                $this->glyph_factory->add()->withAction('#')
+                $DIC->ui()->factory()->button()->shy('', '#')->withSymbol($this->glyph_factory->add())
             ));
             $tpl->setVariable('REMOVE_BUTTON', $this->renderer->render(
-                $this->glyph_factory->remove()->withAction('#')
+                $this->link_factory->standard('', '#')->withSymbol($this->glyph_factory->remove())
             ));
             $tpl->parseCurrentBlock();
             $i++;
diff --git a/components/ILIAS/UI/resources/js/Input/Field/file.js b/components/ILIAS/UI/resources/js/Input/Field/file.js
index 87e742db5d88..d06f2d9c9f11 100755
--- a/components/ILIAS/UI/resources/js/Input/Field/file.js
+++ b/components/ILIAS/UI/resources/js/Input/Field/file.js
@@ -44,9 +44,9 @@ il.UI.Input = il.UI.Input || {};
 
 			dropzone: '.ui-input-file-input-dropzone',
 			error_message: '.ui-input-file-input-error-msg',
-			removal_glyph: '[data-action="remove"] .glyph',
-			expand_glyph: '[data-action="expand"] .glyph',
-			collapse_glyph: '[data-action="collapse"] .glyph',
+			removal_glyph: '[data-action="remove"] button, [data-action="remove"] .glyph',
+			expand_glyph: '[data-action="expand"] button, [data-action="expand"] .glyph',
+			collapse_glyph: '[data-action="collapse"] button, [data-action="collapse"] .glyph',
 			form_submit_buttons: '.c-form_actions > button',
 			modal_form_controls: '.modal-footer button',
 
diff --git a/components/ILIAS/UI/src/Component/Symbol/Glyph/Factory.php b/components/ILIAS/UI/src/Component/Symbol/Glyph/Factory.php
index 8608f2877229..d145c1a27433 100755
--- a/components/ILIAS/UI/src/Component/Symbol/Glyph/Factory.php
+++ b/components/ILIAS/UI/src/Component/Symbol/Glyph/Factory.php
@@ -29,11 +29,11 @@ interface Factory
      * ---
      * description:
      *   purpose: >
-     *       The Settings Glyph triggers the opening of a dropdown that allows to edit settings of the displayed block.
+     *       The Settings Glyph symbolizes opening a dropdown that allows to edit settings of the displayed block.
      *   composition: >
      *       The Settings Glyph uses the glyphicon-cog.
      *   effect: >
-     *      Upon clicking, a settings Dropdown is opened.
+     *      When placed in a Button or Link, clicking triggers the opening of a settings Dropdown.
      *
      * rules:
      *   usage:
@@ -43,23 +43,22 @@ interface Factory
      *       1: >
      *          The aria-label MUST be “Settings”.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function settings(?string $action = null): Glyph;
+    public function settings(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
-     *       The Collapse Glyph is used to trigger the collapsing of
-     *       some neighbouring Container Collection such as a the content of a Dropdown or an Accordion currently shown.
+     *       The Collapse Glyph symbolizes the collapsing of
+     *       some neighbouring Container Collection, such as the content of a Dropdown or an Accordion currently shown.
      *   composition: >
      *       The Collapse Glyph is composed of a triangle pointing to the bottom indicating that content is currently shown.
      *   effect: >
-     *      Clicking the Collapse Glyph hides the display of some Container Collection.
+     *      When placed in a Button or Link, clicking hides the display of some Container Collection.
      *   rivals:
-     *      Expand Glyph: The Expand Glyphs triggers the display of some Container Collection.
+     *      Expand Glyph: When placed in a Button or Link, the Expand Glyph triggers the display of some Container Collection.
      *      Previous Glyph: The Previous/Next Glyph opens a completely new view. It serves a navigational purpose.
      *
      *
@@ -71,21 +70,20 @@ public function settings(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Collapse Content'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function collapse(?string $action = null): Glyph;
+    public function collapse(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
-     *       The Expand Glyph is used to trigger the display of
-     *       some neighbouring Container Collection such as a the content of a Dropdown or an Accordion currently shown.
+     *       The Expand Glyph symbolizes the display of
+     *       some neighbouring Container Collection, such as the content of a Dropdown or an Accordion currently shown.
      *   composition: >
      *       The Expand Glyph is composed of a triangle pointing to the right indicating that content is currently collapsed.
      *   effect: >
-     *      Clicking the Expand Glyph displays some Container Collection.
+     *      When placed in a Button or Link, clicking displays some Container Collection.
      *   rivals:
      *      Collapse Glyph: The Collapse Glyphs hides the display of some Container Collection.
      *      Previous Glyph: The Previous/Next Glyph opens a completely new view. It serves a navigational purpose.
@@ -99,10 +97,9 @@ public function collapse(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Expand Content'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function expand(?string $action = null): Glyph;
+    public function expand(): Glyph;
 
     /**
      * ---
@@ -113,7 +110,7 @@ public function expand(?string $action = null): Glyph;
      *   composition: >
      *      The Add Glyph uses the glyphicon-plus-sign.
      *   effect: >
-     *      Clicking on the Add Glyph adds a new input to a form or an event to the calendar.
+     *      When placed in a Button or Link, clicking adds a new input to a form or an event to the calendar.
      *
      * context:
      *   - Adding answer options or taxonomies in questions-editing forms in tests.
@@ -135,10 +132,9 @@ public function expand(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Add'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function add(?string $action = null): Glyph;
+    public function add(): Glyph;
 
     /**
      * ---
@@ -149,7 +145,7 @@ public function add(?string $action = null): Glyph;
      *   composition: >
      *       The Remove Glyph uses the glyphicon-minus-sign.
      *   effect: >
-     *       Clicking on the Remove Glyph deletes an existing input from a form.
+     *       When placed in a Button or Link, clicking deletes an existing input from a form.
      *
      * context:
      *   - Removing answer options or taxonomies in questions-editing forms in tests.
@@ -169,10 +165,9 @@ public function add(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Remove'.
      * ---
-     * @param	string|null	$action
      * @return 	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function remove(?string $action = null): Glyph;
+    public function remove(): Glyph;
 
     /**
      * ---
@@ -184,7 +179,7 @@ public function remove(?string $action = null): Glyph;
      *       The Up Glyph uses the glyphicon-circle-arrow-up. The Up Glyph
      *       can be combined with the Add/Remove Glyph.
      *   effect: >
-     *       Clicking on the Up Glyph moves an item up.
+     *       When placed in a Button or Link, clicking moves an item up.
      *
      * context:
      *   - Moving answers up in Survey matrix questions.
@@ -206,10 +201,9 @@ public function remove(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Up'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function up(?string $action = null): Glyph;
+    public function up(): Glyph;
 
     /**
      * ---
@@ -221,7 +215,7 @@ public function up(?string $action = null): Glyph;
      *       The Down Glyph uses the glyphicon-circle-arrow-down. The Down Glyph
      *       can be combined with the Add/Remove Glyph.
      *   effect: >
-     *       Clicking on the Down Glyph moves an item down.
+     *       When placed in a Button or Link, clicking moves an item down.
      *
      * context:
      *   - Moving answers up in Survey matrix questions.
@@ -243,10 +237,9 @@ public function up(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Down'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function down(?string $action = null): Glyph;
+    public function down(): Glyph;
 
     /**
      * ---
@@ -274,10 +267,9 @@ public function down(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Back'.
      * ---
-     * @param	string|null	$action
      * @return 	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function back(?string $action = null): Glyph;
+    public function back(): Glyph;
 
     /**
      * ---
@@ -304,52 +296,49 @@ public function back(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Next'.
      * ---
-     * @param	string|null	$action
      * @return 	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function next(?string $action = null): Glyph;
+    public function next(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
      *       The Sorting Glyphs indicate the current sorting direction of a column in a table as ascending (up) or descending (down).
-     *       Only one Glyph is shown at a time. Clicking on the glyph will reverse the sorting direction.
+     *       Only one Glyph is shown at a time. When placed in a Button or Link, clicking reverses the sorting direction.
      *   composition: >
      *       The Sort Ascending Glyph uses glyphicon-arrow-up.
      *   effect: >
-     *       Clicking the Sort Ascending Glyph reverses the direction of ordering in a table.
+     *       When placed in a Button or Link, clicking reverses the direction of ordering in a table.
      *
      * rules:
      *   accessibility:
      *       1: >
      *          The aria-label MUST be ‘Sort Ascending'.
      * ---
-     * @param	string|null	$action
      * @return 	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function sortAscending(?string $action = null): Glyph;
+    public function sortAscending(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
      *       The Sorting Glyphs indicate the current sorting direction of a column in a table as ascending (up) or descending (down).
-     *       Only one Glyph is shown at a time. Clicking on the glyph will reverse the sorting direction.
+     *       Only one Glyph is shown at a time. When placed in a Button or Link, clicking reverses the sorting direction.
      *   composition: >
      *       The Sort Descending Glyph uses glyphicon-arrow-descending.
      *   effect: >
-     *       Clicking the Sort Descending Glyph reverses the direction of ordering in a table.
+     *       When placed in a Button or Link, clicking reverses the direction of ordering in a table.
      *
      * rules:
      *   accessibility:
      *       1: >
      *          The aria-label MUST be ‘Sort Descending'.
      * ---
-     * @param	string|null	$action
      * @return 	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function sortDescending(?string $action = null): Glyph;
+    public function sortDescending(): Glyph;
 
     /**
      * ---
@@ -366,21 +355,20 @@ public function sortDescending(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Background Tasks'.
      * ---
-     * @param	string|null	$action
      * @return 	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function briefcase(?string $action = null): Glyph;
+    public function briefcase(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
-     *       The User Glyph triggers the “Who is online?” Popover in the Top Navigation.
+     *       The User Glyph symbolizes the “Who is online?” Popover in the Top Navigation.
      *       The User Glyph indicates the number of pending contact requests and users online via the the Novelty Counter and Status Counter respectively.
      *   composition: >
      *       The User Glyph uses the glyphicon-user.
      *   effect: >
-     *       Clicking the User Glyph opens the “Who is online?” Popover.
+     *       When placed in a Button or Link, clicking opens the “Who is online?” Popover.
      *
      *
      * rules:
@@ -388,10 +376,9 @@ public function briefcase(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Show who is online'.
      * ---
-     * @param	string|null	$action
      * @return 	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function user(?string $action = null): Glyph;
+    public function user(): Glyph;
 
     /**
      * ---
@@ -401,7 +388,7 @@ public function user(?string $action = null): Glyph;
      *   composition: >
      *       The Mail Glyph uses the glyphicon-envelope.
      *   effect: >
-     *       Upon clicking on the Mail Glyph the user is transferred to the full-screen mail service.
+     *       When placed in a Button or Link, clicking transfers the user to the full-screen mail service.
      *   rivals:
      *      Mail Icon: The Mail Icon is used to indicate the user is currently located in the Mail service. The Mail Glyph acts as shortcut to the Mail service.
      *
@@ -410,10 +397,9 @@ public function user(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Mail'.
      * ---
-     * @param	string|null	$action
      * @return 	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function mail(?string $action = null): Glyph;
+    public function mail(): Glyph;
 
     /**
      * ---
@@ -431,10 +417,9 @@ public function mail(?string $action = null): Glyph;
      *       2: >
      *          The aria-label MUST be "Notifications".
      * ---
-     * @param	string|null	$action
      * @return 	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function notification(?string $action = null): Glyph;
+    public function notification(): Glyph;
 
     /**
      * ---
@@ -444,7 +429,7 @@ public function notification(?string $action = null): Glyph;
      *   composition: >
      *       The Tag Glyph uses the glyphicon-tag.
      *   effect: >
-     *       Upon clicking the Round Trip Modal to add new Tags is opened.
+     *       When placed in a Button or Link, clicking opens the Round Trip Modal to add new Tags.
      *
      * rules:
      *   composition:
@@ -454,10 +439,9 @@ public function notification(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Tags'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function tag(?string $action = null): Glyph;
+    public function tag(): Glyph;
 
     /**
      * ---
@@ -467,7 +451,7 @@ public function tag(?string $action = null): Glyph;
      *   composition: >
      *       The Note Glyph uses the glyphicon-pushpin.
      *   effect: >
-     *       Upon clicking the Round Trip Modal to add new notes is opened
+     *       When placed in a Button or Link, clicking opens the Round Trip Modal to add new notes.
      *
      * rules:
      *   composition:
@@ -477,10 +461,9 @@ public function tag(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Notes'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function note(?string $action = null): Glyph;
+    public function note(): Glyph;
 
     /**
      * ---
@@ -490,7 +473,7 @@ public function note(?string $action = null): Glyph;
      *   composition: >
      *       The Comment Glyph uses the glyphicon-comment.
      *   effect: >
-     *       Upon clicking the Round Trip Modal to add new comments is opened.
+     *       When placed in a Button or Link, clicking opens the Round Trip Modal to add new comments.
      *
      * rules:
      *   composition:
@@ -500,20 +483,19 @@ public function note(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Comments'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function comment(?string $action = null): Glyph;
+    public function comment(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
-     *       Clicking the Like Glyph indicates a user approves an item, e.g. a posting.
+     *       The Like Glyph symbolizes a user approving an item, e.g. a posting.
      *   composition: >
      *       The Like Glyph uses the "thumbs up" unicode emoji U+1F44D, see https://unicode.org/emoji/charts/full-emoji-list.html.
      *   effect: >
-     *        Upon clicking, the Like Glyph acts as a toggle: A first click adds a Like to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Like away, which is also reflected in colour and counter.
+     *        When placed in a Button or Link, the Like Glyph acts as a toggle: A first click adds a Like to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Like away, which is also reflected in colour and counter.
      *
      * context:
      *       - Show timeline in groups and courses.
@@ -526,20 +508,19 @@ public function comment(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Like'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function like(?string $action = null): Glyph;
+    public function like(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
-     *       Clicking the Love Glyph indicates a user adores an item, e.g. a posting.
+     *       The Love Glyph symbolizes a user adoring an item, e.g. a posting.
      *   composition: >
      *       The Love Glyph uses the "red heart" unicode emoji U+2764, see https://unicode.org/emoji/charts/full-emoji-list.html.
      *   effect: >
-     *        Upon clicking, the Love Glyph acts as a toggle: A first click adds a Love to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Love away, which is also reflected in colour and counter.
+     *        When placed in a Button or Link, the Love Glyph acts as a toggle: A first click adds a Love to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Love away, which is also reflected in colour and counter.
      *
      * context:
      *       - Show timeline in groups and courses.
@@ -552,20 +533,19 @@ public function like(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Love'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function love(?string $action = null): Glyph;
+    public function love(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
-     *       Clicking the Dislike Glyph indicates a user disapproves an item, e.g. a posting.
+     *       The Dislike Glyph symbolizes a user disapproving an item, e.g. a posting.
      *   composition: >
      *       The Dislike Glyph uses the "thumbs down" unicode emoji U+1F44E, see https://unicode.org/emoji/charts/full-emoji-list.html.
      *   effect: >
-     *        Upon clicking, the Dislike Glyph acts as a toggle: A first click adds a Dislike to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Dislike away, which is also reflected in colour and counter.
+     *        When placed in a Button or Link, the Dislike Glyph acts as a toggle: A first click adds a Dislike to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Dislike away, which is also reflected in colour and counter.
      *
      * context:
      *       - Show timeline in groups and courses.
@@ -578,20 +558,19 @@ public function love(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Dislike'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function dislike(?string $action = null): Glyph;
+    public function dislike(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
-     *       Clicking the Laugh Glyph indicates a user finds an item hilarious, e.g. a posting.
+     *       The Laugh Glyph symbolizes a user finding an item hilarious, e.g. a posting.
      *   composition: >
      *       The Laugh Glyph uses the "grinning face with smiling eyes" unicode emoji U+1F604, see https://unicode.org/emoji/charts/full-emoji-list.html.
      *   effect: >
-     *        Upon clicking, the Laugh Glyph acts as a toggle: A first click adds a Laugh to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Laugh away, which is also reflected in colour and counter.
+     *        When placed in a Button or Link, the Laugh Glyph acts as a toggle: A first click adds a Laugh to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Laugh away, which is also reflected in colour and counter.
      *
      * context:
      *       - Show timeline in groups and courses.
@@ -604,20 +583,19 @@ public function dislike(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Laugh'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function laugh(?string $action = null): Glyph;
+    public function laugh(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
-     *       Clicking the Astounded Glyph indicates a user finds an item surprising, e.g. a posting.
+     *       The Astounded Glyph symbolizes a user finding an item surprising, e.g. a posting.
      *   composition: >
      *       The Astounded Glyph uses the "face with open mouth" unicode emoji U+1F62E, see https://unicode.org/emoji/charts/full-emoji-list.html.
      *   effect: >
-     *        Upon clicking, the Astounded Glyph acts as a toggle: A first click adds an Astounded to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Astounded away, which is also reflected in colour and counter.
+     *        When placed in a Button or Link, the Astounded Glyph acts as a toggle: A first click adds an Astounded to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Astounded away, which is also reflected in colour and counter.
      *
      * context:
      *       - Show timeline in groups and courses.
@@ -630,20 +608,19 @@ public function laugh(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Astounded'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function astounded(?string $action = null): Glyph;
+    public function astounded(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
-     *       Clicking the Sad Glyph indicates a user finds an item disconcerting, e.g. a posting.
+     *       The Sad Glyph symbolizes a user finding an item disconcerting, e.g. a posting.
      *   composition: >
      *       The Sad Glyph uses the "sad but relieved face" unicode emoji U+1F625, see https://unicode.org/emoji/charts/full-emoji-list.html.
      *   effect: >
-     *        Upon clicking, the Sad Glyph acts as a toggle: A first click adds a Sad to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Sad away, which is also reflected in colour and counter.
+     *        When placed in a Button or Link, the Sad Glyph acts as a toggle: A first click adds a Sad to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Sad away, which is also reflected in colour and counter.
      *
      * context:
      *       - Show timeline in groups and courses.
@@ -656,20 +633,19 @@ public function astounded(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Sad'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function sad(?string $action = null): Glyph;
+    public function sad(): Glyph;
 
     /**
      * ---
      * description:
      *   purpose: >
-     *       Clicking the Angry Glyph indicates a user finds an item outraging, e.g. a posting.
+     *       The Angry Glyph symbolizes a user finding an item outraging, e.g. a posting.
      *   composition: >
      *       The Angry Glyph uses the "angry face" unicode emoji U+1F620, see https://unicode.org/emoji/charts/full-emoji-list.html.
      *   effect: >
-     *        Upon clicking, the Angry Glyph acts as a toggle: A first click adds an Angry to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Angry away, which is also reflected in colour and counter.
+     *        When placed in a Button or Link, the Angry Glyph acts as a toggle: A first click adds an Angry to the respective item, which is reflected in the colour of the Glyph and in the counter. A second click takes the Angry away, which is also reflected in colour and counter.
      *
      * context:
      *       - Show timeline in groups and courses.
@@ -682,10 +658,9 @@ public function sad(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Angry'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function angry(?string $action = null): Glyph;
+    public function angry(): Glyph;
 
     /**
      * ---
@@ -709,10 +684,9 @@ public function angry(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be "Eye Closed - Click to hide the input's contents".
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function eyeclosed(?string $action = null): Glyph;
+    public function eyeclosed(): Glyph;
 
     /**
      * ---
@@ -736,10 +710,9 @@ public function eyeclosed(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be "Eye Opened - Click to reveal the input's contents".
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function eyeopen(?string $action = null): Glyph;
+    public function eyeopen(): Glyph;
 
     /**
      * ---
@@ -749,7 +722,7 @@ public function eyeopen(?string $action = null): Glyph;
      *   composition: >
      *      The Attachment Glyph uses the glyphicon-paperclip.
      *   effect: >
-     *       Clicking executes an action which delivers these attachments to the actor OR initiates a process to add new attachments.
+     *       When placed in a Button or Link, clicking executes an action which delivers these attachments to the actor OR initiates a process to add new attachments.
      * context:
      *       - Indicate whether or not files have been attached to emails in the folder view of Mail.
      * rules:
@@ -760,10 +733,9 @@ public function eyeopen(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Attachment'.
      * ---
-     * @param string|null $action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function attachment(?string $action = null): Glyph;
+    public function attachment(): Glyph;
 
     /**
      * ---
@@ -774,7 +746,7 @@ public function attachment(?string $action = null): Glyph;
      *   composition: >
      *      The Reset Glyph uses the glyphicon-repeat.
      *   effect: >
-     *       Upon clicking, the related control is reloaded immediately and goes back to state
+     *       When placed in a Button or Link, clicking reloads the related control immediately and goes back to state
      *       before the user changes.
      *
      * featurewiki:
@@ -794,10 +766,9 @@ public function attachment(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Reset'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function reset(?string $action = null): Glyph;
+    public function reset(): Glyph;
 
     /**
      * ---
@@ -808,7 +779,7 @@ public function reset(?string $action = null): Glyph;
      *   composition: >
      *      The Apply Glyph uses the glyphicon-ok.
      *   effect: >
-     *       Upon clicking, the page is reloaded immediately with the updated content reflected in the control. In case of
+     *       When placed in a Button or Link, clicking reloads the page immediately with the updated content reflected in the control. In case of
      *       a filter, it means that the entries in a table change in accordance with the filter values set by the user.
      *
      * featurewiki:
@@ -828,10 +799,9 @@ public function reset(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Apply'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function apply(?string $action = null): Glyph;
+    public function apply(): Glyph;
 
     /**
      * ---
@@ -841,7 +811,7 @@ public function apply(?string $action = null): Glyph;
      *   composition: >
      *       The Search Glyph uses the glyphicon-search.
      *   effect: >
-     *       Clicking this glyph will open a search dialog.
+     *       When placed in a Button or Link, clicking opens a search dialog.
      *       Since the context for the Search Glyph primarily is the Meta Bar,
      *       the according search dialog will be opened as Tool in the Main Bar.
      *
@@ -853,10 +823,9 @@ public function apply(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Search'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function search(?string $action = null): Glyph;
+    public function search(): Glyph;
 
     /**
      * ---
@@ -879,10 +848,9 @@ public function search(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Help'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function help(?string $action = null): Glyph;
+    public function help(): Glyph;
 
     /**
      * ---
@@ -892,7 +860,7 @@ public function help(?string $action = null): Glyph;
      *   composition: >
      *      The Calendar Glyph uses the glyphicon-calendar.
      *   effect: >
-     *       Clicking the calendar Glyph will usually open a date-picker.
+     *       When placed in a Button or Link, clicking usually opens a date-picker.
      *
      * context:
      *    - Use in conjunction with Date-Inputs.
@@ -902,10 +870,9 @@ public function help(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Calendar'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function calendar(?string $action = null): Glyph;
+    public function calendar(): Glyph;
 
     /**
      * ---
@@ -915,7 +882,7 @@ public function calendar(?string $action = null): Glyph;
      *   composition: >
      *      The Time Glyph uses the glyphicon-time.
      *   effect: >
-     *       Clicking the Time Glyph will usually open a time-picker.
+     *       When placed in a Button or Link, clicking usually opens a time-picker.
      *
      * context:
      *    - Use in conjunction with Date-Inputs.
@@ -925,10 +892,9 @@ public function calendar(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Time'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function time(?string $action = null): Glyph;
+    public function time(): Glyph;
 
     /**
      * ---
@@ -939,17 +905,16 @@ public function time(?string $action = null): Glyph;
      *   composition: >
      *      The Close Glyph uses the glyphicon-remove.
      *   effect: >
-     *       Clicking the Close Glyph will close an overlay or change the view.
+     *       When placed in a Button or Link, clicking closes an overlay or changes the view.
      *
      * rules:
      *   accessibility:
      *       1: >
      *          The aria-label MUST be 'Close'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function close(?string $action = null): Glyph;
+    public function close(): Glyph;
 
     /**
      * ---
@@ -962,7 +927,7 @@ public function close(?string $action = null): Glyph;
      *   composition: >
      *      The More Glyph uses the glyphicon-option-horizontal.
      *   effect: >
-     *       Clicking the More Glyph shows the rest of the set of entries.
+     *       When placed in a Button or Link, clicking shows the rest of the set of entries.
      *   rivals:
      *      Disclosure Glyph: >
      *         The Disclosure Glyph hides the complete set of entries, wherear the
@@ -1004,10 +969,9 @@ public function close(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Show More'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function more(?string $action = null): Glyph;
+    public function more(): Glyph;
 
     /**
      * ---
@@ -1019,7 +983,7 @@ public function more(?string $action = null): Glyph;
      *   composition: >
      *      The Disclosure Glyph uses the glyphicon-option-vertical.
      *   effect: >
-     *       Clicking the Disclose Glyph shows the entire set of entries.
+     *       When placed in a Button or Link, clicking shows the entire set of entries.
      *   rivals:
      *      More Glyph: >
      *         The More Glyph hides part of the set of entries.
@@ -1060,10 +1024,9 @@ public function more(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be „Disclose“.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function disclosure(?string $action = null): Glyph;
+    public function disclosure(): Glyph;
 
     /**
      * ---
@@ -1091,10 +1054,9 @@ public function disclosure(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Switch Language'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function language(?string $action = null): Glyph;
+    public function language(): Glyph;
 
     /**
      * ---
@@ -1105,9 +1067,9 @@ public function language(?string $action = null): Glyph;
      *   composition: >
      *       The Login Glyph uses the login glyph from the il-icons font.
      *   effect: >
-     *       Clicking this Glyph will trigger the interaction to authenticate and login.
+     *       When placed in a Button or Link, clicking triggers the interaction to authenticate and login.
      *   rivals:
-     *       Logout Glyph: The Logout Glyph triggers the logout interaction.
+     *       Logout Glyph: The Logout Glyph symbolizes the logout interaction.
      *
      * context:
      *    - The Login Glyph appears in the Meta Bar.
@@ -1121,10 +1083,9 @@ public function language(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Login'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function login(?string $action = null): Glyph;
+    public function login(): Glyph;
 
     /**
      * ---
@@ -1135,9 +1096,9 @@ public function login(?string $action = null): Glyph;
      *   composition: >
      *       The Logout Glyph uses the logout glyph from the il-icons font.
      *   effect: >
-     *       Clicking this Glyph will trigger the interaction to logout.
+     *       When placed in a Button or Link, clicking triggers the interaction to logout.
      *   rivals:
-     *       Login Glyph: The Login Glyph triggers the login interaction.
+     *       Login Glyph: The Login Glyph symbolizes the login interaction.
      *
      * context:
      *    - The Logout Glyph appears in the Slate triggered by clicking on the User Avatar in the Meta Bar.
@@ -1149,10 +1110,9 @@ public function login(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Logout'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function logout(?string $action = null): Glyph;
+    public function logout(): Glyph;
 
     /**
      * ---
@@ -1163,7 +1123,7 @@ public function logout(?string $action = null): Glyph;
      *   composition: >
      *       The Bullet List Glyph uses the glyphicon-listbullet.
      *   effect: >
-     *       Clicking this glyph will group a list of entries with bullet points.
+     *       When placed in a Button or Link, clicking groups a list of entries with bullet points.
      *   rivals:
      *       Numbered List Glyph: The Numbered Glyph will group a list of entries with enumeration number.
      *
@@ -1175,10 +1135,9 @@ public function logout(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Bullet Point List'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function bulletlist(?string $action = null): Glyph;
+    public function bulletlist(): Glyph;
 
     /**
      * ---
@@ -1190,7 +1149,7 @@ public function bulletlist(?string $action = null): Glyph;
      *   composition: >
      *       The Numbered List Glyph uses the glyphicon-listnumbered.
      *   effect: >
-     *       Clicking this glyph will group a list of entries with enumeration number.
+     *       When placed in a Button or Link, clicking groups a list of entries with enumeration number.
      *   rivals:
      *       Bullet List Glyph: The Bullet Glyph will group a list of entries with bullet points.
      *
@@ -1204,10 +1163,9 @@ public function bulletlist(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Numbered List'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function numberedlist(?string $action = null): Glyph;
+    public function numberedlist(): Glyph;
 
     /**
      * ---
@@ -1219,7 +1177,7 @@ public function numberedlist(?string $action = null): Glyph;
      *   composition: >
      *       The Indent List Glyph uses the glyphicon-listindent.
      *   effect: >
-     *       Clicking this glyph will intend the content to the next subordinate level of the list.
+     *       When placed in a Button or Link, clicking indents the content to the next subordinate level of the list.
      *   rivals:
      *       Outdent Glyph: The Outend Glyph will reduce the indent to the next superordinate level of the list.
      *
@@ -1231,10 +1189,9 @@ public function numberedlist(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Increase Indent'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function listindent(?string $action = null): Glyph;
+    public function listindent(): Glyph;
 
     /**
      * ---
@@ -1245,7 +1202,7 @@ public function listindent(?string $action = null): Glyph;
      *   composition: >
      *       The Outdent List Glyph uses the glyphicon-listoutdent.
      *   effect: >
-     *       Clicking this glyph will outdent the content to the next superordinate level of the list.
+     *       When placed in a Button or Link, clicking outdents the content to the next superordinate level of the list.
      *   rivals:
      *       Indent Glyph: The Indent Glyph will increase the indentation to the next subordinate level of the list.
      *
@@ -1257,10 +1214,9 @@ public function listindent(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Decrease Indent'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function listoutdent(?string $action = null): Glyph;
+    public function listoutdent(): Glyph;
 
     /**
      * ---
@@ -1270,7 +1226,7 @@ public function listoutdent(?string $action = null): Glyph;
      *   composition: >
      *       The Filter Glyph uses the glyphicon-filter.
      *   effect: >
-     *       Clicking this glyph will filter a list of entries.
+     *       When placed in a Button or Link, clicking filters a list of entries.
      *   rivals:
      *       Search Glyph: The Search Glyph will open a search dialog  or will generate a list of entries according to the search input.
      *
@@ -1282,10 +1238,9 @@ public function listoutdent(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Filter'.
      * ---
-     * @param	string|null	$action
      * @return	\ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function filter(?string $action = null): Glyph;
+    public function filter(): Glyph;
 
     /**
      * ---
@@ -1299,10 +1254,10 @@ public function filter(?string $action = null): Glyph;
      *   composition: >
      *       The Collapse Horizontal Glyph is composed of a triangle pointing to the left.
      *   effect: >
-     *      Clicking the Collapse Horizontal Glyph hides the display of some Container Collection.
+     *      When placed in a Button or Link, clicking hides the display of some Container Collection.
      *      It might simultaneously trigger the display of another Container Collection.
      *   rivals:
-     *      Expand Glyph: The Expand Glyphs triggers the display of some Container Collection.
+     *      Expand Glyph: When placed in a Button or Link, the Expand Glyph triggers the display of some Container Collection.
      *      Collapse Glyph: The Collapse Glyph strongly indicates a Container positioned below.
      *      Previous Glyph: The Previous/Next Glyph opens a completely new view. It serves a navigational purpose.
      *
@@ -1315,10 +1270,9 @@ public function filter(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘collapse/back'.
      * ---
-     * @param string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function collapseHorizontal(?string $action = null): Glyph;
+    public function collapseHorizontal(): Glyph;
 
     /**
      * ---
@@ -1329,7 +1283,7 @@ public function collapseHorizontal(?string $action = null): Glyph;
      *   composition: >
      *       The Heading Glyph is composed of the letter H.
      *   effect: >
-     *      Clicking the Heading Glyph may insert or transform some text into a heading.
+     *      When placed in a Button or Link, clicking may insert or transform some text into a heading.
      *   rivals:
      *      Bold Glyph: should be used if the transformation should be bold.
      *      Italic Glyph: should be used if the transformation should be italic.
@@ -1343,10 +1297,9 @@ public function collapseHorizontal(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Insert Heading'.
      * ---
-     * @param string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function header(?string $action = null): Glyph;
+    public function header(): Glyph;
 
     /**
      * ---
@@ -1357,7 +1310,7 @@ public function header(?string $action = null): Glyph;
      *   composition: >
      *       The Italic Glyph is composed of the letter I.
      *   effect: >
-     *      Clicking the Italic Glyph may insert or transform some text into cursive one.
+     *      When placed in a Button or Link, clicking may insert or transform some text into cursive one.
      *   rivals:
      *      Bold Glyph: should be used if the transformation should be bold.
      *      Heading Glyph: should be used if the transformation should be a heading.
@@ -1371,10 +1324,9 @@ public function header(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Insert Italic'.
      * ---
-     * @param string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function italic(?string $action = null): Glyph;
+    public function italic(): Glyph;
 
     /**
      * ---
@@ -1385,7 +1337,7 @@ public function italic(?string $action = null): Glyph;
      *   composition: >
      *       The Bold Glyph is composed of the letter B.
      *   effect: >
-     *      Clicking the Bold Glyph may insert or transform some text into bold one.
+     *      When placed in a Button or Link, clicking may insert or transform some text into bold one.
      *   rivals:
      *      Italic Glyph: should be used if the transformation should be italic.
      *      Heading Glyph: should be used if the transformation should be a heading.
@@ -1399,10 +1351,9 @@ public function italic(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Insert Bold'.
      * ---
-     * @param string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function bold(?string $action = null): Glyph;
+    public function bold(): Glyph;
 
     /**
      * ---
@@ -1414,7 +1365,7 @@ public function bold(?string $action = null): Glyph;
      *       The Link Glyph is composed out of two linked chain-pieces that ilustrate the official
      *       URL symbol.
      *   effect: >
-     *      Clicking the Link Glyph may insert or transform some text into bold one.
+     *      When placed in a Button or Link, clicking may insert or transform some text into a link.
      *   rivals:
      *      Italic Glyph: should be used if the transformation should be italic.
      *      Heading Glyph: should be used if the transformation should be a heading.
@@ -1428,10 +1379,9 @@ public function bold(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be ‘Insert Link'.
      * ---
-     * @param string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function link(?string $action = null): Glyph;
+    public function link(): Glyph;
 
     /**
      * ---
@@ -1442,7 +1392,7 @@ public function link(?string $action = null): Glyph;
      *   composition: >
      *      The Launch Glyph uses the glyphicon plane.
      *   effect: >
-     *      Clicking the Launch Glyph will immediately start or continue the process; this
+     *      When placed in a Button or Link, clicking will immediately start or continue the process; this
      *      may manifest as a Modal to open or the redirection to the appropriate Page.
      * context:
      *    -  The Launch Glyph appears in the Launcher's Bulky Button.
@@ -1454,10 +1404,9 @@ public function link(?string $action = null): Glyph;
      *       1: The LAUNCH Glyph MUST NOT be used for mere navigation; focus is on
      *         a process to start, which means altering a user's relation to some object.
      * ---
-     * @param   string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function launch(?string $action = null): Glyph;
+    public function launch(): Glyph;
 
     /**
      * ---
@@ -1467,7 +1416,7 @@ public function launch(?string $action = null): Glyph;
      *   composition: >
      *      The Enlarge Glyph uses the glyphicon-enlarge.
      *   effect: >
-     *      A click on the Enlarge glyph triggers an interaction that displays an enlarged version of the content just seen.
+     *      When placed in a Button or Link, clicking triggers an interaction that displays an enlarged version of the content just seen.
      *      This can be a modal with an enlarged display of an image.
      *   rivals:
      *      Preview Glyph: >
@@ -1480,10 +1429,9 @@ public function launch(?string $action = null): Glyph;
      *          The aria-label MUST be 'Enlarge'.
      *   usage:
      * ---
-     * @param   string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function enlarge(?string $action = null): Glyph;
+    public function enlarge(): Glyph;
 
     /**
      * ---
@@ -1494,7 +1442,7 @@ public function enlarge(?string $action = null): Glyph;
      *   composition: >
      *      The List View Glyph uses the glyphicon-ListView.
      *   effect: >
-     *      Clicking on the List View glyph displays the collection of data as a list.
+     *      When placed in a Button or Link, clicking displays the collection of data as a list.
      *   rivals:
      *      TileView Glyph: >
      *         The Tile View Glyph will display data in a grid view.
@@ -1505,10 +1453,9 @@ public function enlarge(?string $action = null): Glyph;
      *   usage:
      *       1: The List View Glyph SHOULD not come without a Tile View Glyph and vice versa.
      * ---
-     * @param   string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function listView(?string $action = null): Glyph;
+    public function listView(): Glyph;
 
     /**
      * ---
@@ -1531,10 +1478,9 @@ public function listView(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Preview'.
      * ---
-     * @param   string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function preview(?string $action = null): Glyph;
+    public function preview(): Glyph;
 
     /**
      * ---
@@ -1555,10 +1501,9 @@ public function preview(?string $action = null): Glyph;
      *   usage:
      *       1: The Sort Glyph SHOULD NOT be used to display the selected sort option.
      * ---
-     * @param   string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function sort(?string $action = null): Glyph;
+    public function sort(): Glyph;
 
     /**
      * ---
@@ -1577,10 +1522,9 @@ public function sort(?string $action = null): Glyph;
      *       1: >
      *          The aria-label MUST be 'Column Selection'.
      * ---
-     * @param   string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function columnSelection(?string $action = null): Glyph;
+    public function columnSelection(): Glyph;
 
     /**
      * ---
@@ -1604,10 +1548,9 @@ public function columnSelection(?string $action = null): Glyph;
      *   usage:
      *       1: The Tile View Glyph SHOULD not come without a ListView Glyph and vice versa.
      * ---
-     * @param   string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function tileView(?string $action = null): Glyph;
+    public function tileView(): Glyph;
 
     /**
      * ---
@@ -1637,10 +1580,9 @@ public function tileView(?string $action = null): Glyph;
      *   usage:
      *       1: The Drag Glyph SHOULD be positioned near the corners of a draggable element.
      * ---
-     * @param   string|null $action
      * @return  \ILIAS\UI\Component\Symbol\Glyph\Glyph
      */
-    public function dragHandle(?string $action = null): Glyph;
+    public function dragHandle(): Glyph;
 
     /**
      * ---
diff --git a/components/ILIAS/UI/src/Component/Symbol/Glyph/Glyph.php b/components/ILIAS/UI/src/Component/Symbol/Glyph/Glyph.php
index e965297f9334..40bc0fe6b384 100755
--- a/components/ILIAS/UI/src/Component/Symbol/Glyph/Glyph.php
+++ b/components/ILIAS/UI/src/Component/Symbol/Glyph/Glyph.php
@@ -21,11 +21,9 @@
 namespace ILIAS\UI\Component\Symbol\Glyph;
 
 use ILIAS\UI\Component\Counter\Counter;
-use ILIAS\UI\Component\Clickable;
 use ILIAS\UI\Component\Symbol\Symbol;
-use ILIAS\UI\Component\Signal;
 
-interface Glyph extends Symbol, Clickable
+interface Glyph extends Symbol
 {
     // Types of glyphs:
     public const SETTINGS = "settings";
@@ -94,12 +92,6 @@ interface Glyph extends Symbol, Clickable
      */
     public function getType(): string;
 
-    /**
-     * Get the action on the glyph.
-     * @deprecated with 10 - use a Button with a Glyph as label
-     */
-    public function getAction(): ?string;
-
     /**
      * Get all counters attached to this glyph.
      *
@@ -124,46 +116,4 @@ public function isHighlighted(): bool;
      * Get a Glyph like this with a highlight.
      */
     public function withHighlight(): Glyph;
-
-    /**
-     * Get to know if the glyph is activated.
-     * @deprecated with 10 - use a Button with a Glyph as label
-     */
-    public function isActive(): bool;
-
-    /**
-     * Get a glyph like this, but action should be unavailable atm.
-     *
-     * The glyph will still have an action afterwards, this might be useful
-     * at some point where we want to reactivate the glyph client side.
-     * @deprecated with 10; use a Button with a Glyph as label
-     */
-    public function withUnavailableAction(): Glyph;
-
-    /**
-     * Get a Glyph like this with an action.
-     * @deprecated with 10; use a Button with a Glyph as label
-     */
-    public function withAction(string $action): Glyph;
-
-    /** @deprecated will be removed in ILIAS 11. please use a Button instead. */
-    public function withOnClick(Signal $signal);
-
-    /** @deprecated will be removed in ILIAS 11. please use a Button instead. */
-    public function appendOnClick(Signal $signal);
-
-    /** @deprecated will be removed in ILIAS 11. please use a Button instead. */
-    public function withResetTriggeredSignals();
-
-    /** @deprecated will be removed in ILIAS 11. please use a Button instead. */
-    public function getTriggeredSignals(): array;
-
-    /** @deprecated will be removed in ILIAS 11. please use a Button instead. */
-    public function withOnLoadCode(\Closure $binder);
-
-    /** @deprecated will be removed in ILIAS 11. please use a Button instead. */
-    public function withAdditionalOnLoadCode(\Closure $binder);
-
-    /** @deprecated will be removed in ILIAS 11. please use a Button instead. */
-    public function getOnLoadCode(): ?\Closure;
 }
diff --git a/components/ILIAS/UI/src/Implementation/Component/Input/Field/FilterContextRenderer.php b/components/ILIAS/UI/src/Implementation/Component/Input/Field/FilterContextRenderer.php
index 47295fd44c77..5957c897ec47 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Input/Field/FilterContextRenderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Input/Field/FilterContextRenderer.php
@@ -143,10 +143,8 @@ protected function wrapInFilterContext(
         $f = $this->getUIFactory();
         $tpl = $this->getTemplate("tpl.context_filter.html", true, true);
 
-        /**
-         * @var $remove_glyph Component\Symbol\Glyph\Glyph
-         */
-        $remove_glyph = $f->symbol()->glyph()->remove("")->withAdditionalOnLoadCode(fn($id) => "$('#$id').on('click', function(event) {
+        $remove_glyph = $f->button()->shy('', '#')->withSymbol($f->symbol()->glyph()->remove())
+            ->withAdditionalOnLoadCode(fn($id) => "$('#$id').on('click', function(event) {
 							il.UI.filter.onRemoveClick(event, '$id');
 							return false; // stop event propagation
 					});");
diff --git a/components/ILIAS/UI/src/Implementation/Component/Input/Field/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/Input/Field/Renderer.php
index 32efdfe51018..e3c886b72c93 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Input/Field/Renderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Input/Field/Renderer.php
@@ -466,13 +466,13 @@ protected function renderPasswordField(F\Password $component, RendererInterface
             });
 
             $f = $this->getUIFactory();
-            $glyph_reveal = $f->symbol()->glyph()->eyeopen("#")
-                              ->withOnClick($sig_reveal);
-            $glyph_mask = $f->symbol()->glyph()->eyeclosed("#")
-                            ->withOnClick($sig_mask);
+            $btn_reveal = $f->button()->shy( '', '#')->withSymbol($f->symbol()->glyph()->eyeopen())
+                ->withOnClick($sig_reveal);
+            $btn_mask = $f->button()->shy('', '#')->withSymbol($f->symbol()->glyph()->eyeclosed())
+               ->withOnClick($sig_mask);
 
-            $tpl->setVariable('PASSWORD_REVEAL', $default_renderer->render($glyph_reveal));
-            $tpl->setVariable('PASSWORD_MASK', $default_renderer->render($glyph_mask));
+            $tpl->setVariable('PASSWORD_REVEAL', $default_renderer->render($btn_reveal));
+            $tpl->setVariable('PASSWORD_MASK', $default_renderer->render($btn_mask));
         }
 
         $this->applyValue($component, $tpl, $this->escapeSpecialChars());
@@ -571,10 +571,6 @@ static function ($id) use ($component): string {
         ];
 
         foreach ($markdown_actions_glyphs as $tpl_variable => $glyph) {
-            if ($component->isDisabled()) {
-                $glyph = $glyph->withUnavailableAction();
-            }
-
             $action = $this->getUIFactory()->button()->standard('', '#')->withSymbol($glyph);
 
             if ($component->isDisabled()) {
@@ -1012,9 +1008,10 @@ protected function renderFilePreview(
         ?FileInfoResult $file_info,
         Template $template
     ): Template {
+        $f = $this->getUIFactory();
         $template->setCurrentBlock('block_file_preview');
         $template->setVariable('REMOVAL_GLYPH', $default_renderer->render(
-            $this->getUIFactory()->symbol()->glyph()->close()->withAction("#")
+            $f->button()->shy( '', '#')->withSymbol($f->symbol()->glyph()->close())
         ));
 
         if (null !== $file_info) {
@@ -1029,10 +1026,10 @@ protected function renderFilePreview(
         // contains actual (unhidden) inputs.
         if ($file_input->hasMetadataInputs()) {
             $template->setVariable('EXPAND_GLYPH', $default_renderer->render(
-                $this->getUIFactory()->symbol()->glyph()->expand()->withAction("#")
+                $f->button()->shy( '', '#')->withSymbol($f->symbol()->glyph()->expand())
             ));
             $template->setVariable('COLLAPSE_GLYPH', $default_renderer->render(
-                $this->getUIFactory()->symbol()->glyph()->collapse()->withAction("#")
+                $f->button()->shy('', '#')->withSymbol($f->symbol()->glyph()->collapse())
             ));
         }
 
diff --git a/components/ILIAS/UI/src/Implementation/Component/Link/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/Link/Renderer.php
index 684f5bea8783..4aa9e2db0f24 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Link/Renderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Link/Renderer.php
@@ -35,7 +35,7 @@ class Renderer extends AbstractComponentRenderer
     public function render(Component\Component $component, RendererInterface $default_renderer): string
     {
         if ($component instanceof Component\Link\Standard) {
-            return $this->renderStandard($component);
+            return $this->renderStandard($component, $default_renderer);
         }
         if ($component instanceof Component\Link\Bulky) {
             return $this->renderBulky($component, $default_renderer);
@@ -96,10 +96,25 @@ protected function maybeRenderWithTooltip(Component\Link\Link $component, Templa
     }
 
     protected function renderStandard(
-        Component\Link\Standard $component
+        Component\Link\Standard $component,
+        RendererInterface $default_renderer
     ): string {
         $tpl_name = "tpl.standard.html";
         $tpl = $this->setStandardVars($tpl_name, $component);
+        $symbol = $component->getSymbol();
+        if ($symbol !== null) {
+            if ($component->getLabel() !== '') {
+                $symbol = $symbol->withLabel('');
+            }
+            $tpl->setCurrentBlock("symbol");
+            $tpl->setVariable("SYMBOL", $default_renderer->render($symbol));
+            $tpl->parseCurrentBlock();
+            if ($component->getLabel() === '') {
+                $tpl->setCurrentBlock("with_aria_label");
+                $tpl->setVariable("ARIA_LABEL", $this->txt($symbol->getLabel()));
+                $tpl->parseCurrentBlock();
+            }
+        }
         return $this->maybeRenderWithTooltip($component, $tpl);
     }
 
diff --git a/components/ILIAS/UI/src/Implementation/Component/Link/Standard.php b/components/ILIAS/UI/src/Implementation/Component/Link/Standard.php
index bca61dc5b1b5..b3a573162539 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Link/Standard.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Link/Standard.php
@@ -21,10 +21,12 @@
 namespace ILIAS\UI\Implementation\Component\Link;
 
 use ILIAS\UI\Component as C;
+use ILIAS\UI\Component\Symbol\Symbol;
 
 class Standard extends Link implements C\Link\Standard
 {
     protected string $label;
+    protected ?Symbol $symbol = null;
 
     public function __construct(string $label, string $action)
     {
@@ -39,4 +41,22 @@ public function getLabel(): string
     {
         return $this->label;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSymbol(): ?Symbol
+    {
+        return $this->symbol;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function withSymbol(?Symbol $symbol): C\Link\Standard
+    {
+        $clone = clone $this;
+        $clone->symbol = $symbol;
+        return $clone;
+    }
 }
diff --git a/components/ILIAS/UI/src/Implementation/Component/MainControls/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/MainControls/Renderer.php
index 3090a385c6c7..bfc8801fbc94 100755
--- a/components/ILIAS/UI/src/Implementation/Component/MainControls/Renderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/MainControls/Renderer.php
@@ -222,7 +222,8 @@ protected function renderMainbar(MainBar $component, RendererInterface $default_
         }
 
         //disengage all, close slates
-        $btn_disengage = $f->button()->bulky($f->symbol()->glyph()->collapseHorizontal("#"), $this->txt('close'), "#")
+        $btn_disengage = $f->button()->shy($this->txt('close'), "#")
+            ->withSymbol($f->symbol()->glyph()->collapseHorizontal())
             ->withOnClick($component->getDisengageAllSignal());
         $tpl->setVariable("CLOSE_SLATES", $default_renderer->render($btn_disengage));
 
@@ -291,12 +292,16 @@ function ($id) use ($signals) {
 
     protected function renderModeInfo(ModeInfo $component, RendererInterface $default_renderer): string
     {
+        $f = $this->getUIFactory();
         $tpl = $this->getTemplate("tpl.mode_info.html", true, true);
         $tpl->setVariable('MODE_TITLE', $component->getModeTitle());
         $base_URI = $component->getCloseAction()->getBaseURI();
         $query = $component->getCloseAction()->getQuery();
         $action = $base_URI . '?' . $query;
-        $close = $this->getUIFactory()->symbol()->glyph()->close($action);
+        $close = $f->link()->standard(
+            '',
+            $action,
+        )->withSymbol($f->symbol()->glyph()->close());
         $tpl->setVariable('CLOSE_GLYPH', $default_renderer->render($close));
 
         return $tpl->get();
@@ -321,15 +326,15 @@ protected function renderSystemInfo(
                 break;
         }
         if ($component->isDismissable()) {
-            $close = $this->getUIFactory()->symbol()->glyph()->close("#");
             $signal = $component->getCloseSignal();
-            $close = $close->withOnClick($signal);
+            $close = $this->getUIFactory()->button()->close()->withOnClick($signal);
             $tpl->setVariable('CLOSE_BUTTON', $default_renderer->render($close));
             $tpl->setVariable('CLOSE_URI', (string) $component->getDismissAction());
             $component = $component->withAdditionalOnLoadCode(fn($id) => "$(document).on('$signal', function() { il.UI.maincontrols.system_info.close('$id'); });");
         }
 
-        $more = $this->getUIFactory()->symbol()->glyph()->more("#");
+        $more = $this->getUIFactory()->button()->shy($this->txt('show_more'), '#')
+        ->withSymbol($this->getUIFactory()->symbol()->glyph()->more());
         $tpl->setVariable('MORE_BUTTON', $default_renderer->render($more));
 
         $component = $component->withAdditionalOnLoadCode(fn($id) => "il.UI.maincontrols.system_info.init('$id')");
diff --git a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Factory.php b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Factory.php
index ce6025400941..c55ad835f9cd 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Factory.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Factory.php
@@ -24,294 +24,294 @@
 
 class Factory implements G\Factory
 {
-    public function settings(?string $action = null): Glyph
+    public function settings(): Glyph
     {
-        return new Glyph(G\Glyph::SETTINGS, "settings", $action);
+        return new Glyph(G\Glyph::SETTINGS, "settings");
     }
 
-    public function collapse(?string $action = null): Glyph
+    public function collapse(): Glyph
     {
-        return new Glyph(G\Glyph::COLLAPSE, "collapse_content", $action);
+        return new Glyph(G\Glyph::COLLAPSE, "collapse_content");
     }
 
-    public function expand(?string $action = null): Glyph
+    public function expand(): Glyph
     {
-        return new Glyph(G\Glyph::EXPAND, "expand_content", $action);
+        return new Glyph(G\Glyph::EXPAND, "expand_content");
     }
 
-    public function add(?string $action = null): Glyph
+    public function add(): Glyph
     {
-        return new Glyph(G\Glyph::ADD, "add", $action);
+        return new Glyph(G\Glyph::ADD, "add");
     }
 
-    public function remove(?string $action = null): Glyph
+    public function remove(): Glyph
     {
-        return new Glyph(G\Glyph::REMOVE, "remove", $action);
+        return new Glyph(G\Glyph::REMOVE, "remove");
     }
 
-    public function up(?string $action = null): Glyph
+    public function up(): Glyph
     {
-        return new Glyph(G\Glyph::UP, "up", $action);
+        return new Glyph(G\Glyph::UP, "up");
     }
 
-    public function down(?string $action = null): Glyph
+    public function down(): Glyph
     {
-        return new Glyph(G\Glyph::DOWN, "down", $action);
+        return new Glyph(G\Glyph::DOWN, "down");
     }
 
-    public function back(?string $action = null): Glyph
+    public function back(): Glyph
     {
-        return new Glyph(G\Glyph::BACK, "back", $action);
+        return new Glyph(G\Glyph::BACK, "back");
     }
 
-    public function next(?string $action = null): Glyph
+    public function next(): Glyph
     {
-        return new Glyph(G\Glyph::NEXT, "next", $action);
+        return new Glyph(G\Glyph::NEXT, "next");
     }
 
-    public function sortAscending(?string $action = null): Glyph
+    public function sortAscending(): Glyph
     {
-        return new Glyph(G\Glyph::SORT_ASCENDING, "sort_ascending", $action);
+        return new Glyph(G\Glyph::SORT_ASCENDING, "sort_ascending");
     }
 
-    public function briefcase(?string $action = null): Glyph
+    public function briefcase(): Glyph
     {
-        return new Glyph(G\Glyph::BRIEFCASE, "briefcase", $action);
+        return new Glyph(G\Glyph::BRIEFCASE, "briefcase");
     }
 
-    public function sortDescending(?string $action = null): Glyph
+    public function sortDescending(): Glyph
     {
-        return new Glyph(G\Glyph::SORT_DESCENDING, "sort_descending", $action);
+        return new Glyph(G\Glyph::SORT_DESCENDING, "sort_descending");
     }
 
-    public function user(?string $action = null): Glyph
+    public function user(): Glyph
     {
-        return new Glyph(G\Glyph::USER, "show_who_is_online", $action);
+        return new Glyph(G\Glyph::USER, "show_who_is_online");
     }
 
-    public function mail(?string $action = null): Glyph
+    public function mail(): Glyph
     {
-        return new Glyph(G\Glyph::MAIL, "mail", $action);
+        return new Glyph(G\Glyph::MAIL, "mail");
     }
 
-    public function notification(?string $action = null): Glyph
+    public function notification(): Glyph
     {
-        return new Glyph(G\Glyph::NOTIFICATION, "notifications", $action);
+        return new Glyph(G\Glyph::NOTIFICATION, "notifications");
     }
 
-    public function tag(?string $action = null): Glyph
+    public function tag(): Glyph
     {
-        return new Glyph(G\Glyph::TAG, "tags", $action);
+        return new Glyph(G\Glyph::TAG, "tags");
     }
 
-    public function note(?string $action = null): Glyph
+    public function note(): Glyph
     {
-        return new Glyph(G\Glyph::NOTE, "notes", $action);
+        return new Glyph(G\Glyph::NOTE, "notes");
     }
 
-    public function comment(?string $action = null): Glyph
+    public function comment(): Glyph
     {
-        return new Glyph(G\Glyph::COMMENT, "comments", $action);
+        return new Glyph(G\Glyph::COMMENT, "comments");
     }
 
-    public function like(?string $action = null): Glyph
+    public function like(): Glyph
     {
-        return new Glyph(G\Glyph::LIKE, "like", $action);
+        return new Glyph(G\Glyph::LIKE, "like");
     }
 
-    public function love(?string $action = null): Glyph
+    public function love(): Glyph
     {
-        return new Glyph(G\Glyph::LOVE, "love", $action);
+        return new Glyph(G\Glyph::LOVE, "love");
     }
 
-    public function dislike(?string $action = null): Glyph
+    public function dislike(): Glyph
     {
-        return new Glyph(G\Glyph::DISLIKE, "dislike", $action);
+        return new Glyph(G\Glyph::DISLIKE, "dislike");
     }
 
-    public function laugh(?string $action = null): Glyph
+    public function laugh(): Glyph
     {
-        return new Glyph(G\Glyph::LAUGH, "laugh", $action);
+        return new Glyph(G\Glyph::LAUGH, "laugh");
     }
 
-    public function astounded(?string $action = null): Glyph
+    public function astounded(): Glyph
     {
-        return new Glyph(G\Glyph::ASTOUNDED, "astounded", $action);
+        return new Glyph(G\Glyph::ASTOUNDED, "astounded");
     }
 
-    public function sad(?string $action = null): Glyph
+    public function sad(): Glyph
     {
-        return new Glyph(G\Glyph::SAD, "sad", $action);
+        return new Glyph(G\Glyph::SAD, "sad");
     }
 
-    public function angry(?string $action = null): Glyph
+    public function angry(): Glyph
     {
-        return new Glyph(G\Glyph::ANGRY, "angry", $action);
+        return new Glyph(G\Glyph::ANGRY, "angry");
     }
 
-    public function eyeopen(?string $action = null): Glyph
+    public function eyeopen(): Glyph
     {
-        return new Glyph(G\Glyph::EYEOPEN, "eyeopened", $action);
+        return new Glyph(G\Glyph::EYEOPEN, "eyeopened");
     }
 
-    public function eyeclosed(?string $action = null): Glyph
+    public function eyeclosed(): Glyph
     {
-        return new Glyph(G\Glyph::EYECLOSED, "eyeclosed", $action);
+        return new Glyph(G\Glyph::EYECLOSED, "eyeclosed");
     }
 
-    public function attachment(?string $action = null): Glyph
+    public function attachment(): Glyph
     {
-        return new Glyph(G\Glyph::ATTACHMENT, "attachment", $action);
+        return new Glyph(G\Glyph::ATTACHMENT, "attachment");
     }
 
-    public function reset(?string $action = null): Glyph
+    public function reset(): Glyph
     {
-        return new Glyph(G\Glyph::RESET, "reset", $action);
+        return new Glyph(G\Glyph::RESET, "reset");
     }
 
-    public function apply(?string $action = null): Glyph
+    public function apply(): Glyph
     {
-        return new Glyph(G\Glyph::APPLY, "apply", $action);
+        return new Glyph(G\Glyph::APPLY, "apply");
     }
 
-    public function search(?string $action = null): Glyph
+    public function search(): Glyph
     {
-        return new Glyph(G\Glyph::SEARCH, "search", $action);
+        return new Glyph(G\Glyph::SEARCH, "search");
     }
 
-    public function help(?string $action = null): Glyph
+    public function help(): Glyph
     {
-        return new Glyph(G\Glyph::HELP, "help", $action);
+        return new Glyph(G\Glyph::HELP, "help");
     }
 
-    public function calendar($action = null): Glyph
+    public function calendar(): Glyph
     {
-        return new Glyph(G\Glyph::CALENDAR, "calendar", $action);
+        return new Glyph(G\Glyph::CALENDAR, "calendar");
     }
 
-    public function time($action = null): Glyph
+    public function time(): Glyph
     {
-        return new Glyph(G\Glyph::TIME, "time", $action);
+        return new Glyph(G\Glyph::TIME, "time");
     }
 
-    public function close($action = null): Glyph
+    public function close(): Glyph
     {
-        return new Glyph(G\Glyph::CLOSE, "close", $action);
+        return new Glyph(G\Glyph::CLOSE, "close");
     }
 
-    public function more($action = null): Glyph
+    public function more(): Glyph
     {
-        return new Glyph(G\Glyph::MORE, "show_more", $action);
+        return new Glyph(G\Glyph::MORE, "show_more");
     }
 
-    public function disclosure($action = null): Glyph
+    public function disclosure(): Glyph
     {
-        return new Glyph(G\Glyph::DISCLOSURE, "disclose", $action);
+        return new Glyph(G\Glyph::DISCLOSURE, "disclose");
     }
 
-    public function language(?string $action = null): Glyph
+    public function language(): Glyph
     {
-        return new Glyph(G\Glyph::LANGUAGE, "switch_language", $action);
+        return new Glyph(G\Glyph::LANGUAGE, "switch_language");
     }
 
-    public function login(?string $action = null): Glyph
+    public function login(): Glyph
     {
-        return new Glyph(G\Glyph::LOGIN, "log_in", $action);
+        return new Glyph(G\Glyph::LOGIN, "log_in");
     }
 
-    public function logout(?string $action = null): Glyph
+    public function logout(): Glyph
     {
-        return new Glyph(G\Glyph::LOGOUT, "log_out", $action);
+        return new Glyph(G\Glyph::LOGOUT, "log_out");
     }
 
-    public function bulletlist(?string $action = null): Glyph
+    public function bulletlist(): Glyph
     {
-        return new Glyph(G\Glyph::BULLETLIST, "bulletlist_action", $action);
+        return new Glyph(G\Glyph::BULLETLIST, "bulletlist_action");
     }
 
-    public function numberedlist(?string $action = null): Glyph
+    public function numberedlist(): Glyph
     {
-        return new Glyph(G\Glyph::NUMBEREDLIST, "numberedlist_action", $action);
+        return new Glyph(G\Glyph::NUMBEREDLIST, "numberedlist_action");
     }
 
-    public function listindent(?string $action = null): Glyph
+    public function listindent(): Glyph
     {
-        return new Glyph(G\Glyph::LISTINDENT, "listindent", $action);
+        return new Glyph(G\Glyph::LISTINDENT, "listindent");
     }
 
-    public function listoutdent(?string $action = null): Glyph
+    public function listoutdent(): Glyph
     {
-        return new Glyph(G\Glyph::LISTOUTDENT, "listoutdent", $action);
+        return new Glyph(G\Glyph::LISTOUTDENT, "listoutdent");
     }
 
-    public function filter(?string $action = null): Glyph
+    public function filter(): Glyph
     {
-        return new Glyph(G\Glyph::FILTER, "filter", $action);
+        return new Glyph(G\Glyph::FILTER, "filter");
     }
 
-    public function collapseHorizontal(?string $action = null): Glyph
+    public function collapseHorizontal(): Glyph
     {
-        return new Glyph(G\Glyph::COLLAPSE_HORIZONTAL, "collapse/back", $action);
+        return new Glyph(G\Glyph::COLLAPSE_HORIZONTAL, "collapse/back");
     }
 
-    public function header(?string $action = null): Glyph
+    public function header(): Glyph
     {
-        return new Glyph(G\Glyph::HEADER, "header_action", $action);
+        return new Glyph(G\Glyph::HEADER, "header_action");
     }
 
-    public function italic(?string $action = null): Glyph
+    public function italic(): Glyph
     {
-        return new Glyph(G\Glyph::ITALIC, "italic_action", $action);
+        return new Glyph(G\Glyph::ITALIC, "italic_action");
     }
 
-    public function bold(?string $action = null): Glyph
+    public function bold(): Glyph
     {
-        return new Glyph(G\Glyph::BOLD, "bold_action", $action);
+        return new Glyph(G\Glyph::BOLD, "bold_action");
     }
 
-    public function link(?string $action = null): Glyph
+    public function link(): Glyph
     {
-        return new Glyph(G\Glyph::LINK, "link_action", $action);
+        return new Glyph(G\Glyph::LINK, "link_action");
     }
 
-    public function launch(?string $action = null): Glyph
+    public function launch(): Glyph
     {
-        return new Glyph(G\Glyph::LAUNCH, "launch", $action);
+        return new Glyph(G\Glyph::LAUNCH, "launch");
     }
 
-    public function enlarge(?string $action = null): Glyph
+    public function enlarge(): Glyph
     {
-        return new Glyph(G\Glyph::ENLARGE, "enlarge", $action);
+        return new Glyph(G\Glyph::ENLARGE, "enlarge");
     }
 
-    public function listView(?string $action = null): Glyph
+    public function listView(): Glyph
     {
-        return new Glyph(G\Glyph::LIST_VIEW, "list_view", $action);
+        return new Glyph(G\Glyph::LIST_VIEW, "list_view");
     }
 
-    public function preview(?string $action = null): Glyph
+    public function preview(): Glyph
     {
-        return new Glyph(G\Glyph::PREVIEW, "preview", $action);
+        return new Glyph(G\Glyph::PREVIEW, "preview");
     }
 
-    public function sort(?string $action = null): Glyph
+    public function sort(): Glyph
     {
-        return new Glyph(G\Glyph::SORT, "sort", $action);
+        return new Glyph(G\Glyph::SORT, "sort");
     }
 
-    public function columnSelection(?string $action = null): Glyph
+    public function columnSelection(): Glyph
     {
-        return new Glyph(G\Glyph::COLUMN_SELECTION, "column_selection", $action);
+        return new Glyph(G\Glyph::COLUMN_SELECTION, "column_selection");
     }
 
-    public function tileView(?string $action = null): Glyph
+    public function tileView(): Glyph
     {
-        return new Glyph(G\Glyph::TILE_VIEW, "tile_view", $action);
+        return new Glyph(G\Glyph::TILE_VIEW, "tile_view");
     }
 
-    public function dragHandle(?string $action = null): G\Glyph
+    public function dragHandle(): G\Glyph
     {
-        return new Glyph(G\Glyph::DRAG_HANDLE, "drag_handle", $action);
+        return new Glyph(G\Glyph::DRAG_HANDLE, "drag_handle");
     }
 
     public function checked(): G\Glyph
diff --git a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Glyph.php b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Glyph.php
index e43d6e4a574c..2f5836091f39 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Glyph.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Glyph.php
@@ -22,16 +22,13 @@
 
 use ILIAS\UI\Component as C;
 use ILIAS\UI\Component\Counter\Counter;
-use ILIAS\UI\Component\Signal;
 use ILIAS\UI\Implementation\Component\ComponentHelper;
 use ILIAS\UI\Implementation\Component\JavaScriptBindable;
-use ILIAS\UI\Implementation\Component\Triggerer;
 
 class Glyph implements C\Symbol\Glyph\Glyph
 {
     use ComponentHelper;
     use JavaScriptBindable;
-    use Triggerer;
 
     private static array $types = [
         self::SETTINGS,
@@ -97,20 +94,16 @@ class Glyph implements C\Symbol\Glyph\Glyph
     ];
 
     private string $type;
-    private ?string $action;
     private string $label;
     private array $counters;
     private bool $highlighted;
-    private bool $active = true;
 
-    public function __construct(string $type, string $label, ?string $action = null)
+    public function __construct(string $type, string $label)
     {
         $this->checkArgIsElement("type", $type, self::$types, "glyph type");
 
         $this->type = $type;
         $this->label = $label;
-        // @deprecated with 10 - parameter $action will be removed; use a Button with a Glyph as label
-        $this->action = $action;
         $this->counters = array();
         $this->highlighted = false;
     }
@@ -132,14 +125,6 @@ public function withLabel(string $label): self
         return $clone;
     }
 
-    /**
-     * @deprecated with 10; use a Button with a Glyph as label
-     */
-    public function getAction(): ?string
-    {
-        return $this->action;
-    }
-
     public function getCounters(): array
     {
         return array_values($this->counters);
@@ -164,57 +149,4 @@ public function withHighlight(): C\Symbol\Glyph\Glyph
         return $clone;
     }
 
-    /**
-     * @deprecated with 10; use a Button with a Glyph as label
-     */
-    public function isActive(): bool
-    {
-        return $this->active;
-    }
-
-    /**
-     * @deprecated with 10; use a Button with a Glyph as label
-     */
-    public function withUnavailableAction(): C\Symbol\Glyph\Glyph
-    {
-        $clone = clone $this;
-        $clone->active = false;
-        return $clone;
-    }
-
-    /**
-     * @deprecated with 10; use a Button with a Glyph as label
-     */
-    public function withOnClick(Signal $signal): C\Clickable
-    {
-        return $this->withTriggeredSignal($signal, 'click');
-    }
-
-    /**
-     * @deprecated with 10; use a Button with a Glyph as label
-     */
-    public function appendOnClick(Signal $signal): C\Clickable
-    {
-        return $this->appendTriggeredSignal($signal, 'click');
-    }
-
-    /**
-    * @deprecated with 10; use a Button with a Glyph as label
-    */
-    public function withAction($action): C\Symbol\Glyph\Glyph
-    {
-        $clone = clone $this;
-        $clone->action = $action;
-        return $clone;
-    }
-
-    /**
-     * @deprecated with 10; use a Button with a Glyph as label
-     */
-    public function isTabbable(): bool
-    {
-        $has_action = ($this->action !== null && $this->action !== "");
-        $has_signal = isset($this->triggered_signals['click']) && $this->triggered_signals['click'] !== null;
-        return  ($has_signal || $has_action) && $this->isActive();
-    }
 }
diff --git a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php
index 83195849394c..b8552a1d1b9b 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php
@@ -43,40 +43,15 @@ public function render(Component\Component $component, RendererInterface $defaul
             $this->cannotHandleComponent($component);
         }
 
-        /** @var $component Component\Symbol\Glyph\Glyph */
-        $component = $this->addTriggererOnLoadCode($component);
-
         $tpl_file = $this->getTemplateFilename();
         $tpl = $this->getTemplate($tpl_file, true, true);
 
-        $tpl = $this->renderAction($component, $tpl);
-
-        if ($component->isTabbable() && !$this instanceof ButtonContextRenderer) { // Buttons are already tabbable itself
-            $tpl->touchBlock("tabbable");
-        }
-
         if ($component->isHighlighted()) {
             $tpl->touchBlock("highlighted");
         }
 
-        if (!$component->isActive()) {
-            $tpl->touchBlock("disabled");
-
-            $tpl->setCurrentBlock("with_aria_disabled");
-            $tpl->setVariable("ARIA_DISABLED", "true");
-            $tpl->parseCurrentBlock();
-        }
-
         $tpl = $this->renderLabel($component, $tpl);
 
-        $id = $this->bindJavaScript($component);
-
-        if ($id !== null) {
-            $tpl->setCurrentBlock("with_id");
-            $tpl->setVariable("ID", $id);
-            $tpl->parseCurrentBlock();
-        }
-
         $tpl->setVariable("GLYPH", $this->getInnerGlyphHTML($component, $default_renderer));
         return $tpl->get();
     }
@@ -87,17 +62,6 @@ protected function renderLabel(Component\Component $component, Template $tpl): T
         return $tpl;
     }
 
-    protected function renderAction(Component\Component $component, Template $tpl): Template
-    {
-        $action = $component->getAction();
-        if ($component->isActive() && $action !== null) {
-            $tpl->setCurrentBlock("with_action");
-            $tpl->setVariable("ACTION", $component->getAction());
-            $tpl->parseCurrentBlock();
-        }
-        return $tpl;
-    }
-
     protected function getInnerGlyphHTML(Component\Component $component, RendererInterface $default_renderer): string
     {
         $tpl = $this->getTemplate('tpl.glyph.html', true, true);
diff --git a/components/ILIAS/UI/src/Implementation/Component/Table/Column/Boolean.php b/components/ILIAS/UI/src/Implementation/Component/Table/Column/Boolean.php
index 0eb8cd104f07..1fb3846f5c6c 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Table/Column/Boolean.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Table/Column/Boolean.php
@@ -36,15 +36,6 @@ public function __construct(
         protected string|Icon|Glyph $false_option
     ) {
         parent::__construct($lng, $title);
-
-        if (
-            ($true_option instanceof Glyph && $true_option->getAction() !== null)
-            || ($false_option instanceof Glyph && $false_option->getAction() !== null)
-        ) {
-            throw new \LogicException(
-                "If Glyps are used to indicate the state, they MUST NOT have an attached action."
-            );
-        }
     }
 
     public function format($value): string|Icon|Glyph
diff --git a/components/ILIAS/UI/src/Implementation/Component/Table/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/Table/Renderer.php
index 5f11031c401d..fe8aef3270f2 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Table/Renderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Table/Renderer.php
@@ -135,9 +135,9 @@ protected function renderPresentationRow(
         $sig_toggle = $component->getToggleSignal();
         $id = $this->bindJavaScript($component);
 
-        $expander = $f->symbol()->glyph()->expand("#")
+        $expander = $f->button()->shy( '', '#')->withSymbol($f->symbol()->glyph()->expand())
             ->withOnClick($sig_show);
-        $collapser = $f->symbol()->glyph()->collapse("#")
+        $collapser = $f->button()->shy('', '#')->withSymbol($f->symbol()->glyph()->collapse())
             ->withOnClick($sig_hide);
         $shy_expander = $f->button()->shy($this->txt("presentation_table_more"), "#")
             ->withOnClick($sig_show);
@@ -294,12 +294,11 @@ protected function renderTableHeader(
             if ($col_id === $sort_col) {
                 if ($sort_direction === Order::ASC) {
                     $sortation = "ascending"; // aria-sort should not be translated and always be in English
-                    $sortation_glyph = $glyph_factory->sortAscending("#");
                     $param_sort_direction = Order::DESC;
                 }
                 if ($sort_direction === Order::DESC) {
                     $sortation = "descending"; // aria-sort should not be translated and always be in English
-                    $sortation_glyph = $glyph_factory->sortDescending("#");
+                    $param_sort_direction = Order::ASC;
                 }
             }
 
@@ -315,9 +314,15 @@ protected function renderTableHeader(
                 );
 
                 if ($col_id === $sort_col) {
-                    $sortation_glyph = $default_renderer->render($sortation_glyph->withOnClick($sort_signal));
+                    $sortation_glyph = $this->getUIFactory()->button()->shy('', '#')
+                          ->withSymbol(
+                              $sort_direction === Order::ASC ?
+                                  $glyph_factory->sortAscending() :
+                                  $glyph_factory->sortDescending()
+                          )
+                          ->withOnClick($sort_signal);
                     $tpl->setVariable('COL_SORTATION', $sortation);
-                    $tpl->setVariable('COL_SORTATION_GLYPH', $sortation_glyph);
+                    $tpl->setVariable('COL_SORTATION_GLYPH', $default_renderer->render($sortation_glyph));
                 }
             }
 
@@ -339,13 +344,18 @@ protected function renderActionsHeader(
         }
 
         if ($component->hasMultiActions()) {
-            $glyph_factory = $this->getUIFactory()->symbol()->glyph();
+            $f = $this->getUIFactory();
+            $glyph_factory = $f->symbol()->glyph();
             $signal = $component->getSelectionSignal();
             $sig_all = clone $signal;
             $sig_all->addOption('select', true);
-            $select_all = $glyph_factory->add()->withOnClick($sig_all);
+            $select_all = $f->button()->shy('', '#')
+                  ->withSymbol($glyph_factory->add())
+                  ->withOnClick($sig_all);
             $signal->addOption('select', false);
-            $select_none = $glyph_factory->close()->withOnClick($signal);
+            $select_none = $f->button()->shy('', '#')
+                   ->withSymbol($glyph_factory->close())
+                   ->withOnClick($signal);
             $tpl->setVariable('SELECTION_CONTROL_SELECT', $default_renderer->render($select_all));
             $tpl->setVariable('SELECTION_CONTROL_DESELECT', $default_renderer->render($select_none));
         }
diff --git a/components/ILIAS/UI/src/examples/Counter/Novelty/base.php b/components/ILIAS/UI/src/examples/Counter/Novelty/base.php
index 6e2fca41a2be..0922ca252329 100755
--- a/components/ILIAS/UI/src/examples/Counter/Novelty/base.php
+++ b/components/ILIAS/UI/src/examples/Counter/Novelty/base.php
@@ -35,6 +35,9 @@ function base()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    return $renderer->render($f->symbol()->glyph()->mail("#")
-        ->withCounter($f->counter()->novelty(3)));
+    return $renderer->render(
+        $f->button()->shy('', '#')->withSymbol(
+            $f->symbol()->glyph()->mail()->withCounter($f->counter()->novelty(3))
+        )
+    );
 }
diff --git a/components/ILIAS/UI/src/examples/Counter/Status/base.php b/components/ILIAS/UI/src/examples/Counter/Status/base.php
index 3d8d2eb1fa3a..4d054ba34bd3 100755
--- a/components/ILIAS/UI/src/examples/Counter/Status/base.php
+++ b/components/ILIAS/UI/src/examples/Counter/Status/base.php
@@ -35,6 +35,9 @@ function base()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    return $renderer->render($f->symbol()->glyph()->mail("#")
-        ->withCounter($f->counter()->status(3)));
+    return $renderer->render(
+        $f->button()->shy('', '#')->withSymbol(
+            $f->symbol()->glyph()->mail()->withCounter($f->counter()->status(3))
+        )
+    );
 }
diff --git a/components/ILIAS/UI/src/examples/Counter/Status/multiple_glyphs.php b/components/ILIAS/UI/src/examples/Counter/Status/multiple_glyphs.php
index dd4d6d8cc601..04f38e335630 100755
--- a/components/ILIAS/UI/src/examples/Counter/Status/multiple_glyphs.php
+++ b/components/ILIAS/UI/src/examples/Counter/Status/multiple_glyphs.php
@@ -35,18 +35,20 @@ function multiple_glyphs()
     global $DIC;
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
-
-    $note = $f->symbol()->glyph()->note("#")
-        ->withCounter($f->counter()->novelty(100))
-        ->withCounter($f->counter()->status(8));
-
-    $tag = $f->symbol()->glyph()->tag("#")
-        ->withCounter($f->counter()->novelty(1))
-        ->withCounter($f->counter()->status(800));
-
-    $comment = $f->symbol()->glyph()->comment("#")
-        ->withCounter($f->counter()->novelty(1))
-        ->withCounter($f->counter()->status(8));
+    $note = $f->symbol()->glyph()->note()
+          ->withCounter($f->counter()->novelty(100))
+          ->withCounter($f->counter()->status(8)
+    );
+
+    $tag = $f->symbol()->glyph()->tag()
+          ->withCounter($f->counter()->novelty(1))
+          ->withCounter($f->counter()->status(800)
+    );
+
+    $comment = $f->symbol()->glyph()->comment()
+          ->withCounter($f->counter()->novelty(1))
+          ->withCounter($f->counter()->status(8)
+    );
 
     return $renderer->render($note) . $renderer->render($tag) . $renderer->render($comment);
 }
diff --git a/components/ILIAS/UI/src/examples/Counter/Status/with_js.php b/components/ILIAS/UI/src/examples/Counter/Status/with_js.php
index f1d102254ba1..c6ed9fcca626 100755
--- a/components/ILIAS/UI/src/examples/Counter/Status/with_js.php
+++ b/components/ILIAS/UI/src/examples/Counter/Status/with_js.php
@@ -44,7 +44,7 @@ function with_js()
     $renderer = $DIC->ui()->renderer();
 
     //Note that both counters have to be present to perform JS actions on them
-    $like = $f->symbol()->glyph()->love("#")
+    $like = $f->symbol()->glyph()->love()
         ->withCounter($f->counter()->novelty(3))
         ->withCounter($f->counter()->status(0));
 
diff --git a/components/ILIAS/UI/src/examples/Counter/Status/with_novelty.php b/components/ILIAS/UI/src/examples/Counter/Status/with_novelty.php
index 04cbc8ed9c64..4655ea8bbfbc 100755
--- a/components/ILIAS/UI/src/examples/Counter/Status/with_novelty.php
+++ b/components/ILIAS/UI/src/examples/Counter/Status/with_novelty.php
@@ -36,8 +36,10 @@ function with_novelty()
     $renderer = $DIC->ui()->renderer();
 
     return $renderer->render(
-        $f->symbol()->glyph()->mail("#")
-        ->withCounter($f->counter()->novelty(1))
-        ->withCounter($f->counter()->status(8))
+        $f->button()->shy('', '#')->withSymbol(
+            $f->symbol()->glyph()->mail()
+              ->withCounter($f->counter()->novelty(1))
+              ->withCounter($f->counter()->status(8)),
+        )
     );
 }
diff --git a/components/ILIAS/UI/src/examples/MainControls/MetaBar/extended_example_for_developers.php b/components/ILIAS/UI/src/examples/MainControls/MetaBar/extended_example_for_developers.php
index 5ca08e023a63..cfea3f32cb98 100755
--- a/components/ILIAS/UI/src/examples/MainControls/MetaBar/extended_example_for_developers.php
+++ b/components/ILIAS/UI/src/examples/MainControls/MetaBar/extended_example_for_developers.php
@@ -226,7 +226,7 @@ function renderExtendedMetaBarInFullscreenMode(Container $dic): string
     $mail_slate = $f->mainControls()->slate()->notification("Mail", [$mail_notification_item]);
 
 
-    $notification_glyph = $f->symbol()->glyph()->notification("notification", "notification")
+    $notification_glyph = $f->symbol()->glyph()->notification()
         ->withCounter($f->counter()->novelty(1));
 
     $notification_center = $f->mainControls()->slate()
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Add/add.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Add/add.php
index 8df067ed6535..a73d21f81c61 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Add/add.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Add/add.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring an add glyph.
+ *   Example for rendering an add glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome plus-in-a-circle symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome plus-in-a-circle symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function add()
@@ -44,13 +39,12 @@ function add()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->add("#");
+    $glyph = $f->symbol()->glyph()->add();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Angry/angry.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Angry/angry.php
index 4e2f98b16cdd..36bb011df9b2 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Angry/angry.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Angry/angry.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a angry glyph.
+ *   Example for rendering a angry glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome angry-smiley symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome angry-smiley symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function angry()
@@ -44,13 +39,12 @@ function angry()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->angry("#");
+    $glyph = $f->symbol()->glyph()->angry();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Apply/apply.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Apply/apply.php
index 1e319fa99222..e0b5674683f9 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Apply/apply.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Apply/apply.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a apply glyph.
+ *   Example for rendering a apply glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome  checkmark symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome checkmark symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function apply()
@@ -43,13 +38,12 @@ function apply()
     global $DIC;
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
-    $glyph = $f->symbol()->glyph()->apply("#");
+    $glyph = $f->symbol()->glyph()->apply();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Astounded/astounded.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Astounded/astounded.php
index 28fc10c18eb9..cdbcd2cb5411 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Astounded/astounded.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Astounded/astounded.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a astounded glyph.
+ *   Example for rendering a astounded glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome astounded-smiley symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome astounded-smiley symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function astounded()
@@ -44,13 +39,12 @@ function astounded()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->astounded("#");
+    $glyph = $f->symbol()->glyph()->astounded();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Attachment/attachment.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Attachment/attachment.php
index 6d8aaa0fc810..66c8e22e49a9 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Attachment/attachment.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Attachment/attachment.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a attachment glyph.
+ *   Example for rendering a attachment glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome paper clip symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome paper clip symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function attachment()
@@ -44,13 +39,12 @@ function attachment()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->attachment("#");
+    $glyph = $f->symbol()->glyph()->attachment();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Back/back.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Back/back.php
index bdd0f4166f8c..26250ff39c88 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Back/back.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Back/back.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a back glyph.
+ *   Example for rendering a back glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome less-than symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome less-than symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function back()
@@ -44,13 +39,12 @@ function back()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->back("#");
+    $glyph = $f->symbol()->glyph()->back();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Bold/bold.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Bold/bold.php
index 048438b39444..ec2d355f37ec 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Bold/bold.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Bold/bold.php
@@ -33,13 +33,12 @@ function bold()
     $factory = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $factory->symbol()->glyph()->bold("#");
+    $glyph = $factory->symbol()->glyph()->bold();
 
     // showcase the various states of this Glyph
     $list = $factory->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Briefcase/briefcase.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Briefcase/briefcase.php
index 7a3a61fed679..6d79cfa61bd2 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Briefcase/briefcase.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Briefcase/briefcase.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a briefcase glyph.
+ *   Example for rendering a briefcase glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome briefcase symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome briefcase symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function briefcase()
@@ -44,13 +39,12 @@ function briefcase()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->briefcase("#");
+    $glyph = $f->symbol()->glyph()->briefcase();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Bulletlist/bulletlist.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Bulletlist/bulletlist.php
index e9f25e11096c..081f7040b3ab 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Bulletlist/bulletlist.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Bulletlist/bulletlist.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a bulletlist glyph.
+ *   Example for rendering a bulletlist glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome bulletlist symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome bulletlist symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function bulletlist()
@@ -44,13 +39,12 @@ function bulletlist()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->bulletlist("#");
+    $glyph = $f->symbol()->glyph()->bulletlist();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Calendar/calendar.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Calendar/calendar.php
index dd2d6b380c46..fbd8a611bdae 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Calendar/calendar.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Calendar/calendar.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a calendar glyph.
+ *   Example for rendering a calendar glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome calendar symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome calendar symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function calendar()
@@ -44,13 +39,12 @@ function calendar()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->calendar("#");
+    $glyph = $f->symbol()->glyph()->calendar();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Checked/checked.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Checked/checked.php
index 272e21725853..cb2a405b9e02 100644
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Checked/checked.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Checked/checked.php
@@ -10,17 +10,12 @@
  *   Example for rendering a Checked Glyph.
  *
  * expected output: >
- * *   Active:
- * *   ILIAS shows a monochrome heart symbol on a grey background. Moving the cursor above the symbol will darken it's
- * *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- * *
- * *   Inactive:
- * *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
- * *
- * *   Highlighted:
- * *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- * *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- * * ---
+ *   Standard:
+ *   ILIAS shows a monochrome heart symbol on a grey background.
+ *
+ *   Highlighted:
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
+ * ---
  */
 function checked()
 {
@@ -32,9 +27,8 @@ function checked()
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Close/close.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Close/close.php
index ef2cd5570ec3..1e09b556886e 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Close/close.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Close/close.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a close glyph.
+ *   Example for rendering a close glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome x symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome x symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function close()
@@ -44,13 +39,12 @@ function close()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->close("#");
+    $glyph = $f->symbol()->glyph()->close();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Collapse/collapse.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Collapse/collapse.php
index 32afbdf82b0b..39f7beb765a6 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Collapse/collapse.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Collapse/collapse.php
@@ -26,18 +26,11 @@
  *   Example for rendering a collapse glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome arrow-pointing-down symbol on a grey background. Moving your cursor over the symbol will
- *   change the symbol's color to a slightly darker color. Additionally the cursor's form will change and the cursor
- *   indicates a linking.
+ *   Standard:
+ *   ILIAS shows a monochrome arrow-pointing-down symbol on a grey background.
  *
- *   Inactive:
- *   ILIAS shows the same symbol. But it's greyed out which indicates that it is deactivated. Moving the cursor above the
- *   symbol will change nothing.
- *
- *   Hightlighted:
- *   ILIAS shows the same symbol. But it is higlighted particularly. Moving your cursor over the symbol will darken the
- *   icon's color. Additionally the cursor's form will change and it indicates a linking.
+ *   Highlighted:
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function collapse()
@@ -46,13 +39,12 @@ function collapse()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->collapse("#");
+    $glyph = $f->symbol()->glyph()->collapse();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/CollapseHorizontal/collapsehorizontal.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/CollapseHorizontal/collapsehorizontal.php
index 69e11b2017e3..ef8bdadb4bb0 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/CollapseHorizontal/collapsehorizontal.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/CollapseHorizontal/collapsehorizontal.php
@@ -23,12 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a collapse horizontal glyph.
+ *   Example for rendering a collapse horizontal glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a box with three words listed among each other. Every word has got a "<" arrow functioning as a link but
- *   without any actions. The first arrow is active, the second and third is colored.
+ *   Standard:
+ *   ILIAS shows a monochrome collapse-horizontal symbol on a grey background.
+ *
+ *   Highlighted:
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function collapsehorizontal()
@@ -37,13 +39,12 @@ function collapsehorizontal()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->collapseHorizontal("#");
+    $glyph = $f->symbol()->glyph()->collapseHorizontal();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/ColumnSelection/columnSelection.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/ColumnSelection/columnSelection.php
index 97c24ddde96a..50758e38be5d 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/ColumnSelection/columnSelection.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/ColumnSelection/columnSelection.php
@@ -26,16 +26,11 @@
  *   Example for rendering a Column Selection Glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
- *   color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
- *   above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function columnSelection()
@@ -44,13 +39,12 @@ function columnSelection()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->columnSelection("#");
+    $glyph = $f->symbol()->glyph()->columnSelection();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Comment/comment.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Comment/comment.php
index c498ce5d5d0d..2bf225bf4f04 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Comment/comment.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Comment/comment.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a comment glyph.
+ *   Example for rendering a comment glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome speech bubble symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome speech bubble symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function comment()
@@ -44,13 +39,12 @@ function comment()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->comment("#");
+    $glyph = $f->symbol()->glyph()->comment();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Disclosure/disclosure.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Disclosure/disclosure.php
index 528a38d88bb5..382de2780359 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Disclosure/disclosure.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Disclosure/disclosure.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a disclosure glyph.
+ *   Example for rendering a disclosure glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome three-points-on-top-of-each-other symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome three-points-on-top-of-each-other symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function disclosure()
@@ -44,13 +39,12 @@ function disclosure()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->disclosure("#");
+    $glyph = $f->symbol()->glyph()->disclosure();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Dislike/dislike.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Dislike/dislike.php
index 656156895d12..3117722399cc 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Dislike/dislike.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Dislike/dislike.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a dislike glyph.
+ *   Example for rendering a dislike glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome thumbs-down symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome thumbs-down symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function dislike()
@@ -44,13 +39,12 @@ function dislike()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->dislike("#");
+    $glyph = $f->symbol()->glyph()->dislike();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Down/down.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Down/down.php
index 6af490cc8778..08010e367fa8 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Down/down.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Down/down.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a down glyph.
+ *   Example for rendering a down glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome arrow-down symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome arrow-down symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function down()
@@ -44,13 +39,12 @@ function down()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->down("#");
+    $glyph = $f->symbol()->glyph()->down();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/DragHandle/dragHandle.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/DragHandle/dragHandle.php
index a9aee300dc91..466ec151fc7f 100644
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/DragHandle/dragHandle.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/DragHandle/dragHandle.php
@@ -10,16 +10,11 @@
  *   Example for rendering a Drag Handle Glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
- *   color darkens a little bit. Additionally, the cursor symbol changes its form and indicates that an element is draggable.
- *
- *   Inactive:
- *   ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
- *   above the symbol. Additionally, the cursor symbol will change its form and indicates that an element is draggable.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function dragHandle()
@@ -28,13 +23,12 @@ function dragHandle()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->dragHandle("#");
+    $glyph = $f->symbol()->glyph()->dragHandle();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Enlarge/enlarge.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Enlarge/enlarge.php
index 81d0d78f738c..4a7f90fd9a2f 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Enlarge/enlarge.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Enlarge/enlarge.php
@@ -26,16 +26,11 @@
  *   Example for rendering an Enlarge Glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
- *   color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
- *   above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function enlarge()
@@ -44,13 +39,12 @@ function enlarge()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->enlarge("#");
+    $glyph = $f->symbol()->glyph()->enlarge();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Expand/expand.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Expand/expand.php
index 3b1f76c51383..5d407766c23b 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Expand/expand.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Expand/expand.php
@@ -26,16 +26,11 @@
  *   Example for rendering an expand glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome greater-than symbol on a grey backround. Moving the cursor above the symbol will darken
- *   it's color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome greater-than symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function expand()
@@ -44,13 +39,12 @@ function expand()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->expand("#");
+    $glyph = $f->symbol()->glyph()->expand();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Eyeclosed/eyeclosed.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Eyeclosed/eyeclosed.php
index b9b4112c9394..015df92f9772 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Eyeclosed/eyeclosed.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Eyeclosed/eyeclosed.php
@@ -26,16 +26,11 @@
  *   Example for rendring a eyes closed glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome crossed-out-eye symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome crossed-out-eye symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function eyeclosed()
@@ -44,13 +39,12 @@ function eyeclosed()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->eyeclosed("#");
+    $glyph = $f->symbol()->glyph()->eyeclosed();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Eyeopen/eyeopen.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Eyeopen/eyeopen.php
index b0ac2830dfc5..84fd314b0a64 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Eyeopen/eyeopen.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Eyeopen/eyeopen.php
@@ -26,16 +26,11 @@
  *   Example for rendring a eyes open glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome eye symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome eye symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function eyeopen()
@@ -44,13 +39,12 @@ function eyeopen()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->eyeopen("#");
+    $glyph = $f->symbol()->glyph()->eyeopen();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Filter/filter.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Filter/filter.php
index ff3aae7ff5dd..e8f248b17127 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Filter/filter.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Filter/filter.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a filter glyph.
+ *   Example for rendering a filter glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome filter symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome filter symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function filter()
@@ -44,13 +39,12 @@ function filter()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->filter("#");
+    $glyph = $f->symbol()->glyph()->filter();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Header/header.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Header/header.php
index d12d3e5009a1..aad344dbbd34 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Header/header.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Header/header.php
@@ -33,13 +33,12 @@ function header()
     $factory = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $factory->symbol()->glyph()->header("#");
+    $glyph = $factory->symbol()->glyph()->header();
 
     // showcase the various states of this Glyph
     $list = $factory->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Help/help.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Help/help.php
index 49024207d3d8..086f03ed6c84 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Help/help.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Help/help.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a help glyph.
+ *   Example for rendering a help glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome questionmark symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome questionmark symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function help()
@@ -44,13 +39,12 @@ function help()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->help("#");
+    $glyph = $f->symbol()->glyph()->help();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Italic/italic.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Italic/italic.php
index dddd15ffdbc7..72ef9b38bb8b 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Italic/italic.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Italic/italic.php
@@ -33,13 +33,12 @@ function italic()
     $factory = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $factory->symbol()->glyph()->italic("#");
+    $glyph = $factory->symbol()->glyph()->italic();
 
     // showcase the various states of this Glyph
     $list = $factory->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Language/language.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Language/language.php
index 0bdc6225ed64..a47f96a7b824 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Language/language.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Language/language.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a language glyph.
+ *   Example for rendering a language glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome flag symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome flag symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function language()
@@ -44,13 +39,12 @@ function language()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->language("#");
+    $glyph = $f->symbol()->glyph()->language();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Laugh/laugh.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Laugh/laugh.php
index 48212b5d9eb3..49e28a6817aa 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Laugh/laugh.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Laugh/laugh.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a laugh glyph.
+ *   Example for rendering a laugh glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome laughing-smiley symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome laughing-smiley symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function laugh()
@@ -44,13 +39,12 @@ function laugh()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->laugh("#");
+    $glyph = $f->symbol()->glyph()->laugh();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Launch/launch.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Launch/launch.php
index 29c4b70c58c1..ad2d25ffea2c 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Launch/launch.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Launch/launch.php
@@ -26,16 +26,11 @@
  *   Example for rendering a Launch Glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
- *   color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
- *   above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function launch()
@@ -44,13 +39,12 @@ function launch()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->launch("#");
+    $glyph = $f->symbol()->glyph()->launch();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Like/like.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Like/like.php
index 58fc08c14567..818ff8186dd9 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Like/like.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Like/like.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a like glyph.
+ *   Example for rendering a like glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome thumbs-up symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome thumbs-up symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function like()
@@ -44,13 +39,12 @@ function like()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->like("#");
+    $glyph = $f->symbol()->glyph()->like();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Link/link.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Link/link.php
index 5aa9ee0dad4c..f95e985ac758 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Link/link.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Link/link.php
@@ -33,13 +33,12 @@ function link()
     $factory = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $factory->symbol()->glyph()->link("#");
+    $glyph = $factory->symbol()->glyph()->link();
 
     // showcase the various states of this Glyph
     $list = $factory->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/ListView/listView.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/ListView/listView.php
index 5bf24f56f6ba..1fe43b7b2af0 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/ListView/listView.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/ListView/listView.php
@@ -26,16 +26,11 @@
  *   Example for rendering a List View Glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
- *   color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
- *   above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function listView()
@@ -44,13 +39,12 @@ function listView()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->listView("#");
+    $glyph = $f->symbol()->glyph()->listView();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Listindent/listindent.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Listindent/listindent.php
index dcdd2e14e580..57c90c49d5c9 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Listindent/listindent.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Listindent/listindent.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a list indent glyph.
+ *   Example for rendering a list indent glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome indent-list symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome indent-list symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function listindent()
@@ -44,13 +39,12 @@ function listindent()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->listindent("#");
+    $glyph = $f->symbol()->glyph()->listindent();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Listoutdent/listoutdent.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Listoutdent/listoutdent.php
index 0b262e90ad55..ba3c22b8291b 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Listoutdent/listoutdent.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Listoutdent/listoutdent.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a list outdent glyph.
+ *   Example for rendering a list outdent glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome outdent-list symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome outdent-list symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function listoutdent()
@@ -44,13 +39,12 @@ function listoutdent()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->listoutdent("#");
+    $glyph = $f->symbol()->glyph()->listoutdent();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Login/login.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Login/login.php
index 05ec56ba57c6..d52125c0f176 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Login/login.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Login/login.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a login glyph.
+ *   Example for rendering a login glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome entry symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome entry symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function login()
@@ -44,13 +39,12 @@ function login()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->login("#");
+    $glyph = $f->symbol()->glyph()->login();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Logout/logout.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Logout/logout.php
index 17fe6b1d6ee7..a75131b2654e 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Logout/logout.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Logout/logout.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a logout glyph.
+ *   Example for rendering a logout glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome exit symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome exit symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function logout()
@@ -44,13 +39,12 @@ function logout()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->logout("#");
+    $glyph = $f->symbol()->glyph()->logout();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Love/love.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Love/love.php
index 7569281b1b73..a3b814179997 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Love/love.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Love/love.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a love glyph.
+ *   Example for rendering a love glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome heart symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome heart symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function love()
@@ -44,13 +39,12 @@ function love()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->love("#");
+    $glyph = $f->symbol()->glyph()->love();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Mail/mail_example.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Mail/mail_example.php
index 5fea4164bbf1..e904bd2bcdc2 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Mail/mail_example.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Mail/mail_example.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a mail glyph.
+ *   Example for rendering a mail glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome envelope symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome envelope symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function mail_example()
@@ -44,13 +39,12 @@ function mail_example()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->mail("#");
+    $glyph = $f->symbol()->glyph()->mail();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/More/more.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/More/more.php
index 159000ea4122..4684d8f07a35 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/More/more.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/More/more.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a more glyph.
+ *   Example for rendering a more glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome "..." symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome "..." symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function more()
@@ -44,13 +39,12 @@ function more()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->more("#");
+    $glyph = $f->symbol()->glyph()->more();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Next/next_glyph.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Next/next_glyph.php
index 86fe2c6a3940..c23cfa0704aa 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Next/next_glyph.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Next/next_glyph.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a next glyph.
+ *   Example for rendering a next glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome greater-than symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome greater-than symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function next_glyph()
@@ -44,13 +39,12 @@ function next_glyph()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->next("#");
+    $glyph = $f->symbol()->glyph()->next();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Note/note.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Note/note.php
index f0f93f69b827..7745e6e0058e 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Note/note.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Note/note.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a note glyph.
+ *   Example for rendering a note glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome pin symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome pin symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function note()
@@ -44,13 +39,12 @@ function note()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->note("#");
+    $glyph = $f->symbol()->glyph()->note();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Notification/notification.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Notification/notification.php
index fc8374614b73..aa6d8724eba9 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Notification/notification.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Notification/notification.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a notification glyph.
+ *   Example for rendering a notification glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome bell symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome bell symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function notification()
@@ -44,13 +39,12 @@ function notification()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->notification("#");
+    $glyph = $f->symbol()->glyph()->notification();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Numberedlist/numberedlist.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Numberedlist/numberedlist.php
index 41bc8d1617a4..7c0dc0ecca51 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Numberedlist/numberedlist.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Numberedlist/numberedlist.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a numbered list glyph.
+ *   Example for rendering a numbered list glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome numbered-list symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome numbered-list symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function numberedlist()
@@ -44,13 +39,12 @@ function numberedlist()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->numberedlist("#");
+    $glyph = $f->symbol()->glyph()->numberedlist();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Preview/preview.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Preview/preview.php
index 2609313e192a..7533240e3ec8 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Preview/preview.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Preview/preview.php
@@ -26,16 +26,11 @@
  *   Example for rendering a Preview Glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
- *   color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
- *   above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function preview()
@@ -44,13 +39,12 @@ function preview()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->preview("#");
+    $glyph = $f->symbol()->glyph()->preview();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Remove/remove.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Remove/remove.php
index bace2256aa00..e1cc13870ee8 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Remove/remove.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Remove/remove.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a remove glyph.
+ *   Example for rendering a remove glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome minus-in-a-circle symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome minus-in-a-circle symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function remove()
@@ -44,13 +39,12 @@ function remove()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->remove("#");
+    $glyph = $f->symbol()->glyph()->remove();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Reset/glyph_reset.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Reset/glyph_reset.php
index 62ca62fde05d..c760df1fea35 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Reset/glyph_reset.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Reset/glyph_reset.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a reset glyph.
+ *   Example for rendering a reset glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome arrow-in-circle clip symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome arrow-in-circle clip symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function glyph_reset()
@@ -44,13 +39,12 @@ function glyph_reset()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->reset("#");
+    $glyph = $f->symbol()->glyph()->reset();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Sad/sad.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Sad/sad.php
index 08203c373748..5e08270ef2e1 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Sad/sad.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Sad/sad.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a sad glyph.
+ *   Example for rendering a sad glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome sad-smiley symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome sad-smiley symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function sad()
@@ -44,13 +39,12 @@ function sad()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->sad("#");
+    $glyph = $f->symbol()->glyph()->sad();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-            "Active" => $glyph,
-            "Inactive" => $glyph->withUnavailableAction(),
-            "Highlighted" => $glyph->withHighlight()
+            "Standard" => $glyph,
+            "Highlighted" => $glyph->withHighlight(),
             ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Search/search.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Search/search.php
index 05a56ff1622f..d7608eb479ae 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Search/search.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Search/search.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a search glyph.
+ *   Example for rendering a search glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome magnifying-glasses symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome magnifying-glasses symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function search()
@@ -44,13 +39,12 @@ function search()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->search("#");
+    $glyph = $f->symbol()->glyph()->search();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Settings/settings.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Settings/settings.php
index ec1e5ef83170..2c081d1685d0 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Settings/settings.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Settings/settings.php
@@ -26,16 +26,11 @@
  *   Example for rendering a settings glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome gearwheel symbol on a grey background. If you move your cursor onto the symbol it's
- *   color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome gearwheel symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
- *   above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function settings()
@@ -44,13 +39,12 @@ function settings()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->settings("#");
+    $glyph = $f->symbol()->glyph()->settings();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Sort/sort.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Sort/sort.php
index 49adb20767c1..495dd5dfd903 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Sort/sort.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Sort/sort.php
@@ -26,16 +26,11 @@
  *   Example for rendering a Sort Glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
- *   color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
- *   above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function sort()
@@ -44,13 +39,12 @@ function sort()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->sort("#");
+    $glyph = $f->symbol()->glyph()->sort();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/SortAscending/sort_ascending.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/SortAscending/sort_ascending.php
index 5a694d607ed9..db575847bd29 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/SortAscending/sort_ascending.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/SortAscending/sort_ascending.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a sort ascending glyph.
+ *   Example for rendering a sort ascending glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome arrow-up symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome arrow-up symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function sort_ascending()
@@ -44,13 +39,12 @@ function sort_ascending()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->sortAscending("#");
+    $glyph = $f->symbol()->glyph()->sortAscending();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/SortDescending/sort_descending.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/SortDescending/sort_descending.php
index 21274dbec5e3..2023f5f3d7b2 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/SortDescending/sort_descending.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/SortDescending/sort_descending.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a sort descending glyph.
+ *   Example for rendering a sort descending glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome arrow-down symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome arrow-down symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function sort_descending()
@@ -44,13 +39,12 @@ function sort_descending()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->sortDescending("#");
+    $glyph = $f->symbol()->glyph()->sortDescending();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Sortation/sortation.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Sortation/sortation.php
deleted file mode 100755
index 5dce22fea2b1..000000000000
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Sortation/sortation.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\UI\examples\Symbol\Glyph\Sortation;
-
-/**
- * ---
- * expected output: >
- *   ILIAS shows the rendered Component.
- * ---
- */
-function sortation()
-{
-    global $DIC;
-    $f = $DIC->ui()->factory();
-    $renderer = $DIC->ui()->renderer();
-
-    $glyph = $f->symbol()->glyph()->sortation("#");
-
-    //Showcase the various states of this Glyph
-    $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
-    ]);
-
-    return $renderer->render($list);
-}
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Tag/tag_example.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Tag/tag_example.php
index 9d918fc1bc59..3660ba8c8145 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Tag/tag_example.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Tag/tag_example.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a tag glyph.
+ *   Example for rendering a tag glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome tag symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome tag symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function tag_example()
@@ -44,13 +39,12 @@ function tag_example()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->tag("#");
+    $glyph = $f->symbol()->glyph()->tag();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/TileView/tileView.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/TileView/tileView.php
index b6bdefab1d06..2972cb069b9e 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/TileView/tileView.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/TileView/tileView.php
@@ -26,16 +26,11 @@
  *   Example for rendering a Tile View Glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome symbol on a grey background. If you move your cursor onto the symbol it's
- *   color darkens a little bit. Additionaly the cursor symbol changes it's form and indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol. But it's greyed out. Moving the cursor above the symbol will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol. But it's highlighted particularly. The presentation will darken if you move your cursor
- *   above the symbol. Additionally the cursor symbol will change it's form and indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function tileView()
@@ -44,13 +39,12 @@ function tileView()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->tileView("#");
+    $glyph = $f->symbol()->glyph()->tileView();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Time/time_glyph.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Time/time_glyph.php
index d7fd26dabefd..50f7e0058138 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Time/time_glyph.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Time/time_glyph.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a time glyph.
+ *   Example for rendering a time glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome clock symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome clock symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function time_glyph()
@@ -44,13 +39,12 @@ function time_glyph()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->time("#");
+    $glyph = $f->symbol()->glyph()->time();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Unchecked/unchecked.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Unchecked/unchecked.php
index dd5709fdcc32..5cd37eb48d7a 100644
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Unchecked/unchecked.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Unchecked/unchecked.php
@@ -10,17 +10,12 @@
  *   Example for rendering a Unchecked Glyph.
  *
  * expected output: >
- * *   Active:
- * *   ILIAS shows a monochrome heart symbol on a grey background. Moving the cursor above the symbol will darken it's
- * *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- * *
- * *   Inactive:
- * *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
- * *
- * *   Highlighted:
- * *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- * *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- * * ---
+ *   Standard:
+ *   ILIAS shows a monochrome heart symbol on a grey background.
+ *
+ *   Highlighted:
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
+ * ---
  */
 function unchecked()
 {
@@ -32,9 +27,8 @@ function unchecked()
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/Up/up.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/Up/up.php
index 196219cd7484..1eee07ab2267 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/Up/up.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/Up/up.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring an up glyph.
+ *   Example for rendering an up glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome arrow-up symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome arrow-up symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function up()
@@ -44,13 +39,12 @@ function up()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->up("#");
+    $glyph = $f->symbol()->glyph()->up();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/User/user.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/User/user.php
index 22171713b1e9..1039560fa105 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/User/user.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/User/user.php
@@ -23,19 +23,14 @@
 /**
  * ---
  * description: >
- *   Example for rendring a user glyph.
+ *   Example for rendering a user glyph.
  *
  * expected output: >
- *   Active:
- *   ILIAS shows a monochrome user symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *
- *   Inactive:
- *   ILIAS shows the same symbol, but it's greyed out. Moving the cursor will not change the presentation.
+ *   Standard:
+ *   ILIAS shows a monochrome user symbol on a grey background.
  *
  *   Highlighted:
- *   ILIAS shows the same symbol but it's highlighted particularly. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
+ *   ILIAS shows the same symbol, but it's highlighted particularly.
  * ---
  */
 function user()
@@ -44,13 +39,12 @@ function user()
     $f = $DIC->ui()->factory();
     $renderer = $DIC->ui()->renderer();
 
-    $glyph = $f->symbol()->glyph()->user("#");
+    $glyph = $f->symbol()->glyph()->user();
 
     //Showcase the various states of this Glyph
     $list = $f->listing()->descriptive([
-        "Active" => $glyph,
-        "Inactive" => $glyph->withUnavailableAction(),
-        "Highlighted" => $glyph->withHighlight()
+        "Standard" => $glyph,
+        "Highlighted" => $glyph->withHighlight(),
     ]);
 
     return $renderer->render($list);
diff --git a/components/ILIAS/UI/src/examples/Symbol/Glyph/User/with_js_binding.php b/components/ILIAS/UI/src/examples/Symbol/Glyph/User/with_js_binding.php
index e5c391fb9565..6017af0118cc 100755
--- a/components/ILIAS/UI/src/examples/Symbol/Glyph/User/with_js_binding.php
+++ b/components/ILIAS/UI/src/examples/Symbol/Glyph/User/with_js_binding.php
@@ -26,9 +26,7 @@
  *   Example for rendering a user icon with JS binding.
  *
  * expected output: >
- *   ILIAS shows a monochrome user symbol on a grey background. Moving the cursor above the symbol will darken it's
- *   color slightly. Additionally the cursor's form will change and it indicates a linking.
- *   Clicking onto the icon will open a message with a confirmation about your click.
+ *   ILIAS shows a user symbol in a button. Clicking the button will open a message with a confirmation about your click.
  * ---
  */
 function with_js_binding()
@@ -38,8 +36,8 @@ function with_js_binding()
     $renderer = $DIC->ui()->renderer();
 
     return $renderer->render(
-        $f->symbol()->glyph()->user("#")
-            ->withOnLoadCode(function ($id) {
+        $f->button()->shy('', '#')->withSymbol($f->symbol()->glyph()->user())
+            ->withAdditionalOnLoadCode(function ($id) {
                 return
                     "$(\"#$id\").click(function() { alert(\"Clicked: $id\"); return false; });";
             })
diff --git a/components/ILIAS/UI/src/templates/default/Link/tpl.standard.html b/components/ILIAS/UI/src/templates/default/Link/tpl.standard.html
index 90fd266c2b7c..b234151a6b04 100755
--- a/components/ILIAS/UI/src/templates/default/Link/tpl.standard.html
+++ b/components/ILIAS/UI/src/templates/default/Link/tpl.standard.html
@@ -1 +1 @@
-<a<!-- BEGIN language --> lang="{CONTENT_LANGUAGE}"<!-- END language --><!-- BEGIN hreflanguage --> hreflang="{HREF_LANGUAGE}"<!-- END hreflanguage --><!-- BEGIN ariadisabled --> aria-disabled="true"<!-- END ariadisabled --><!-- BEGIN href --> href="{HREF}"<!-- END href --><!-- BEGIN open_in_new_viewport --> target="_blank"<!-- END open_in_new_viewport --><!-- BEGIN relationships --> rel="{RELS}"<!-- END relationships --><!-- BEGIN with_id --> id="{ID}"<!-- END with_id --><!-- BEGIN with_aria_describedby --> aria-describedby="{ARIA_DESCRIBED_BY}"<!-- END with_aria_describedby -->>{LABEL}</a>
\ No newline at end of file
+<a<!-- BEGIN language --> lang="{CONTENT_LANGUAGE}"<!-- END language --><!-- BEGIN hreflanguage --> hreflang="{HREF_LANGUAGE}"<!-- END hreflanguage --><!-- BEGIN with_aria_label --> aria-label="{ARIA_LABEL}"<!-- END with_aria_label --><!-- BEGIN ariadisabled --> aria-disabled="true"<!-- END ariadisabled --><!-- BEGIN href --> href="{HREF}"<!-- END href --><!-- BEGIN open_in_new_viewport --> target="_blank"<!-- END open_in_new_viewport --><!-- BEGIN relationships --> rel="{RELS}"<!-- END relationships --><!-- BEGIN with_id --> id="{ID}"<!-- END with_id --><!-- BEGIN with_aria_describedby --> aria-describedby="{ARIA_DESCRIBED_BY}"<!-- END with_aria_describedby -->><!-- BEGIN symbol -->{SYMBOL} <!-- END symbol -->{LABEL}</a>
\ No newline at end of file
diff --git a/components/ILIAS/UI/src/templates/default/Symbol/tpl.glyph.standard.html b/components/ILIAS/UI/src/templates/default/Symbol/tpl.glyph.standard.html
index 7da77fabbc12..f05d3b76bdcb 100755
--- a/components/ILIAS/UI/src/templates/default/Symbol/tpl.glyph.standard.html
+++ b/components/ILIAS/UI/src/templates/default/Symbol/tpl.glyph.standard.html
@@ -1,3 +1,3 @@
-<a <!-- BEGIN tabbable -->tabindex="0" <!-- END tabbable -->class="glyph<!-- BEGIN highlighted --> highlighted<!-- END highlighted --><!-- BEGIN disabled --> disabled<!-- END disabled -->"<!-- BEGIN with_action --> href="{ACTION}"<!-- END with_action --> aria-label="{LABEL}"<!-- BEGIN with_aria_disabled --> aria-disabled="{ARIA_DISABLED}"<!-- END with_aria_disabled --><!-- BEGIN with_id --> id="{ID}"<!-- END with_id -->>
+<span class="glyph<!-- BEGIN highlighted --> highlighted<!-- END highlighted -->" aria-label="{LABEL}"<!-- BEGIN with_role --> role="{ROLE}"<!-- END with_role --><!-- BEGIN with_id --> id="{ID}"<!-- END with_id -->>
 {GLYPH}
-</a>
+</span>
diff --git a/components/ILIAS/UI/tests/Component/MainControls/SystemInfoTest.php b/components/ILIAS/UI/tests/Component/MainControls/SystemInfoTest.php
index 192b76ceb4ce..a629aee0bfe3 100755
--- a/components/ILIAS/UI/tests/Component/MainControls/SystemInfoTest.php
+++ b/components/ILIAS/UI/tests/Component/MainControls/SystemInfoTest.php
@@ -60,7 +60,7 @@ public function testRenderingDefault(): void
     </div>
     <div class="il-system-info-actions">
         <span class="il-system-info-more">
-            <a tabindex="0" class="glyph" href="#" aria-label="show_more"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></a>
+            <button class="btn btn-bulky" data-action="#"><span class="glyph" role="img"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></span><span class="bulky-label">show_more</span></button>
         </span>
         <span class="il-system-info-close"></span>
     </div>
@@ -93,7 +93,7 @@ public function testRenderingNeutral(): void
     </div>
     <div class="il-system-info-actions">
         <span class="il-system-info-more">
-            <a tabindex="0" class="glyph" href="#" aria-label="show_more"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></a>
+            <button class="btn btn-bulky" data-action="#"><span class="glyph" role="img"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></span><span class="bulky-label">show_more</span></button>
         </span>
         <span class="il-system-info-close"></span>
     </div>
@@ -126,7 +126,7 @@ public function testRenderingImportant(): void
     </div>
     <div class="il-system-info-actions">
         <span class="il-system-info-more">
-            <a tabindex="0" class="glyph" href="#" aria-label="show_more"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></a>
+            <button class="btn btn-bulky" data-action="#"><span class="glyph" role="img"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></span><span class="bulky-label">show_more</span></button>
         </span>
         <span class="il-system-info-close"></span>
     </div>
@@ -158,7 +158,7 @@ public function testRenderingBreaking(): void
     </div>
     <div class="il-system-info-actions">
         <span class="il-system-info-more">
-            <a tabindex="0" class="glyph" href="#" aria-label="show_more"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></a>
+            <button class="btn btn-bulky" data-action="#"><span class="glyph" role="img"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></span><span class="bulky-label">show_more</span></button>
         </span>
         <span class="il-system-info-close"></span>
     </div>
@@ -193,9 +193,9 @@ public function testRenderingCloseAction(): void
     </div>
     <div class="il-system-info-actions">
         <span class="il-system-info-more">
-            <a tabindex="0" class="glyph" href="#" aria-label="show_more"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></a>
+            <button class="btn btn-bulky" data-action="#"><span class="glyph" role="img"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></span><span class="bulky-label">show_more</span></button>
         </span>
-        <span class="il-system-info-close"><a tabindex="0" class="glyph" href="#" aria-label="close" id="id"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></span>
+        <span class="il-system-info-close"><button type="button" class="close" aria-label="close" id="id"><span aria-hidden="true">&times;</span></button></span>
     </div>
 </div>
 EOT;
@@ -264,6 +264,35 @@ public function mainControls(): \ILIAS\UI\Implementation\Component\MainControls\
         };
         $factory->sig_gen = $this->sig_gen;
 
-        return $factory;
+        $factory_with_button = new class ($factory) extends NoUIFactory {
+            private $inner;
+
+            public function __construct($inner)
+            {
+                $this->inner = $inner;
+            }
+
+            public function symbol(): ILIAS\UI\Implementation\Component\Symbol\Factory
+            {
+                return $this->inner->symbol();
+            }
+
+            public function mainControls(): \ILIAS\UI\Implementation\Component\MainControls\Factory
+            {
+                return $this->inner->mainControls();
+            }
+
+            public function button(): \ILIAS\UI\Implementation\Component\Button\Factory
+            {
+                return new \ILIAS\UI\Implementation\Component\Button\Factory();
+            }
+
+            public function link(): \ILIAS\UI\Implementation\Component\Link\Factory
+            {
+                return new \ILIAS\UI\Implementation\Component\Link\Factory();
+            }
+        };
+
+        return $factory_with_button;
     }
 }
diff --git a/components/ILIAS/UI/tests/Component/Symbol/Glyph/GlyphTest.php b/components/ILIAS/UI/tests/Component/Symbol/Glyph/GlyphTest.php
index 8c43362d56d2..841e74617ee4 100755
--- a/components/ILIAS/UI/tests/Component/Symbol/Glyph/GlyphTest.php
+++ b/components/ILIAS/UI/tests/Component/Symbol/Glyph/GlyphTest.php
@@ -197,18 +197,6 @@ public function testGlyphNoAction(string $factory_method): void
         $g = $f->$factory_method();
 
         $this->assertNotNull($g);
-        $this->assertEquals(null, $g->getAction());
-    }
-
-    #[\PHPUnit\Framework\Attributes\DataProvider('getGlyphTypeProvider')]
-    public function testWithUnavailableAction(string $factory_method): void
-    {
-        $f = $this->getGlyphFactory();
-        $g = $f->$factory_method();
-        $g2 = $f->$factory_method()->withUnavailableAction();
-
-        $this->assertTrue($g->isActive());
-        $this->assertFalse($g2->isActive());
     }
 
     public function testWithHighlight(): void
@@ -355,29 +343,10 @@ public function testRenderSimple(string $type): void
         $css_classes = self::$canonical_css_classes[$type];
         $aria_label = self::$aria_labels[$type];
 
-        $expected = '<a class="glyph" aria-label="' . $aria_label . '"><span class="' . $css_classes . '" aria-hidden="true"></span></a>';
+        $expected = '<span class="glyph" aria-label="' . $aria_label . '"><span class="' . $css_classes . '" aria-hidden="true"></span></span>';
         $this->assertEquals($expected, $html);
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('getGlyphTypeProvider')]
-    public function testRenderWithUnavailableAction(string $type): void
-    {
-        $f = $this->getGlyphFactory();
-        $r = $this->getDefaultRenderer();
-        $c = $f->$type()->withUnavailableAction();
-
-        $html = $this->normalizeHTML($r->render($c));
-
-        $css_classes = self::$canonical_css_classes[$type];
-        $aria_label = self::$aria_labels[$type];
-
-        $expected = '
-        <a class="glyph disabled" aria-label="' . $aria_label . '" aria-disabled="true">
-            <span class="' . $css_classes . '" aria-hidden="true"></span>
-        </a>';
-        $this->assertEquals($this->brutallyTrimHTML($expected), $this->brutallyTrimHTML($html));
-    }
-
     #[\PHPUnit\Framework\Attributes\DataProvider('getCounterTypeProvider')]
     public function testRenderWithCounter(string $type): void
     {
@@ -392,11 +361,11 @@ public function testRenderWithCounter(string $type): void
         $aria_label = self::$aria_labels[G\Glyph::MAIL];
 
         $expected = '
-            <a class="glyph" aria-label="' . $aria_label . '">
+            <span class="glyph" aria-label="' . $aria_label . '">
                     <span class="' . $css_classes . '" aria-hidden="true"></span>
                     <span class="il-counter"><span class="badge badge-notify il-counter-' . $type . '">42</span></span>
                     <span class="il-counter-spacer">42</span>
-            </a>';
+            </span>';
         $this->assertHTMLEquals($expected, $html);
     }
 
@@ -413,12 +382,12 @@ public function testRenderWithTwoCounters(): void
 
         $css_classes = self::$canonical_css_classes[G\Glyph::MAIL];
         $aria_label = self::$aria_labels[G\Glyph::MAIL];
-        $expected = '<a class="glyph" aria-label="' . $aria_label . '">' .
+        $expected = '<span class="glyph" aria-label="' . $aria_label . '">' .
                     '<span class="' . $css_classes . '" aria-hidden="true"></span>' .
                     '<span class="il-counter"><span class="badge badge-notify il-counter-status">7</span></span>' .
                     '<span class="il-counter"><span class="badge badge-notify il-counter-novelty">42</span></span>' .
                     '<span class="il-counter-spacer">42</span>' .
-                    '</a>';
+                    '</span>';
         $this->assertHTMLEquals($expected, $html);
     }
 
@@ -460,7 +429,7 @@ public function testRenderWithOnLoadCode(string $type): void
         $aria_label = self::$aria_labels[$type];
 
         $id = $ids[0];
-        $expected = '<a class="glyph" aria-label="' . $aria_label . '" id="' . $id . '"><span class="' . $css_classes . '" aria-hidden="true"></span></a>';
+        $expected = '<a class="glyph" aria-label="' . $aria_label . '" role="img" id="' . $id . '"><span class="' . $css_classes . '" aria-hidden="true"></span></a>';
         $this->assertEquals($expected, $html);
     }
 }