diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 6cee886bb9de7011a75862a9d135022914072483..711494a4ed0db26d2fae8335c63bc5a15d347172 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -222,7 +222,7 @@ class Admin_CoursesController extends AuthenticatedController
             $actions->addLink(
                 _('Neue Veranstaltung anlegen'),
                   URLHelper::getURL('dispatch.php/course/wizard'),
-                  Icon::create('seminar+add')
+                  Icon::create('add')
             )->asDialog('size=50%');
             $actions->addLink(
                 _('Diese Seitenleiste konfigurieren'),
diff --git a/app/controllers/admin/plugin.php b/app/controllers/admin/plugin.php
index 91f597245f7b812a114c7884f3c2e63c55685184..044fc50ca702736c541c69223ae80a2eb834e7a5 100644
--- a/app/controllers/admin/plugin.php
+++ b/app/controllers/admin/plugin.php
@@ -56,18 +56,15 @@ class Admin_PluginController extends AuthenticatedController
         $views = Sidebar::get()->addWidget(new ViewsWidget());
         $views->addLink(
             _('Pluginverwaltung'),
-            $this->indexURL(),
-            Icon::create('plugin')
+            $this->indexURL()
         )->setActive($action === 'index');
         $views->addLink(
             _('Weitere Plugins installieren'),
-            $this->searchURL(),
-            Icon::create('search')
+            $this->searchURL()
         )->setActive($action === 'search');
         $views->addLink(
             _('Vorhandene Plugins registrieren'),
-            $this->unregisteredURL(),
-            Icon::create('plugin+add')
+            $this->unregisteredURL()
         )->setActive($action === 'unregistered');
     }
 
diff --git a/app/controllers/admin/statusgroups.php b/app/controllers/admin/statusgroups.php
index 57ad3185f6949cf34c2d81d99f893fdaf856a6a6..aee95f930889564a696e36f769ac2e24fdba37a9 100644
--- a/app/controllers/admin/statusgroups.php
+++ b/app/controllers/admin/statusgroups.php
@@ -70,7 +70,7 @@ class Admin_StatusgroupsController extends AuthenticatedController
             $widget = new ActionsWidget();
             $widget->addLink(_('Neue Gruppe anlegen'),
                              $this->url_for('admin/statusgroups/editGroup'),
-                             Icon::create('group3+add', 'clickable'))
+                             Icon::create('add', 'clickable'))
                    ->asDialog('size=auto');
             $widget->addLink(_('Gruppenreihenfolge ändern'),
                              $this->url_for('admin/statusgroups/sortGroups'),
diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index ab9f23bc77baab8de19f648e0988ca7f158b7e23..9c9491c7e867f78d16aa1ca04b2db252a8d21d12 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -1528,18 +1528,18 @@ class Admin_UserController extends AuthenticatedController
             $actions->addLink(
                 _('Neues Konto anlegen'),
                 $this->url_for('admin/user/new'),
-                Icon::create('person+add')
+                Icon::create('add')
             )->asDialog();
         }
         $actions->addLink(
             _('Vorläufiges Konto anlegen'),
             $this->url_for('admin/user/new/prelim'),
-            Icon::create('date+add')
+            Icon::create('add')
         )->asDialog();
         $actions->addLink(
             _('Konten zusammenführen'),
             $this->url_for('admin/user/migrate/' . (($this->user && is_array($this->user)) ? $this->user['user_id'] : '')),
-            Icon::create('persons+new')
+            Icon::create('community')
         );
 
         $search = $sidebar->addWidget(new SearchWidget());
@@ -1554,7 +1554,7 @@ class Admin_UserController extends AuthenticatedController
             $export = $sidebar->addWidget(new ExportWidget());
             $export->addLink(_('Suchergebnis exportieren'),
                 $this->url_for('admin/user?export=1'),
-                Icon::create('persons+move_right')
+                Icon::create('export')
             );
         }
 
diff --git a/app/controllers/admission/restricted_courses.php b/app/controllers/admission/restricted_courses.php
index 5ae3a38add7fe9409ce87192b718d2e6728c8d88..f611f0941033a16b0b0588650b9195abb8c62633 100644
--- a/app/controllers/admission/restricted_courses.php
+++ b/app/controllers/admission/restricted_courses.php
@@ -32,7 +32,7 @@ class Admission_RestrictedCoursesController extends AuthenticatedController
     {
 
         $actions = new ActionsWidget();
-        $actions->addLink(_("Export"), $this->url_for('admission/restricted_courses', ['csv' => 1]), Icon::create('file-excel+export', 'clickable'));
+        $actions->addLink(_("Export"), $this->url_for('admission/restricted_courses', ['csv' => 1]), Icon::create('export', 'clickable'));
         Sidebar::get()->addWidget($actions);
 
         $sem_condition = "";
diff --git a/app/controllers/consultation/admin.php b/app/controllers/consultation/admin.php
index eca774c4d203a15bdcf82a5311c451fad692c199..3708bc872cba2ab3329ae9195f76d272b6d09c32 100644
--- a/app/controllers/consultation/admin.php
+++ b/app/controllers/consultation/admin.php
@@ -817,12 +817,12 @@ class Consultation_AdminController extends ConsultationController
         $export->addLink(
             _('Anmeldungen exportieren'),
             $this->url_for('consultation/export/bookings', $action === 'expired'),
-            Icon::create('file-excel+export')
+            Icon::create('export')
         );
         $export->addLink(
             _('Alle Termine exportieren'),
             $this->url_for('consultation/export/all', $action === 'expired'),
-            Icon::create('file-excel+export')
+            Icon::create('export')
         );
     }
 
diff --git a/app/controllers/contact.php b/app/controllers/contact.php
index 1453f91d2eb8ca9e6d4ab124315cdafc1225a963..35b693c565ed7410808ac18370f346503a33d275 100644
--- a/app/controllers/contact.php
+++ b/app/controllers/contact.php
@@ -221,7 +221,7 @@ class ContactController extends AuthenticatedController
         $actions->addLink(
             _('Neue Gruppe anlegen'),
             $this->url_for('contact/editGroup'),
-            Icon::create('group3+add')
+            Icon::create('group3')
         )->asDialog('size=auto');
         $actions->addLink(
             _('Nachricht an alle'),
diff --git a/app/controllers/course/details.php b/app/controllers/course/details.php
index bcd4f54172db9b5dc5196818f91285600d97e454..5eaedf763d66d3d75b4dc5546415d84900874ec0 100644
--- a/app/controllers/course/details.php
+++ b/app/controllers/course/details.php
@@ -287,7 +287,7 @@ class Course_DetailsController extends AuthenticatedController
                     'cid'    => null,
                     'again'  => 'yes',
                 ]),
-                Icon::create('group')
+                Icon::create('clipboard')
             );
             $sidebar->addWidget($share);
 
diff --git a/app/controllers/course/feedback.php b/app/controllers/course/feedback.php
index a4d79e3f47d3e229c9afe758ae3df3d2ca4a4305..cd970a03e4190fdc1718b334a0888d22cd3b7e73 100644
--- a/app/controllers/course/feedback.php
+++ b/app/controllers/course/feedback.php
@@ -49,7 +49,7 @@ class Course_FeedbackController extends AuthenticatedController
                 $widget->addLink(
                     _('Neues Feedback-Element'),
                     $this->url_for('course/feedback/create_form'),
-                    Icon::create('star+add')
+                    Icon::create('star')
                 )->asDialog();
             }
         }
diff --git a/app/controllers/course/files.php b/app/controllers/course/files.php
index cccbdeec0fe4824b45dc4145c6835474fd79edfa..6cfef6e750d8c58149d29e372c91bc714a5a515f 100644
--- a/app/controllers/course/files.php
+++ b/app/controllers/course/files.php
@@ -73,7 +73,7 @@ class Course_FilesController extends AuthenticatedController
             $actions->addLink(
                 _('Neuer Ordner'),
                 URLHelper::getUrl('dispatch.php/file/new_folder/' . $this->topFolder->getId()),
-                Icon::create('folder-empty+add', 'clickable')
+                Icon::create('folder-empty', 'clickable')
             )->asDialog();
 
         }
@@ -81,7 +81,7 @@ class Course_FilesController extends AuthenticatedController
             $actions->addLink(
                 _('Dokument hinzufügen'),
                 '#',
-                Icon::create('file+add', 'clickable'),
+                Icon::create('add', 'clickable'),
                 ['onclick' => "STUDIP.Files.openAddFilesWindow(); return false;"]
             );
         }
@@ -89,7 +89,7 @@ class Course_FilesController extends AuthenticatedController
             $actions->addLink(
                 _('Neues Feedback-Element'),
                 $this->url_for('course/feedback/create_form/' . $this->topFolder->getId() . '/Folder'),
-                Icon::create('star+add')
+                Icon::create('star')
             )->asDialog();
 
         }
diff --git a/app/controllers/course/grouping.php b/app/controllers/course/grouping.php
index 2386a4d98d9dc47669c93ef9984a68b25a432f55..e35728255ca71386a23d56758fb5b9dfdbd5d1ab 100644
--- a/app/controllers/course/grouping.php
+++ b/app/controllers/course/grouping.php
@@ -133,7 +133,7 @@ class Course_GroupingController extends AuthenticatedController
             $actions->addLink(
                 _('Unterveranstaltungen anlegen'),
                 $this->url_for('course/grouping/create_children'),
-                Icon::create('seminar+add', 'clickable')
+                Icon::create('add', 'clickable')
             )->asDialog('size=auto');
             $sidebar->addWidget($actions);
         }
diff --git a/app/controllers/course/ilias_interface.php b/app/controllers/course/ilias_interface.php
index d6ebce2083a3814fe7efece8b4bd5698aa5c859a..a07e24ad6374e132cba480b288ff400b22c9f31e 100644
--- a/app/controllers/course/ilias_interface.php
+++ b/app/controllers/course/ilias_interface.php
@@ -103,14 +103,14 @@ class Course_IliasInterfaceController extends AuthenticatedController
                 $widget->addLink(
                     _('Lernobjekte suchen'),
                     $this->url_for('course/ilias_interface/add_object/search'),
-                    Icon::create('learnmodule+add')
+                    Icon::create('add')
                 )->asDialog();
             }
             if ($this->author_permission) {
                 $widget->addLink(
                     _('Meine Lernobjekte'),
                     $this->url_for('course/ilias_interface/add_object/my_modules'),
-                    Icon::create('learnmodule+add')
+                    Icon::create('add')
                 )->asDialog();
             }
             if ($this->ilias_interface_config['search_active'] || $this->author_permission) {
@@ -124,20 +124,20 @@ class Course_IliasInterfaceController extends AuthenticatedController
             $widget->addLink(
                 _('Neuen ILIAS-Kurs anlegen'),
                 $this->url_for('course/ilias_interface/add_object/new_course'),
-                Icon::create('seminar+add')
+                Icon::create('add')
             )->asDialog('size=auto;reload-on-close');
             if ($this->change_course_permission) {
                 $widget->addLink(
                     _('ILIAS-Kurs aus einer anderen Veranstaltung zuordnen'),
                     $this->url_for('course/ilias_interface/add_object/assign_course'),
-                    Icon::create('seminar+add')
+                    Icon::create('learnmodule')
                 )->asDialog('size=auto;reload-on-close');
             }
             if ($this->add_own_course_permission) {
                 $widget->addLink(
                     _('Eigenen ILIAS-Kurs zuordnen'),
                     $this->url_for('course/ilias_interface/add_object/assign_own_course'),
-                    Icon::create('seminar+add')
+                    Icon::create('learnmodule')
                 )->asDialog('size=auto;reload-on-close');
             }
         }
@@ -152,7 +152,7 @@ class Course_IliasInterfaceController extends AuthenticatedController
                 $widget->addLink(
                     sprintf(_('Verknüpfung zu %s entfernen'), $this->ilias_list[$ilias_index]->getName()),
                     $this->url_for("course/ilias_interface/remove_course/{$ilias_index}/{$crs_id}"),
-                    Icon::create('seminar+remove'),
+                    Icon::create('trash'),
                     [
                         'data-confirm' => sprintf(
                             _('Verknüpfung zum Kurs in %s entfernen? Hierdurch werden auch die Verknüpfungen zu allen Objekten innerhalb des Kurses entfernt.'),
@@ -170,7 +170,7 @@ class Course_IliasInterfaceController extends AuthenticatedController
                 $widget->addLink(
                     _('Gruppen übertragen'),
                     $this->url_for('course/ilias_interface/add_groups'),
-                    Icon::create('group2+refresh')
+                    Icon::create('group2')
                 )->asDialog('size=auto');
             }
             if ($this->author_permission) {
diff --git a/app/controllers/course/management.php b/app/controllers/course/management.php
index 2f8bc7b2d621da9fb470d20060cfb4c31fa421aa..b3b92681ce41fcaee47da0c128f37aa7f4be32a9 100644
--- a/app/controllers/course/management.php
+++ b/app/controllers/course/management.php
@@ -66,7 +66,7 @@ class Course_ManagementController extends AuthenticatedController
                     $actions->addLink(
                         _('Veranstaltung kopieren'),
                         URLHelper::getURL($this->url_for('course/wizard/copy/'.$course->id), ['studip_ticket' => Seminar_Session::get_ticket()]),
-                        Icon::create('seminar+add')
+                        Icon::create('seminar')
                     );
                 }
 
@@ -74,7 +74,7 @@ class Course_ManagementController extends AuthenticatedController
                     $actions->addLink(
                         _('Veranstaltung löschen'),
                         URLHelper::getURL( $this->url_for('course/archive/confirm'), ['studip_ticket' => Seminar_Session::get_ticket()]),
-                        Icon::create('seminar+remove')
+                        Icon::create('trash')
                     )->asDialog('size=auto');
                 }
 
diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php
index 4e6afdc44f50552f63e661ab987161c1db172427..e9cdb5f34727e9eae72e4657aaaddeb70ea8acb0 100644
--- a/app/controllers/course/members.php
+++ b/app/controllers/course/members.php
@@ -203,7 +203,7 @@ class Course_MembersController extends AuthenticatedController
         $results = SimpleCollection::createFromArray($members)->pluck('email');
 
         if (!empty($results)) {
-            return sprintf('<a href="mailto:%s">%s</a>', htmlReady(join(',', $results)), Icon::create('mail+move_right', 'clickable', ['title' => sprintf('E-Mail an alle %s versenden',$textStatus)])->asImg(16));
+            return sprintf('<a href="mailto:%s">%s</a>', htmlReady(join(',', $results)), Icon::create('mail', 'clickable', ['title' => sprintf('E-Mail an alle %s versenden',$textStatus)])->asImg(16));
         } else {
             return null;
         }
@@ -1426,7 +1426,7 @@ class Course_MembersController extends AuthenticatedController
                     'course_id' => $this->course_id,
                     'default_subject' => $this->subject
                 ]),
-                Icon::create('inbox')
+                Icon::create('mail')
             )->asDialog('size=auto');
         }
         if ($this->is_tutor) {
@@ -1497,7 +1497,7 @@ class Course_MembersController extends AuthenticatedController
                             $membersOfInstitute)
                         ->setNavigationItem('/course/members/view')
                         ->render();
-                    $element = LinkElement::fromHTML($mp, Icon::create('community+add'));
+                    $element = LinkElement::fromHTML($mp, Icon::create('add'));
                     $widget->addElement($element);
                 }
                 if (!$this->tutor_is_locked) {
@@ -1553,7 +1553,7 @@ class Course_MembersController extends AuthenticatedController
                             $membersOfInstitute)
                         ->setNavigationItem('/course/members/view')
                         ->render();
-                    $element = LinkElement::fromHTML($mp, Icon::create('community+add'));
+                    $element = LinkElement::fromHTML($mp, Icon::create('add'));
                     $widget->addElement($element);
                 }
             }
@@ -1617,7 +1617,7 @@ class Course_MembersController extends AuthenticatedController
                     ->render();
                 $widget->addElement(LinkElement::fromHTML(
                     $mp,
-                    Icon::create('community+add')
+                    Icon::create('add')
                 ));
 
                 // add "add person to waitlist" to sidebar
@@ -1644,13 +1644,13 @@ class Course_MembersController extends AuthenticatedController
                         ->addQuickfilter(_('Mitglieder der Einrichtung'), $membersOfInstitute)
                         ->setNavigationItem('/course/members/view')
                         ->render();
-                    $element = LinkElement::fromHTML($mp, Icon::create('community+add'));
+                    $element = LinkElement::fromHTML($mp, Icon::create('add'));
                     $widget->addElement($element);
                 }
                 $widget->addLink(
                     _('Teilnehmendenliste importieren'),
                     $this->url_for('course/members/import_autorlist'),
-                    Icon::create('community+add'),
+                    Icon::create('persons'),
                     ['data-dialog' => 1]
                 );
             }
@@ -1671,7 +1671,7 @@ class Course_MembersController extends AuthenticatedController
                 );
                 $widget->addLinkFromHTML(
                     $csvExport,
-                    Icon::create('file-office')
+                    Icon::create('export')
                 );
 
                 // create csv-export link
@@ -1687,7 +1687,7 @@ class Course_MembersController extends AuthenticatedController
                 );
                 $widget->addLinkFromHTML(
                     $rtfExport,
-                    Icon::create('file-text')
+                    Icon::create('export')
                 );
 
                 if (count($this->awaiting) > 0) {
@@ -1703,7 +1703,7 @@ class Course_MembersController extends AuthenticatedController
                     );
                     $widget->addLinkFromHTML(
                         $awaiting_rtf,
-                        Icon::create('file-office+export')
+                        Icon::create('export')
                     );
 
                     $awaiting_csv = export_link(
@@ -1718,7 +1718,7 @@ class Course_MembersController extends AuthenticatedController
                     );
                     $widget->addLinkFromHTML(
                         $awaiting_csv,
-                        Icon::create('file-text+export')
+                        Icon::create('export')
                     );
                 }
             }
diff --git a/app/controllers/course/overview.php b/app/controllers/course/overview.php
index 3d209e6c652da6fa0ababeb13f9195474cce5596..bfff5538c729043b379e0ef5ad3783fbd46d0445 100644
--- a/app/controllers/course/overview.php
+++ b/app/controllers/course/overview.php
@@ -153,7 +153,7 @@ class Course_OverviewController extends AuthenticatedController
                     'cid'   => null,
                     'again' => 'yes',
                 ]),
-                Icon::create('group')
+                Icon::create('clipboard')
             );
         } else {
             $share->addCopyableLink(
@@ -163,7 +163,7 @@ class Course_OverviewController extends AuthenticatedController
                     'cid'    => null,
                     'again'  => 'yes',
                 ]),
-                Icon::create('group')
+                Icon::create('clipboard')
             );
         }
         $sidebar->addWidget($share);
diff --git a/app/controllers/course/statusgroups.php b/app/controllers/course/statusgroups.php
index 4013c8c5f0cd22ffd1e40ce5b437ee204c2d9547..46618e2fe47277a7894a64e3303ca29f76d76d07 100644
--- a/app/controllers/course/statusgroups.php
+++ b/app/controllers/course/statusgroups.php
@@ -236,14 +236,14 @@ class Course_StatusgroupsController extends AuthenticatedController
         if ($this->is_tutor) {
             if (!$this->is_locked) {
                 $actions->addLink(
-                    _('Neue Gruppe anlegen'),
+                    _('Gruppe anlegen'),
                     $this->url_for('course/statusgroups/edit'),
                     Icon::create('add')
                 )->asDialog('size=auto');
                 $actions->addLink(
                     _('Mehrere Gruppen anlegen'),
                     $this->url_for('course/statusgroups/create_groups'),
-                    Icon::create('group2+add')
+                    Icon::create('add')
                 )->asDialog('size=auto');
             }
             if (Config::get()->EXPORT_ENABLE) {
@@ -252,18 +252,18 @@ class Course_StatusgroupsController extends AuthenticatedController
                 $csvExport = export_link($this->course_id, 'person',
                     sprintf('%s %s', _('Gruppenliste'), htmlReady($this->course_title)),
                     'csv', 'csv-gruppen', 'status',
-                    _('Gruppen als CSV-Dokument exportieren'),
+                    _('Als CSV-Dokument exportieren'),
                     'passthrough');
-                $element = LinkElement::fromHTML($csvExport, Icon::create('file-office'));
+                $element = LinkElement::fromHTML($csvExport, Icon::create('export'));
                 $export->addElement($element);
 
                 // create rtf-export link
                 $rtfExport = export_link($this->course_id, 'person',
                     sprintf('%s %s', _('Gruppenliste'), htmlReady($this->course_title)),
                     'rtf', 'rtf-gruppen', 'status',
-                    _('Gruppen als RTF-Dokument exportieren'),
+                    _('Als RTF-Dokument exportieren'),
                     'passthrough');
-                $element = LinkElement::fromHTML($rtfExport, Icon::create('file-text'));
+                $element = LinkElement::fromHTML($rtfExport, Icon::create('export'));
                 $export->addElement($element);
 
                 $sidebar->addWidget($export);
@@ -287,7 +287,7 @@ class Course_StatusgroupsController extends AuthenticatedController
             $actions->addLink(
                 _('Alle Gruppen aufklappen'),
                 $this->url_for('course/statusgroups', ['open_groups' => '1']),
-                Icon::create('arr_2down')
+                Icon::create('arr_1down')
             );
         }
         $sidebar->addWidget($actions);
diff --git a/app/controllers/course/studygroup.php b/app/controllers/course/studygroup.php
index cbe711e2cc12c67ca38758d07f21f1686f1e33ee..58032b86c322811446b0107826e298e954472304 100644
--- a/app/controllers/course/studygroup.php
+++ b/app/controllers/course/studygroup.php
@@ -376,7 +376,7 @@ class Course_StudygroupController extends AuthenticatedController
             $actions->addLink(
                 _('Neue Studiengruppe anlegen'),
                 $this->url_for('course/wizard?studygroup=1'),
-                Icon::create('studygroup+add')
+                Icon::create('add')
             );
             if ($GLOBALS['perm']->have_studip_perm('tutor', $id)) {
                 $actions->addLink(
@@ -551,7 +551,7 @@ class Course_StudygroupController extends AuthenticatedController
                                     ->setNavigationItem('/course/members')
                                     ->render();
 
-            $element = LinkElement::fromHTML($mp, Icon::create('community+add', 'clickable'));
+            $element = LinkElement::fromHTML($mp, Icon::create('add', 'clickable'));
             $actions->addElement($element);
         }
 
diff --git a/app/controllers/course/topics.php b/app/controllers/course/topics.php
index c8218569f3d07f4f46544bbb32714644e49b5e67..d90955f9b2b757b3f88a3a7a6b98200129f71b49 100644
--- a/app/controllers/course/topics.php
+++ b/app/controllers/course/topics.php
@@ -250,7 +250,7 @@ class Course_TopicsController extends AuthenticatedController
             $actions->addLink(
                 _('Themen aus Veranstaltung kopieren'),
                 $this->url_for('course/topics/copy'),
-                Icon::create('topic+add')
+                Icon::create('clipboard')
             )->asDialog();
         }
 
diff --git a/app/controllers/fachabschluss/abschluesse.php b/app/controllers/fachabschluss/abschluesse.php
index 4d3bca8c78d27a9fad9e892a6d665f1b52871396..e7d350dca9f64ee86eaefef35cb4db09c6412a0f 100644
--- a/app/controllers/fachabschluss/abschluesse.php
+++ b/app/controllers/fachabschluss/abschluesse.php
@@ -180,7 +180,7 @@ class Fachabschluss_AbschluesseController extends MVVController
             $widget->addLink(
                 _('Neuen Abschluss anlegen'),
                 $this->url_for('/abschluss'),
-                    Icon::create('file')
+                    Icon::create('add')
             );
             $sidebar->addWidget($widget);
         }
diff --git a/app/controllers/fachabschluss/faecher.php b/app/controllers/fachabschluss/faecher.php
index 1240a88fd15f0a0a09ee4f0b106c4af390e3524e..b767005af7e62fb4776883b963073919a98172bc 100644
--- a/app/controllers/fachabschluss/faecher.php
+++ b/app/controllers/fachabschluss/faecher.php
@@ -228,7 +228,7 @@ class Fachabschluss_FaecherController extends MVVController
             $widget->addLink(
                 _('Neues Fach anlegen'),
                 $this->url_for('/fach'),
-                Icon::create('file+add')
+                Icon::create('add')
             );
             $sidebar->addWidget($widget);
         }
diff --git a/app/controllers/fachabschluss/kategorien.php b/app/controllers/fachabschluss/kategorien.php
index 892ec5ea77f54f048179fd28caedf045fbe6b0cb..8c005879d5ab210c6c57cb7f68553683f5459a9d 100644
--- a/app/controllers/fachabschluss/kategorien.php
+++ b/app/controllers/fachabschluss/kategorien.php
@@ -225,7 +225,7 @@ class Fachabschluss_KategorienController extends MVVController
             $widget->addLink(
                 _('Neue Abschluss-Kategorie anlegen'),
                 $this->url_for('/kategorie'),
-                Icon::create('file+add')
+                Icon::create('add')
             );
             $sidebar->addWidget($widget);
         }
diff --git a/app/controllers/files.php b/app/controllers/files.php
index 531463d7d6738daf74b5b863f07c5d148f18e500..aaa26ef5669f4140d6e5e0535a4b5344dcf10da1 100644
--- a/app/controllers/files.php
+++ b/app/controllers/files.php
@@ -96,7 +96,7 @@ class FilesController extends AuthenticatedController
             $actions->addLink(
                 _('Neuer Ordner'),
                 URLHelper::getUrl('dispatch.php/file/new_folder/' . $folder->getId()),
-                Icon::create('folder-empty+add', 'clickable'), ['data-dialog' => 1]
+                Icon::create('folder-empty', 'clickable'), ['data-dialog' => 1]
             );
         }
 
@@ -113,7 +113,7 @@ class FilesController extends AuthenticatedController
             $actions->addLink(
                 _('Dokument hinzufügen'),
                 '#',
-                Icon::create('file+add', 'clickable'),
+                Icon::create('add', 'clickable'),
                 ['onClick' => "STUDIP.Files.openAddFilesWindow(); return false;"]
             );
         }
diff --git a/app/controllers/files_dashboard/helpers.php b/app/controllers/files_dashboard/helpers.php
index 1e4e27175852c3295c9c091a0488ae43c95438bc..3519fb8ba5f6a525bfb195a69eecd3062dfbb35e 100644
--- a/app/controllers/files_dashboard/helpers.php
+++ b/app/controllers/files_dashboard/helpers.php
@@ -56,7 +56,7 @@ trait Helpers
             $actionMenu->addLink(
                 URLHelper::getURL('dispatch.php/file/choose_destination/move/'.$fileRef->id),
                 _('Datei verschieben'),
-                Icon::create('file+move_right', Icon::ROLE_CLICKABLE, ['size' => 20]),
+                Icon::create('arr_1right', Icon::ROLE_CLICKABLE, ['size' => 20]),
                 ['data-dialog' => 'size=auto']
             );
         }
@@ -65,7 +65,7 @@ trait Helpers
             $actionMenu->addLink(
                 URLHelper::getURL('dispatch.php/file/choose_destination/copy/'.$fileRef->id),
                 _('Datei kopieren'),
-                Icon::create('file+add', Icon::ROLE_CLICKABLE, ['size' => 20]),
+                Icon::create('clipboard', Icon::ROLE_CLICKABLE, ['size' => 20]),
                 ['data-dialog' => 'size=auto']
             );
         }
diff --git a/app/controllers/files_dashboard/sidebar.php b/app/controllers/files_dashboard/sidebar.php
index 347b99c35b2521cea281c79fc3e40964dd3870ec..9fcc237c30304a901d222d066352880c07466805 100644
--- a/app/controllers/files_dashboard/sidebar.php
+++ b/app/controllers/files_dashboard/sidebar.php
@@ -23,7 +23,7 @@ trait Sidebar
         $actions->addLink(
             _('Datei hinzufügen'),
             $this->url_for('file/choose_destination/upload'),
-            \Icon::create('file+add', 'clickable'),
+            \Icon::create('add', 'clickable'),
             ['data-dialog' => 'size=auto']
         );
 
diff --git a/app/controllers/institute/files.php b/app/controllers/institute/files.php
index 8ff697b39daadcbaa998b7d3787e17e9ca1da8e4..9f2cdd5559bf6b012b27f1a41f48107c093c8f87 100644
--- a/app/controllers/institute/files.php
+++ b/app/controllers/institute/files.php
@@ -67,14 +67,14 @@ class Institute_FilesController extends AuthenticatedController
                 URLHelper::getUrl(
                     'dispatch.php/file/new_folder/' . $this->topFolder ->getId()
                 ),
-                Icon::create('folder-empty+add', 'clickable')
+                Icon::create('folder-empty', 'clickable')
             )->asDialog();
         }
         if ($this->topFolder && $this->topFolder->isWritable($GLOBALS['user']->id)) {
             $actions->addLink(
                 _('Dokument hinzufügen'),
                 '#',
-                Icon::create('file+add', 'clickable'),
+                Icon::create('add', 'clickable'),
                 ['onclick' => "STUDIP.Files.openAddFilesWindow(); return false;"]
             );
         }
diff --git a/app/controllers/lvgruppen/lvgruppen.php b/app/controllers/lvgruppen/lvgruppen.php
index 43831cbe5560e461a5d6f4b73e8ce86a71e918c4..e9050de1c5b2e076d8edfce2af641d44b3ae8c42 100644
--- a/app/controllers/lvgruppen/lvgruppen.php
+++ b/app/controllers/lvgruppen/lvgruppen.php
@@ -94,17 +94,17 @@ class Lvgruppen_LvgruppenController extends MVVController
 
         $this->setSidebar();
         $sidebar = Sidebar::get();
-        $widget  = new ActionsWidget();
+        $widget  = new ExportWidget();
 
         $widget->addLink(_('Lehrveranstaltungsgruppen mit Zuordnungen exportieren'),
                 $this->url_for('/export_xls'),
-                Icon::create('download'));
+                Icon::create('export'));
 
         if (Config::get()->MVV_ALLOW_CREATE_LVGRUPPEN_INDEPENDENTLY
                 && MvvPerm::havePermCREATE('Lvgruppe')) {
             $widget->addLink(_('Neue LV-Gruppe anlegen'),
                 $this->url_for('/lvgruppe'),
-                Icon::create('file+add'), ['data-dialog' => 'size=auto']);
+                Icon::create('add'), ['data-dialog' => 'size=auto']);
         }
 
         $sidebar->addWidget($widget);
diff --git a/app/controllers/materialien/files.php b/app/controllers/materialien/files.php
index 629845a1bee37c92d215d810c06ba739e5c1d62f..ba5f2c8ba1efd9119f2280b59f2c0f80331ff059 100644
--- a/app/controllers/materialien/files.php
+++ b/app/controllers/materialien/files.php
@@ -614,7 +614,7 @@ class Materialien_FilesController extends MVVController
             $widget->addLink(
                 _('Neues Dokument anlegen'),
                 $this->url_for('/new_dokument'),
-                Icon::create('file+add')
+                Icon::create('add')
             )->asDialog('size=auto');
         }
         $sidebar->addWidget($widget);
diff --git a/app/controllers/messages.php b/app/controllers/messages.php
index 82d42d1cae5b1589a6e1aa63ce049dcb8c458f6a..c6672ae6dbf4bfc1a073d9cba6a2fb5339df7853 100644
--- a/app/controllers/messages.php
+++ b/app/controllers/messages.php
@@ -997,7 +997,7 @@ class MessagesController extends AuthenticatedController {
             $actions->addLink(
                 _('Neue Nachricht schreiben'),
                 $this->url_for('messages/write'),
-                Icon::create('mail+add'),
+                Icon::create('mail'),
                 ['data-dialog' => 'width=700;height=700']
             );
         }
diff --git a/app/controllers/module/module.php b/app/controllers/module/module.php
index cf7b6ac23d02ba6c34c29f009a0e8df93c1bf9b3..cb685826e0b801f8fa1b280ec43a55d417053f2c 100644
--- a/app/controllers/module/module.php
+++ b/app/controllers/module/module.php
@@ -1317,7 +1317,7 @@ class Module_ModuleController extends MVVController
             $widget->addLink(
                 _('Neues Modul anlegen'),
                 $this->url_for('/modul'),
-                Icon::create('file+add')
+                Icon::create('add')
             );
         }
         $sidebar->addWidget($widget, 'actions');
diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php
index 0c12f417bb5974013837c9b99c87cefd9b926071..a45ad4dd045a1cb751b86951d46c83f947bb6892 100644
--- a/app/controllers/my_courses.php
+++ b/app/controllers/my_courses.php
@@ -882,20 +882,20 @@ class MyCoursesController extends AuthenticatedController
             $setting_widget->addLink(
                 _('Neue Veranstaltung anlegen'),
                 URLHelper::getURL('dispatch.php/course/wizard'),
-                Icon::create('seminar+add')
+                Icon::create('add')
             )->asDialog();
         }
 
         $setting_widget->addLink(
             _('Veranstaltung hinzufügen'),
             URLHelper::getURL('dispatch.php/search/courses'),
-            Icon::create('seminar')
+            Icon::create('search')
         );
         if (Config::get()->STUDYGROUPS_ENABLE) {
             $setting_widget->addLink(
                 _('Neue Studiengruppe anlegen'),
                 URLHelper::getURL('dispatch.php/course/wizard', ['studygroup' => 1]),
-                Icon::create('studygroup+add')
+                Icon::create('studygroup')
             )->asDialog();
         }
 
diff --git a/app/controllers/my_institutes.php b/app/controllers/my_institutes.php
index 0bdff852d75e51e18692060ae8e3faf0cf8192db..514fd66380b3e61c18ef1c408bd232c680bf1c76 100644
--- a/app/controllers/my_institutes.php
+++ b/app/controllers/my_institutes.php
@@ -118,14 +118,14 @@ class MyInstitutesController extends AuthenticatedController
             $links->addLink(
                 _('Einrichtungsdaten bearbeiten'),
                 URLHelper::getURL('dispatch.php/settings/statusgruppen'),
-                Icon::create('institute+edit')
+                Icon::create('edit')
             );
         }
         if ($GLOBALS['perm']->have_perm('autor')) {
             $links->addLink(
                 _('Einrichtungen suchen'),
                 URLHelper::getURL('dispatch.php/search/globalsearch#GlobalSearchInstitutes'),
-                Icon::create('institute+add')
+                Icon::create('search')
             );
             $links->addLink(
                 _('Studiendaten bearbeiten'),
diff --git a/app/controllers/news.php b/app/controllers/news.php
index 9e685ea476518322878522e03c1d6b5a3303057d..d41ee6398c2659dcc4903a38ad394be7e1b4f668 100644
--- a/app/controllers/news.php
+++ b/app/controllers/news.php
@@ -582,7 +582,7 @@ class NewsController extends StudipController
         $widget->addLink(
             _('Ankündigung erstellen'),
             $this->url_for('news/edit_news/new'),
-            Icon::create('news+add'),
+            Icon::create('add'),
             ['target' => '_blank']
         )->asDialog();
         $this->sidebar->addWidget($widget);
diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index 21de27e61214397e754b6ab04dcfc2a7f3c9a8df..cd2994f9379b43993939cdd8cba414361aee541b 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -279,14 +279,14 @@ class ProfileController extends AuthenticatedController
                 $actions->addLink(
                     _('Zu den Kontakten hinzufügen'),
                     $this->url_for('profile/add_buddy?username=' . $this->current_user->username),
-                    Icon::create('person+add', Icon::ROLE_CLICKABLE, tooltip2(_('Zu den Kontakten hinzufügen'))),
+                    Icon::create('add', Icon::ROLE_CLICKABLE, tooltip2(_('Zu den Kontakten hinzufügen'))),
                     ['data-confirm' => _('Wollen Sie die Person wirklich als Kontakt hinzufügen?')]
                 )->asButton();
             } else {
                 $actions->addLink(
                     _('Von den Kontakten entfernen'),
                     $this->url_for('profile/remove_buddy', ['username' => $this->current_user->username]),
-                    Icon::create('person+remove', Icon::ROLE_CLICKABLE, tooltip2(_('Zu den Kontakten hinzufügen'))),
+                    Icon::create('trash', Icon::ROLE_CLICKABLE, tooltip2(_('Zu den Kontakten hinzufügen'))),
                     ['data-confirm' => _('Wollen Sie die Person wirklich von den Kontakten entfernen?')]
                 )->asButton();
             }
diff --git a/app/controllers/resources/resource.php b/app/controllers/resources/resource.php
index b2aaa783d7179099ef91b93217c893ac2ed4c664..e7570d2c0c0d73b15bb41cadc4d238ce1fbd2676 100644
--- a/app/controllers/resources/resource.php
+++ b/app/controllers/resources/resource.php
@@ -1446,7 +1446,7 @@ class Resources_ResourceController extends AuthenticatedController
             $actions->addLink(
                 _('Dokument hinzufügen'),
                 '#',
-                Icon::create('file+add'),
+                Icon::create('file'),
                 [
                     'onclick' => 'STUDIP.Files.openAddFilesWindow(); return false;'
                 ]
diff --git a/app/controllers/resources/room_request.php b/app/controllers/resources/room_request.php
index 3ab375d7e899a42a3d359e6f63177c4657fd4bfb..b12da6b0c45e4a5f44d1fbb7624bfb5a643b8116 100644
--- a/app/controllers/resources/room_request.php
+++ b/app/controllers/resources/room_request.php
@@ -557,7 +557,7 @@ class Resources_RoomRequestController extends AuthenticatedController
             $filter_reset_widget->addLink(
                 _('Filter zurücksetzen'),
                 $this->overviewURL(['reset_filter' => '1']),
-                Icon::create('filter+decline')
+                Icon::create('decline')
             );
             $sidebar->addWidget($filter_reset_widget);
         }
@@ -770,12 +770,12 @@ class Resources_RoomRequestController extends AuthenticatedController
         $export->addLink(
             _('Gefilterte Anfragen'),
             $this->export_listURL($export_url_params),
-            Icon::create('file-excel')
+            Icon::create('export')
         );
         $export->addLink(
             _('Alle Anfragen'),
             $this->export_listURL(),
-            Icon::create('file-excel')
+            Icon::create('export')
         );
         $sidebar->addWidget($export);
 
@@ -2593,7 +2593,7 @@ class Resources_RoomRequestController extends AuthenticatedController
             $filter_reset_widget->addLink(
                 _('Filter zurücksetzen'),
                 $this->planningURL(['reset_filter' => '1']),
-                Icon::create('filter+decline')
+                Icon::create('decline')
             );
             $sidebar->addWidget($filter_reset_widget);
         }
diff --git a/app/controllers/room_management/planning.php b/app/controllers/room_management/planning.php
index 95d806bde139109e5563980fcac83d2676cae3db..5890a66d17fdb8f97bc4ce690eaf64fc6248ac6e 100644
--- a/app/controllers/room_management/planning.php
+++ b/app/controllers/room_management/planning.php
@@ -286,7 +286,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
         $actions->addLink(
             _('Buchungen kopieren'),
             $this->url_for('room_management/planning/copy_bookings'),
-            Icon::create('assessment+add'),
+            Icon::create('clipboard'),
             ['data-dialog' => 'size=auto']
         );
         $sidebar->addWidget($actions);
@@ -1132,7 +1132,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
                     'date' => $this->date->format('d.m.Y')
                 ]
             ),
-            Icon::create('file-text')
+            Icon::create('export')
         );
         $actions->addLink(
             _('Export als CSV'),
@@ -1143,7 +1143,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
                     'date' => $this->date->format('d.m.Y')
                 ]
             ),
-            Icon::create('file-excel')
+            Icon::create('export')
         );
         $sidebar->addWidget($actions);
 
diff --git a/app/controllers/settings/deputies.php b/app/controllers/settings/deputies.php
index 910d93da467ede3b9bf918d883a7fb6c595d2ab2..69921667ea02a84a71ab79c8acce6e517a0e4fcf 100644
--- a/app/controllers/settings/deputies.php
+++ b/app/controllers/settings/deputies.php
@@ -93,7 +93,7 @@ class Settings_DeputiesController extends Settings_SettingsController
             ->setSearchObject($this->search)
             ->setNavigationItem('/links/settings/deputies')
             ->render();
-        $element = LinkElement::fromHTML($mp, Icon::create('community+add'));
+        $element = LinkElement::fromHTML($mp, Icon::create('add'));
         $actions->addElement($element);
         Sidebar::Get()->addWidget($actions);
     }
diff --git a/app/controllers/shared/contacts.php b/app/controllers/shared/contacts.php
index b1d82c4631074aadde6561e6c92490db3d0fb6b4..5ab74ebf8706c9d43ade406b7a95e96de9465c52 100644
--- a/app/controllers/shared/contacts.php
+++ b/app/controllers/shared/contacts.php
@@ -267,13 +267,13 @@ class Shared_ContactsController extends MVVController
             $widget->addLink(
                 _('Neuen Ansprechpartner anlegen'),
                 $this->url_for('/new_ansprechpartner'),
-                Icon::create('headache+add')
+                Icon::create('add')
             )->asDialog('size=auto');
         }
         $widget->addLink(
             _('Liste exportieren (CSV)'),
             $this->url_for('/export_csv'),
-            Icon::create('download')
+            Icon::create('export')
         );
         $sidebar->addWidget($widget);
 
diff --git a/app/controllers/studiengaenge/studiengaenge.php b/app/controllers/studiengaenge/studiengaenge.php
index 97a9a589c790d80460edcce934deaf22bbd1d188..f04a62a77feaf6e93e6e4eb65108d1126aab66ee 100644
--- a/app/controllers/studiengaenge/studiengaenge.php
+++ b/app/controllers/studiengaenge/studiengaenge.php
@@ -1027,7 +1027,7 @@ class Studiengaenge_StudiengaengeController extends MVVController
             $widget->addLink(
                 _('Neuen Studiengang anlegen'),
                 $this->url_for('/studiengang'),
-                Icon::create('file+add')
+                Icon::create('add')
             );
         }
         $sidebar->addWidget($widget);
diff --git a/app/controllers/studiengaenge/studiengangteile.php b/app/controllers/studiengaenge/studiengangteile.php
index ffd71517b53791fa8528f9f33049aab3b239d344..f5d7b2de1fa554c24037044ab73c4a6cb7a39dc1 100644
--- a/app/controllers/studiengaenge/studiengangteile.php
+++ b/app/controllers/studiengaenge/studiengangteile.php
@@ -251,7 +251,7 @@ class Studiengaenge_StudiengangteileController extends SharedVersionController
             $widget->addLink(
                 _('Neuen Studiengangteil anlegen'),
                 $this->url_for('/stgteil'),
-                Icon::create('file+add')
+                Icon::create('add')
             );
         }
         $sidebar->addWidget($widget);
diff --git a/app/controllers/studiengaenge/versionen.php b/app/controllers/studiengaenge/versionen.php
index cb0be78d26ad540e413bd62e8cbd9353d74a40c5..d7fcd705d06b51d12ab57308b0dc7954c794d9a0 100644
--- a/app/controllers/studiengaenge/versionen.php
+++ b/app/controllers/studiengaenge/versionen.php
@@ -281,7 +281,7 @@ class Studiengaenge_VersionenController extends SharedVersionController
                 $widget->addLink(
                     _('Neue Version anlegen'),
                     $this->url_for('/version', $this->chooser_filter['stgteil']),
-                    Icon::create('file+add')
+                    Icon::create('add')
                 );
             }
         }
diff --git a/app/views/admin/plugin/index.php b/app/views/admin/plugin/index.php
index 5f38b363dfba55f54fe6f59523f11ef9f2b0c47d..859083babbb4775ac41be23681bbcae6e72f9860 100644
--- a/app/views/admin/plugin/index.php
+++ b/app/views/admin/plugin/index.php
@@ -67,7 +67,7 @@ use Studip\Button, Studip\LinkButton;
                         <td <? if (!$plugin['enabled']) echo 'class="quiet"'; ?>>
                             <?= htmlReady($update_info[$pluginid]['version']) ?>
                         <? if ($plugin['automatic_update_url']): ?>
-                            <?= Icon::create('plugin+move_down', Icon::ROLE_STATUS_RED)->asImg([
+                            <?= Icon::create('install', Icon::ROLE_STATUS_RED)->asImg([
                                 'title' => _('Automatische Updates sind eingerichtet'),
                                 'style' => 'vertical-align: text-bottom',
                             ]) ?>
@@ -79,7 +79,7 @@ use Studip\Button, Studip\LinkButton;
                             <? if ($migrations[$pluginid]['schema_version'] < $migrations[$pluginid]['migration_top_version']): ?>
                                 <a href="<?= $controller->url_for('admin/plugin/migrate/' . $pluginid) ?>"
                                    title="<?= sprintf(_('Update auf Version %d verfügbar'), $migrations[$pluginid]['migration_top_version']) ?>">
-                                    <?= Icon::create('plugin+new') ?>
+                                    <?= Icon::create('plugin', Icon::ROLE_STATUS_RED) ?>
                                 </a>
                             <? endif; ?>
                         <? endif; ?>
@@ -100,7 +100,7 @@ use Studip\Button, Studip\LinkButton;
                                 <? $actionMenu->addLink(
                                     $controller->url_for('admin/plugin/edit_automaticupdate/' . $pluginid),
                                     $plugin['automatic_update_url'] ? _('Automatisches Update verwalten (eingerichtet)') : _('Automatisches Update verwalten'),
-                                    Icon::create('plugin+move_down', $plugin['automatic_update_url'] ? 'attention' : 'clickable', [
+                                    Icon::create('install', $plugin['automatic_update_url'] ? 'attention' : 'clickable', [
                                         'title' => $plugin['automatic_update_url']
                                                  ? _('Automatisches Update verwalten (eingerichtet)')
                                                  : _('Automatisches Update verwalten')
diff --git a/app/views/admin/role/show_role.php b/app/views/admin/role/show_role.php
index 161296f8f6c10234485ccf0367671c62452e7b6f..ba91fc5e30477c35699d3ce09e47a0d2698af987 100644
--- a/app/views/admin/role/show_role.php
+++ b/app/views/admin/role/show_role.php
@@ -144,7 +144,7 @@ use Studip\Button, Studip\LinkButton;
                         htmlReady($role->getRolename())) ?>
             <div class="actions">
                 <a href="<?= $controller->url_for('admin/role/add_plugin/' . $roleid) ?>" data-dialog="size=auto">
-                    <?= Icon::create('plugin+add', 'clickable') ?>
+                    <?= Icon::create('add', 'clickable') ?>
                     <?= _('Plugins hinzufügen') ?>
                 </a>
             </div>
diff --git a/app/views/admin/webservice_access/index.php b/app/views/admin/webservice_access/index.php
index 2a63164f4aa485c9a8144410261e18854df41cfb..b74b67c10ff3801a57eecde9ac34aba23db3f297 100644
--- a/app/views/admin/webservice_access/index.php
+++ b/app/views/admin/webservice_access/index.php
@@ -76,7 +76,7 @@
 $sidebar = Sidebar::Get();
 
 $actions = new ActionsWidget();
-$actions->addLink(_('Regeln testen'),$controller->url_for('admin/webservice_access/test'), Icon::create('add', 'clickable'));
+$actions->addLink(_('Regeln testen'),$controller->url_for('admin/webservice_access/test'), Icon::create('unit-test', 'clickable'));
 $actions->addLink(_('Neue Zugriffsregel anlegen'),$controller->url_for('admin/webservice_access/new'), Icon::create('add', 'clickable'));
 
 $sidebar->addWidget($actions);
diff --git a/app/views/admission/courseset/index.php b/app/views/admission/courseset/index.php
index f0f56b728d9d57204c5b178ff229a2d54b2b93d0..555e18f2e6222c04a65233102e3466c295c9b4cf 100644
--- a/app/views/admission/courseset/index.php
+++ b/app/views/admission/courseset/index.php
@@ -58,7 +58,7 @@ if ($coursesets) {
                     </a>
                     <? if ($courseset->isUserAllowedToEdit($GLOBALS['user']->id)) : ?>
                     <a href="<?= $controller->link_for('admission/courseset/copy/'.$courseset->getId()); ?>">
-                            <?= Icon::create('edit+add', 'clickable', ['title' => _('Anmeldeset kopieren')])->asImg(16, ["alt" => _('Anmeldeset kopieren')]); ?>
+                            <?= Icon::create('clipboard', 'clickable', ['title' => _('Anmeldeset kopieren')])->asImg(16, ["alt" => _('Anmeldeset kopieren')]); ?>
                         </a>
                     <a href="<?= $controller->link_for('admission/courseset/configure/'.$courseset->getId()); ?>">
                             <?= Icon::create('edit')->asImg(['title' => _('Anmeldeset bearbeiten')]) ?>
diff --git a/app/views/calendar/schedule/index.php b/app/views/calendar/schedule/index.php
index 60e6d69532f50cf3125aa11a2f42ede2ba2fc933..31339f5e6bb3146369fe0b96a4f82cc9c35db645 100644
--- a/app/views/calendar/schedule/index.php
+++ b/app/views/calendar/schedule/index.php
@@ -17,7 +17,7 @@ if (!$inst_mode) {
     $actions->addLink(
         _('Neuer Eintrag'),
         $controller->url_for('calendar/schedule/entry'),
-        Icon::create('date+add'),
+        Icon::create('add'),
         ['data-dialog' => 'size=auto']
     );
 }
diff --git a/app/views/calendar/single/manage_access.php b/app/views/calendar/single/manage_access.php
index b5f1634ecd236987708b8e6b0f6ac7a571c9efb5..5aa5ca6a9a5507553108003df0102b9fe094095d 100644
--- a/app/views/calendar/single/manage_access.php
+++ b/app/views/calendar/single/manage_access.php
@@ -82,7 +82,7 @@
                         </td>
                         <td class="actions">
                             <a title="<?= _('Benutzer entfernen') ?>" onClick="STUDIP.CalendarDialog.removeUser(this);" href="<?= $controller->url_for('calendar/single/remove_user/' . $calendar->getRangeId() . $filter, ['user_id' => $user->user_id]) ?>">
-                                <?= Icon::create('person+remove', 'clickable')->asImg() ?>
+                                <?= Icon::create('trash', 'clickable')->asImg() ?>
                             </a>
                         </td>
                     </tr>
@@ -96,4 +96,4 @@
         <?= Studip\LinkButton::create(_('Abbrechen'), $controller->url_for('calendar/single/' . $last_view)) ?>
         <? endif; ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/views/consultation/admin/index.php b/app/views/consultation/admin/index.php
index cf8d6c0ae11a4360806b094206afe7a8216484b9..70367ae2bdb9354f8c5c9d439b0fb47244d2000e 100644
--- a/app/views/consultation/admin/index.php
+++ b/app/views/consultation/admin/index.php
@@ -62,7 +62,7 @@
                 )->condition($block['block']->has_bookings && !$block['block']->is_expired)->addLink(
                     $controller->cancel_blockURL($block['block'], $page),
                     _('Termine absagen'),
-                    Icon::create('consultation+remove'),
+                    Icon::create('decline'),
                     ['data-dialog' => 'size=auto']
                 )->condition(!$block['block']->has_bookings || $block['block']->is_expired)->addButton(
                     'remove',
@@ -127,7 +127,7 @@
                 )->condition(!$slot->is_expired && count($slot->bookings) < $slot->block->size)->addLink(
                     $controller->bookURL($block['block'], $slot, $page),
                     _('Termin reservieren'),
-                    Icon::create('consultation+add'),
+                    Icon::create('consultation'),
                     ['data-dialog' => 'size=auto']
                 )->condition($slot->has_bookings)->addLink(
                     $controller->reasonURL($block['block'], $slot, $slot->bookings->first(), $page),
@@ -142,7 +142,7 @@
                 )->condition($slot->has_bookings && !$slot->is_expired)->addLink(
                     $controller->cancel_slotURL($block['block'], $slot, $page),
                     _('Termin absagen'),
-                    Icon::create('consultation+remove'),
+                    Icon::create('decline'),
                     ['data-dialog' => 'size=auto']
                 )->condition(!$slot->has_bookings || $slot->is_expired)->addButton(
                     'delete',
diff --git a/app/views/consultation/admin/ungrouped.php b/app/views/consultation/admin/ungrouped.php
index e64efea67f0551c2d50eb478079b7cace8a30871..0643429c20f203933d479d32897f2f616ee6e0d0 100644
--- a/app/views/consultation/admin/ungrouped.php
+++ b/app/views/consultation/admin/ungrouped.php
@@ -88,7 +88,7 @@
                 )->condition($block->has_bookings && !$block->is_expired)->addLink(
                     $controller->cancel_blockURL($block, $page),
                     _('Termine absagen'),
-                    Icon::create('consultation+remove'),
+                    Icon::create('decline'),
                     ['data-dialog' => 'size=auto']
                 )->condition(!$block->has_bookings || $block->is_expired)->addButton(
                     'remove',
@@ -214,7 +214,7 @@
                 )->condition(!$slot->is_expired && count($slot->bookings) < $slot->block->size)->addLink(
                     $controller->bookURL($slot->block, $slot, $page),
                     _('Termin reservieren'),
-                    Icon::create('consultation+add'),
+                    Icon::create('consultation'),
                     ['data-dialog' => 'size=auto']
                 )->condition($slot->has_bookings)->addLink(
                     $controller->reasonURL($slot->block, $slot, $slot->bookings->first(), $page),
@@ -229,7 +229,7 @@
                 )->condition($slot->has_bookings && !$slot->is_expired)->addLink(
                     $controller->cancel_slotURL($slot->block, $slot, $page),
                     _('Termin absagen'),
-                    Icon::create('consultation+remove'),
+                    Icon::create('decline'),
                     ['data-dialog' => 'size=auto']
                 )->condition(!$slot->has_bookings || $slot->is_expired)->addButton(
                     'delete',
diff --git a/app/views/contact/index.php b/app/views/contact/index.php
index 503c65a2463c9afb28d0d50e02d11a6b2afab61b..6ecef64ac25c891d3764c8ce04afe43a2b7c1690 100644
--- a/app/views/contact/index.php
+++ b/app/views/contact/index.php
@@ -82,7 +82,7 @@
                                     Icon::create('vcard')) ?>
                                 <?= $actionMenu->addButton('remove_person',
                                     $filter ? _('Kontakt aus Gruppe entfernen') : _('Kontakt entfernen'),
-                                    Icon::create('person+remove',
+                                    Icon::create('trash',
                                         [
                                             'data-confirm' => sprintf(
                                                 _('Wollen Sie %s wirklich von der Liste entfernen'),
diff --git a/app/views/course/dates/_date_row-exdate.php b/app/views/course/dates/_date_row-exdate.php
index c9b95f5d72558b50a0a4023139bdfd2a39447de1..0b86f6e41d9bc1a44d6d4c1b3e4ee81b1bb6a190 100644
--- a/app/views/course/dates/_date_row-exdate.php
+++ b/app/views/course/dates/_date_row-exdate.php
@@ -20,7 +20,7 @@
     <? if ($has_access && !$cancelled_dates_locked): ?>
         <form action="<?= $controller->url_for("course/timesrooms/undeleteSingle/{$date->id}/1") ?>" method="post">
             <? $actionMenu = ActionMenu::get()->setContext($date) ?>
-            <? $actionMenu->addButton('restore_date', _('Termin wiederherstellen'), Icon::create('trash+decline'),
+            <? $actionMenu->addButton('restore_date', _('Termin wiederherstellen'), Icon::create('refresh'),
                                       ['data-confirm' => _('Diesen Termin wiederherstellen?')]) ?>
             <?= $actionMenu->render() ?>
         </form>
diff --git a/app/views/course/dates/_date_row.php b/app/views/course/dates/_date_row.php
index fe045ed73ca7ef4eca4783b7e6f9810296cd9a6d..32433ae593c530ca4bea779874a2bdd074249100 100644
--- a/app/views/course/dates/_date_row.php
+++ b/app/views/course/dates/_date_row.php
@@ -1,5 +1,5 @@
 <?php
-$icon = $date->chdate > $last_visitdate ? 'date+new' : 'date';
+$icon = 'date';
 $dialog_url = $show_raumzeit
             ? $controller->url_for('course/dates/details/' . $date->id)
             : $controller->url_for('course/dates/singledate/' . $date->id);
@@ -54,7 +54,7 @@ $dialog_url = $show_raumzeit
         <? if ($has_access): ?>
             <? $actionMenu->addLink($dialog_url, _('Termin bearbeiten'), Icon::create('edit'), ['data-dialog' => '']) ?>
             <? $actionMenu->addLink($controller->url_for('course/dates/new_topic?termin_id=' . $date->id),
-                                    _('Thema hinzufügen'), Icon::create('topic+add'), ['data-dialog' => 'size=auto']) ?>
+                                    _('Thema hinzufügen'), Icon::create('add'), ['data-dialog' => 'size=auto']) ?>
         <? endif ?>
         <? if ($filecount): ?>
             <? $actionMenu->addLink($controller->url_for('course/dates/details_files/' . $date->id),
diff --git a/app/views/course/forum/area/add.php b/app/views/course/forum/area/add.php
index 9524a6596b60774ee5cd95793c636b83376afb21..a3fdf2d6c91d55ece10195c460db26577e3bb117 100644
--- a/app/views/course/forum/area/add.php
+++ b/app/views/course/forum/area/add.php
@@ -6,7 +6,7 @@
 
         <a href="<?= $controller->link_for("course/forum/index/index/{$entry['topic_id']}#{$entry['topic_id']}") ?>">
         <? if ($entry['chdate'] >= $visitdate && $entry['user_id'] !== $GLOBALS['user']->id): ?>
-            <?= Icon::create('forum+new', Icon::ROLE_ATTENTION)->asImg([
+            <?= Icon::create('forum', Icon::ROLE_ATTENTION)->asImg([
                 'title' => _('Dieser Eintrag ist neu!'),
                 'style' => 'margin-bottom: 15px',
             ]) ?>
diff --git a/app/views/course/forum/index/_post.php b/app/views/course/forum/index/_post.php
index 5052c2e8af6ffc5cf4436feebbb5bd471200952b..864c796d6a05b895b8ce815136a8af32e8276c40 100644
--- a/app/views/course/forum/index/_post.php
+++ b/app/views/course/forum/index/_post.php
@@ -257,7 +257,7 @@
 
         <? if ($is_new): ?>
         <span class="new_posting">
-            <?= Icon::create('forum+new', 'attention', ['title' => _("Dieser Beitrag ist seit Ihrem letzten Besuch hinzugekommen.")])->asImg(16) ?>
+            <?= Icon::create('forum', 'attention', ['title' => _("Dieser Beitrag ist seit Ihrem letzten Besuch hinzugekommen.")])->asImg(16) ?>
         </span>
         <? endif ?>
     </span>
diff --git a/app/views/course/forum/index/_threads.php b/app/views/course/forum/index/_threads.php
index 97f0c4c1dd6d12f43819d4d9badf0b9194db7892..1445d876cbeb7878ea6d9fbfb194ce2675ce5cb5 100644
--- a/app/views/course/forum/index/_threads.php
+++ b/app/views/course/forum/index/_threads.php
@@ -40,7 +40,7 @@
                     <td class="icon">
                         <a href="<?= $controller->link_for("course/forum/index/index/{$jump_to_topic_id}#{$jump_to_topic_id}") ?>">
                             <? if ($entry['chdate'] >= $visitdate && $entry['user_id'] != $GLOBALS['user']->id): ?>
-                                <?= Icon::create('forum+new', Icon::ROLE_ATTENTION)->asImg([
+                                <?= Icon::create('forum', Icon::ROLE_ATTENTION)->asImg([
                                     'title' => _('Dieser Eintrag ist neu!'),
                                 ]) ?>
                             <? else : ?>
@@ -126,7 +126,7 @@
                             ->addLink(
                                 "javascript:STUDIP.Forum.moveThreadDialog('{$entry['topic_id']}');",
                                 _('Dieses Thema verschieben'),
-                                Icon::create('folder-full+move_right'),
+                                Icon::create('folder-full'),
                                 ['class' => 'js']
                             )
                             // Open/close thread
diff --git a/app/views/course/ilias_interface/index.php b/app/views/course/ilias_interface/index.php
index c45d058b7e02fbdfe8d61b99fc5dcd1059218db8..8f841b34ce78e36dd62cc6277e82e74f89ffc2b8 100644
--- a/app/views/course/ilias_interface/index.php
+++ b/app/views/course/ilias_interface/index.php
@@ -58,7 +58,7 @@
                     <? if ($module->isAllowed('edit')) $actionMenu->addButton(
                             'edit',
                             _('In ILIAS bearbeiten'),
-                            Icon::create('learnmodule+edit', Icon::ROLE_CLICKABLE, [
+                            Icon::create('edit', Icon::ROLE_CLICKABLE, [
                                 'title'        => _('In ILIAS bearbeiten'),
                                 'formaction'   => $controller->url_for($module->getRoute('edit')),
                                 'target'       => '_blank',
@@ -68,7 +68,7 @@
                     <? if ($edit_permission && $module->isAllowed('delete')) $actionMenu->addButton(
                             'remove',
                             _('Entfernen'),
-                            Icon::create('learnmodule+decline', Icon::ROLE_CLICKABLE, [
+                            Icon::create('trash', Icon::ROLE_CLICKABLE, [
                                 'title'        => _('Entfernen'),
                                 'formaction'   => $controller->url_for($module->getRoute('remove')),
                                 'data-confirm' => $module->siblings_count < 2 ? sprintf(_('Dies ist die einzige Instanz des Objekts "%s". Durch das Entfernen aus dem Kurs wird das Objekt unwiderruflich gelöscht! Wollen Sie das Objekt wirklich löschen?'), htmlReady($module->getTitle())) : sprintf(_('Wollen Sie das Objekt "%s" jetzt entfernen?'), htmlReady($module->getTitle())),
@@ -111,7 +111,7 @@
                     <? if ($edit_permission) $actionMenu->addButton(
                             'remove',
                             _('Entfernen'),
-                            Icon::create('learnmodule+decline', Icon::ROLE_CLICKABLE, [
+                            Icon::create('trash', Icon::ROLE_CLICKABLE, [
                                 'title'        => _('Entfernen'),
                                 'formaction'   => $controller->url_for('course/ilias_interface/remove_course/'.$ilias_index.'/'.$courses[$ilias_index]),
                                 'data-confirm' => sprintf(_('Verknüpfung zum Kurs in %s entfernen? Hierdurch werden auch die Verknüpfungen zu allen Objekten innerhalb des Kurses entfernt.'), $ilias->getName()),
diff --git a/app/views/course/statusgroups/_member.php b/app/views/course/statusgroups/_member.php
index ce3507b312e16c7b987a76797d6017c15141c0ee..d436178ce0f768bd65dde0a8a0834fe5e266ef1b 100644
--- a/app/views/course/statusgroups/_member.php
+++ b/app/views/course/statusgroups/_member.php
@@ -52,7 +52,7 @@
                 $actions->addLink(
             $controller->url_for('course/statusgroups/move_member', $m->user_id, $group->id),
             _('In eine andere Gruppe verschieben'),
-            Icon::create('person+move_right', 'clickable', [
+            Icon::create('arr_1right', 'clickable', [
                 'title' => sprintf(
                     _('%s in eine andere Gruppe verschieben'),
                             $user_fullname
diff --git a/app/views/course/timesrooms/_cycleRow.php b/app/views/course/timesrooms/_cycleRow.php
index d1adcdd6c8b230481c0e63b53b73611492115364..8f05d78d719dd60264b4a78a20c9fac33c58c725 100644
--- a/app/views/course/timesrooms/_cycleRow.php
+++ b/app/views/course/timesrooms/_cycleRow.php
@@ -116,7 +116,7 @@ $is_exTermin = $termin instanceof CourseExDate;
         <? $actionMenu->addButton(
             'delete_part',
             _('Termin wiederherstellen'),
-            Icon::create('trash+decline', Icon::ROLE_CLICKABLE, $params)
+            Icon::create('refresh', Icon::ROLE_CLICKABLE, $params)
         ) ?>
 
     <? elseif (!$locked) : ?>
diff --git a/app/views/course/timesrooms/_irregularEvents.php b/app/views/course/timesrooms/_irregularEvents.php
index 2bd4c2d50e74954f985c052d7c00133db78dc128..b2520370a19bd6981e9816516ab24dbcf76b2968 100644
--- a/app/views/course/timesrooms/_irregularEvents.php
+++ b/app/views/course/timesrooms/_irregularEvents.php
@@ -18,14 +18,14 @@ $room_request_filter = function ($date) {
             <? $actionMenu->addLink(
                 $controller->url_for('course/timesrooms/createSingleDate/' . $course->id, $linkAttributes),
                 _('Einzeltermin hinzufügen'),
-                Icon::create('date+add', Icon::ROLE_CLICKABLE, ['title' => _('Einzeltermin hinzufügen')]),
+                Icon::create('date', Icon::ROLE_CLICKABLE, ['title' => _('Einzeltermin hinzufügen')]),
                 ['data-dialog' => 'size=600']
             ) ?>
 
             <? $actionMenu->addLink(
                 $controller->url_for('course/block_appointments/index/' . $course->id, $linkAttributes),
                 _('Blocktermin hinzufügen'),
-                Icon::create('timetable+add', Icon::ROLE_CLICKABLE, ['title' => _('Blocktermin hinzufügen')]),
+                Icon::create('date-block', Icon::ROLE_CLICKABLE, ['title' => _('Blocktermin hinzufügen')]),
                 ['data-dialog' => 'size=600']
             ) ?>
             <?= $actionMenu->render() ?>
diff --git a/app/views/evaluation/_actions.php b/app/views/evaluation/_actions.php
index 45bf032693cf6f3c4c4a30bf66873a5c24ef562c..e702ff2a66fe3a142e0d069c2fdeb6c1918cd0df 100644
--- a/app/views/evaluation/_actions.php
+++ b/app/views/evaluation/_actions.php
@@ -1,4 +1,4 @@
 <?= Icon::create('pause', 'clickable')->asImg() ?>
-<?= Icon::create('community+remove', 'clickable')->asImg() ?>
+<?= Icon::create('decline', 'clickable')->asImg() ?>
 <?= Icon::create('admin', 'clickable')->asImg() ?>
-<?= Icon::create('trash', 'clickable')->asImg() ?>
\ No newline at end of file
+<?= Icon::create('trash', 'clickable')->asImg() ?>
diff --git a/app/views/file/choose_folder.php b/app/views/file/choose_folder.php
index f76f27ebc50f4527a1a97196058138d0f641e4fe..498ad0e3150a3e21d1869dbc1928f918b13e49fe 100644
--- a/app/views/file/choose_folder.php
+++ b/app/views/file/choose_folder.php
@@ -123,9 +123,9 @@ $buttonLabels = [
             <tr>
                 <td class="document-icon" data-sort-value="0">
                 <? if ($subfolder->is_empty): ?>
-                    <?= Icon::create('folder-empty+decline', Icon::ROLE_INFO)->asImg(24) ?>
+                    <?= Icon::create('folder-empty', Icon::ROLE_INACTIVE)->asImg(24) ?>
                 <? else: ?>
-                    <?= Icon::create('folder-full+decline', Icon::ROLE_INFO)->asImg(24) ?>
+                    <?= Icon::create('folder-full', Icon::ROLE_INACTIVE)->asImg(24) ?>
                 <? endif ?>
                 </td>
                 <td>
diff --git a/app/views/files/_folder_tr.php b/app/views/files/_folder_tr.php
index ca89fc9bbda598c49e229cc063bafa83ea4cc7a6..09cd2959a9087bc1eeebad31e8acd7ce88e4a75b 100644
--- a/app/views/files/_folder_tr.php
+++ b/app/views/files/_folder_tr.php
@@ -93,20 +93,20 @@ if ($folder->isReadable($GLOBALS['user']->id)) {
            $actionMenu->addLink(
                $controller->url_for('file/choose_destination/move/' . $folder->getId(), ['isfolder' => 1]),
                 _('Ordner verschieben'),
-                Icon::create('folder-empty+move_right', 'clickable', ['size' => 20]),
+                Icon::create('arr_1right', 'clickable', ['size' => 20]),
                 ['data-dialog' => 'size=auto']
             );
             $actionMenu->addLink(
                 $controller->url_for('file/choose_destination/copy/' . $folder->getId(), ['isfolder' => 1]),
                 _('Ordner kopieren'),
-                Icon::create('folder-empty+add', 'clickable', ['size' => 20]),
+                Icon::create('clipboard', 'clickable', ['size' => 20]),
                 ['data-dialog' => 'size=auto']
             );
             if (Feedback::isActivated() && Feedback::hasCreatePerm($course->id)) {
                 $actionMenu->addLink(
                     $controller->url_for('course/feedback/create_form/' . $folder->getId() . '/Folder'),
                     _('Neues Feedback-Element'),
-                    Icon::create('star+add', Icon::ROLE_CLICKABLE, ['size' => 20]),
+                    Icon::create('star', Icon::ROLE_CLICKABLE, ['size' => 20]),
                     ['data-dialog' => '1']
                 );
             }
diff --git a/app/views/materialien/files/add_dokument.php b/app/views/materialien/files/add_dokument.php
index 2b7c5ac4242446557b2cdbaab0ffe8c67d83ee6f..6a531c5f8efba597b37e8650d4b5ade9971f31ad 100644
--- a/app/views/materialien/files/add_dokument.php
+++ b/app/views/materialien/files/add_dokument.php
@@ -37,7 +37,7 @@
             <td>
                 <div class="attachments" style="<?= (!$documents || !key_exists($key, $documents))  ? '' : 'display: none;'?>">
                     <span style="cursor:pointer;" onClick="$('#fileselector_<?= $key; ?>').toggle();$(this).toggle();">
-                        <?= Icon::create('file+add', Icon::ROLE_CLICKABLE, ['title' => _("Datei hinzufügen"), 'class' => 'text-bottom']); ?>
+                        <?= Icon::create('add', Icon::ROLE_CLICKABLE, ['title' => _("Datei hinzufügen"), 'class' => 'text-bottom']); ?>
                         <?= _("Datei hinzufügen") ?>
                     </span>
                     <div id="fileselector_<?= $key; ?>" style="display:none;">
diff --git a/app/views/materialien/files/index.php b/app/views/materialien/files/index.php
index 5e0117d86b2f393721227bf2becc319264005f3c..c1976782b64b42e1b20fda4a322a87923722d14b 100644
--- a/app/views/materialien/files/index.php
+++ b/app/views/materialien/files/index.php
@@ -67,7 +67,7 @@
                 $actions->addLink(
                     $controller->url_for('materialien/files/add_ranges_to_file',$mvv_file->mvvfile_id),
                     _('Dokument zuordnen'),
-                    Icon::create('file+add'),
+                    Icon::create('add'),
                     ['data-dialog' => 'size=auto']
                 );
                 foreach ($mvv_file->file_refs as $fileref) {
diff --git a/app/views/materialien/files/range.php b/app/views/materialien/files/range.php
index 86c36f4200a6b61db9902013ac1624ef0e07ff0f..8044b7acfba9b683bd7ebd3db1db39a489fc3aa4 100644
--- a/app/views/materialien/files/range.php
+++ b/app/views/materialien/files/range.php
@@ -1,113 +1,113 @@
-<div id="messagebox-container">
-<? if (Request::isXhr()) : ?>
-    <? foreach (PageLayout::getMessages() as $messagebox) : ?>
-        <?= $messagebox ?>
-    <? endforeach ?>
-<? endif; ?>
-</div>
-<table id="mvv_files" class="default sortable-table" data-sortlist="[[0, 0]]">
-    <caption>
-        <span class="actions">
-            <a href="<?= $controller->url_for('materialien/files/add_dokument', 'range', $range_type, $range_id);?>" data-dialog="">
-                <?= Icon::create('upload+add', Icon::ROLE_CLICKABLE, ['title' => _('neues Dokument hinzufügen')]); ?>
-            </a>
-            <a href="<?= $controller->url_for('materialien/files/add_files_to_range',$range_type, $range_id);?>" data-dialog="">
-                <?= Icon::create('file+add', Icon::ROLE_CLICKABLE, ['title' => _('vorhandenes Dokument hinzufügen')]); ?>
-            </a>
-            <a href="<?= $controller->url_for('materialien/files/sort', $range_type, $range_id);?>" data-dialog="size=auto">
-                <?= Icon::create('arr_2up', Icon::ROLE_CLICKABLE, ['title' => _('Reihenfolge der Dokumente ändern')]); ?>
-            </a>
-        </span>
-    </caption>
-    <thead>
-        <tr class="sortable">
-            <th data-sorter="digit"><?= _('Pos.') ?></th>
-            <th data-sorter="text"><?= _('Name') ?></th>
-            <th data-sorter="text"><?= _('Dateiname') ?></th>
-            <th data-sorter="digit"><?= _('Sichtbarkeit') ?></th>
-            <th><?= _('Sprache') ?></th>
-            <th data-sorter="text"><?= _('Art der Datei') ?></th>
-            <th data-sorter="digit"><?= _('Datum') ?></th>
-            <th data-sorter="text"><?= _('Dateityp') ?></th>
-            <th data-sorter="text"><?= _('Kategorie') ?></th>
-            <th data-sorter="digit"><?= _('Zuordnungen') ?></th>
-            <th data-sorter="false" style="text-align: right;"><?= _('Aktionen') ?></th>
-        </tr>
-    </thead>
-<? if($dokumente): ?>
-    <tbody>
-    <? foreach($dokumente as $mvv_file): ?>
-        <tr>
-            <td><?= htmlReady($mvv_file->getPositionInRange($range_id)); ?></td>
-            <td><?= htmlReady($mvv_file->getDisplayName()) ?></td>
-            <td data-sort-value="<?= htmlReady($mvv_file->getFilenames()[0]); ?>">
-                <? if($mvv_file->getFiletypes()[0] == 'Link'): ?>
-                    <a href="<?= htmlReady($mvv_file->getFilenames()[0]); ?>" target="_blank">
-                        <?= Icon::create('link-extern', Icon::ROLE_CLICKABLE, ['class' => 'text-bottom']); ?>
-                        <?= htmlReady($mvv_file->getFilenames()[0]); ?>
-                    </a>
-                <? else: ?>
-                    <?= htmlReady($mvv_file->getFilenames()[0]); ?>
-                <? endif; ?>
-            </td>
-            <td style="text-align: center;" data-sort-value="<?= $mvv_file->extern_visible?'1':'0' ?>">
-                <?= Icon::create(
-                        $mvv_file->extern_visible?'visibility-visible':'visibility-invisible',
-                        Icon::ROLE_INFO,
-                        [
-                            'class' => 'text-bottom',
-                            'title' => $mvv_file->extern_visible?_('sichtbar'):_('unsichtbar')
-                        ]
-                    );
-                ?>
-            </td>
-            <td>
-                <? foreach ($mvv_file->file_refs as $fileref) : ?>
-                    <?= Assets::img('languages/lang_' . mb_strtolower($fileref->file_language) . '.gif') ?>
-                <? endforeach; ?>
-            </td>
-            <td><?= htmlReady($GLOBALS['MVV_DOCUMENTS']['TYPE']['values'][$mvv_file->type]['name']); ?></td>
-            <td data-sort-value="<?= htmlReady($mvv_file->mkdate); ?>"><?= htmlReady(date('d.m.Y', $mvv_file->mkdate)); ?></td>
-            <td style="text-align: center;"><?= htmlReady($mvv_file->getFiletypes()[0]); ?></td>
-            <td><?= htmlReady($GLOBALS['MVV_DOCUMENTS']['CATEGORY']['values'][$mvv_file->category]['name']); ?></td>
-            <td style="text-align: center;"><?= htmlReady($mvv_file->count_relations); ?></td>
-            <td class="actions">
-            <?
-                $actions = ActionMenu::get()->setContext($mvv_file->getDisplayName());
-                $actions->addLink(
-                    $controller->url_for('materialien/files/details',$mvv_file->mvvfile_id),
-                    _('Details'),
-                    Icon::create('info-circle'),
-                    ['data-dialog' => 'size=auto']
-                );
-                $actions->addLink(
-                    $controller->url_for('materialien/files/add_dokument','range', $range_type, $range_id, $mvv_file->mvvfile_id),
-                    _('Dokument bearbeiten'),
-                    Icon::create('edit'),
-                    ['data-dialog' => '']
-                );
-                foreach ($mvv_file->file_refs as $fileref) {
-                    $actions->addLink(
-                        $fileref->file_ref->getDownloadURL('force_download'),
-                        _('Datei herunterladen') . ' (' . $fileref->file_language . ')',
-                        Icon::create('download', 'clickable', ['size' => 20]),
-                        ['target' => '_blank']
-                    );
-                }
-                $actions->addLink(
-                    $controller->url_for('materialien/files/delete_range', $mvv_file->mvvfile_id, $range_id),
-                    _('Dokument-Zuordnung löschen'),
-                    Icon::create('trash'),
-                    [
-                        'data-confirm' => _('Wollen Sie die Zuordnung des Dokuments wirklich entfernen?'),
-                        'data-dialog' => 'size=auto'
-                    ]
-                );
-                echo $actions;
-            ?>
-            </td>
-        </tr>
-    <? endforeach; ?>
-    </tbody>
-<? endif; ?>
-</table>
+<div id="messagebox-container">
+<? if (Request::isXhr()) : ?>
+    <? foreach (PageLayout::getMessages() as $messagebox) : ?>
+        <?= $messagebox ?>
+    <? endforeach ?>
+<? endif; ?>
+</div>
+<table id="mvv_files" class="default sortable-table" data-sortlist="[[0, 0]]">
+    <caption>
+        <span class="actions">
+            <a href="<?= $controller->url_for('materialien/files/add_dokument', 'range', $range_type, $range_id);?>" data-dialog="">
+                <?= Icon::create('upload', Icon::ROLE_CLICKABLE, ['title' => _('neues Dokument hinzufügen')]); ?>
+            </a>
+            <a href="<?= $controller->url_for('materialien/files/add_files_to_range',$range_type, $range_id);?>" data-dialog="">
+                <?= Icon::create('add', Icon::ROLE_CLICKABLE, ['title' => _('vorhandenes Dokument hinzufügen')]); ?>
+            </a>
+            <a href="<?= $controller->url_for('materialien/files/sort', $range_type, $range_id);?>" data-dialog="size=auto">
+                <?= Icon::create('arr_2up', Icon::ROLE_CLICKABLE, ['title' => _('Reihenfolge der Dokumente ändern')]); ?>
+            </a>
+        </span>
+    </caption>
+    <thead>
+        <tr class="sortable">
+            <th data-sorter="digit"><?= _('Pos.') ?></th>
+            <th data-sorter="text"><?= _('Name') ?></th>
+            <th data-sorter="text"><?= _('Dateiname') ?></th>
+            <th data-sorter="digit"><?= _('Sichtbarkeit') ?></th>
+            <th><?= _('Sprache') ?></th>
+            <th data-sorter="text"><?= _('Art der Datei') ?></th>
+            <th data-sorter="digit"><?= _('Datum') ?></th>
+            <th data-sorter="text"><?= _('Dateityp') ?></th>
+            <th data-sorter="text"><?= _('Kategorie') ?></th>
+            <th data-sorter="digit"><?= _('Zuordnungen') ?></th>
+            <th data-sorter="false" style="text-align: right;"><?= _('Aktionen') ?></th>
+        </tr>
+    </thead>
+<? if($dokumente): ?>
+    <tbody>
+    <? foreach($dokumente as $mvv_file): ?>
+        <tr>
+            <td><?= htmlReady($mvv_file->getPositionInRange($range_id)); ?></td>
+            <td><?= htmlReady($mvv_file->getDisplayName()) ?></td>
+            <td data-sort-value="<?= htmlReady($mvv_file->getFilenames()[0]); ?>">
+                <? if($mvv_file->getFiletypes()[0] == 'Link'): ?>
+                    <a href="<?= htmlReady($mvv_file->getFilenames()[0]); ?>" target="_blank">
+                        <?= Icon::create('link-extern', Icon::ROLE_CLICKABLE, ['class' => 'text-bottom']); ?>
+                        <?= htmlReady($mvv_file->getFilenames()[0]); ?>
+                    </a>
+                <? else: ?>
+                    <?= htmlReady($mvv_file->getFilenames()[0]); ?>
+                <? endif; ?>
+            </td>
+            <td style="text-align: center;" data-sort-value="<?= $mvv_file->extern_visible?'1':'0' ?>">
+                <?= Icon::create(
+                        $mvv_file->extern_visible?'visibility-visible':'visibility-invisible',
+                        Icon::ROLE_INFO,
+                        [
+                            'class' => 'text-bottom',
+                            'title' => $mvv_file->extern_visible?_('sichtbar'):_('unsichtbar')
+                        ]
+                    );
+                ?>
+            </td>
+            <td>
+                <? foreach ($mvv_file->file_refs as $fileref) : ?>
+                    <?= Assets::img('languages/lang_' . mb_strtolower($fileref->file_language) . '.gif') ?>
+                <? endforeach; ?>
+            </td>
+            <td><?= htmlReady($GLOBALS['MVV_DOCUMENTS']['TYPE']['values'][$mvv_file->type]['name']); ?></td>
+            <td data-sort-value="<?= htmlReady($mvv_file->mkdate); ?>"><?= htmlReady(date('d.m.Y', $mvv_file->mkdate)); ?></td>
+            <td style="text-align: center;"><?= htmlReady($mvv_file->getFiletypes()[0]); ?></td>
+            <td><?= htmlReady($GLOBALS['MVV_DOCUMENTS']['CATEGORY']['values'][$mvv_file->category]['name']); ?></td>
+            <td style="text-align: center;"><?= htmlReady($mvv_file->count_relations); ?></td>
+            <td class="actions">
+            <?
+                $actions = ActionMenu::get()->setContext($mvv_file->getDisplayName());
+                $actions->addLink(
+                    $controller->url_for('materialien/files/details',$mvv_file->mvvfile_id),
+                    _('Details'),
+                    Icon::create('info-circle'),
+                    ['data-dialog' => 'size=auto']
+                );
+                $actions->addLink(
+                    $controller->url_for('materialien/files/add_dokument','range', $range_type, $range_id, $mvv_file->mvvfile_id),
+                    _('Dokument bearbeiten'),
+                    Icon::create('edit'),
+                    ['data-dialog' => '']
+                );
+                foreach ($mvv_file->file_refs as $fileref) {
+                    $actions->addLink(
+                        $fileref->file_ref->getDownloadURL('force_download'),
+                        _('Datei herunterladen') . ' (' . $fileref->file_language . ')',
+                        Icon::create('download', 'clickable', ['size' => 20]),
+                        ['target' => '_blank']
+                    );
+                }
+                $actions->addLink(
+                    $controller->url_for('materialien/files/delete_range', $mvv_file->mvvfile_id, $range_id),
+                    _('Dokument-Zuordnung löschen'),
+                    Icon::create('trash'),
+                    [
+                        'data-confirm' => _('Wollen Sie die Zuordnung des Dokuments wirklich entfernen?'),
+                        'data-dialog' => 'size=auto'
+                    ]
+                );
+                echo $actions;
+            ?>
+            </td>
+        </tr>
+    <? endforeach; ?>
+    </tbody>
+<? endif; ?>
+</table>
diff --git a/app/views/module/module/details.php b/app/views/module/module/details.php
index 5ae025a034c34498ae69922a9485ee76d7351fd6..dd5bf8d88a29e25920c1289367ae79df60e1eaf7 100644
--- a/app/views/module/module/details.php
+++ b/app/views/module/module/details.php
@@ -37,7 +37,7 @@
                                 <? $actionMenu->addLink(
                                     $controller->url_for('/lvgruppe/' . $modulteil->id),
                                     _('Neue LV-Gruppe anlegen'),
-                                    Icon::create('file+add', Icon::ROLE_CLICKABLE, ['title' => _('Neue LV-Gruppe anlegen')]),
+                                    Icon::create('file', Icon::ROLE_CLICKABLE, ['title' => _('Neue LV-Gruppe anlegen')]),
                                     [
                                         'data-dialog' => 'size=normal',
                                         'title'       => _('Neue LV-Gruppe anlegen')
diff --git a/app/views/module/module/module.php b/app/views/module/module/module.php
index a89fbd50d92269177bbc33e03bdc35954ccbb3ef..9e6d6ca6789803f765dad8fa4327cdf54e33083a 100644
--- a/app/views/module/module/module.php
+++ b/app/views/module/module/module.php
@@ -80,7 +80,7 @@
                         <? $actionMenu->addLink(
                             $controller->url_for('/modulteil', ['modul_id' => $modul->id]),
                             _('Modulteil anlegen'),
-                            Icon::create('file+add', Icon::ROLE_CLICKABLE,['title' => _('Modulteil anlegen')])
+                            Icon::create('add', Icon::ROLE_CLICKABLE,['title' => _('Modulteil anlegen')])
                         ) ?>
                     <? endif; ?>
                     <? if ($perm->havePermWrite()) : ?>
diff --git a/app/views/my_courses/waiting_list.php b/app/views/my_courses/waiting_list.php
index ae93da9ea27c1ab9a9ee6932706d3d609abbd18f..b1f75270a5a478d4eea4a1e5b1fb4d88be8fd4fc 100644
--- a/app/views/my_courses/waiting_list.php
+++ b/app/views/my_courses/waiting_list.php
@@ -85,7 +85,7 @@
             <td style="text-align: right">
                 <? if ($wait["status"] == "accepted" && $wait['admission_binding']) : ?>
                     <a href="<?= $controller->url_for('my_courses/decline_binding') ?>">
-                        <?= Icon::create('door-leave+decline', 'inactive', ['title' => _("Die Teilnahme ist bindend. Bitte wenden Sie sich an die Lehrenden.")])->asImg(20) ?>
+                        <?= Icon::create('door-leave', 'inactive', ['title' => _("Die Teilnahme ist bindend. Bitte wenden Sie sich an die Lehrenden.")])->asImg(20) ?>
                     </a>
                 <?  else : ?>
                     <a href="<?= $controller->link_for('my_courses/decline', $wait['seminar_id'], ['cmd' => 'suppose_to_kill_admission']) ?>">
diff --git a/app/views/my_ilias_accounts/index.php b/app/views/my_ilias_accounts/index.php
index 6b29d5d408fc82027d3facfb9b4f4324d5e3586d..f263baac5b8fae0799642693c384fb5297381faf 100644
--- a/app/views/my_ilias_accounts/index.php
+++ b/app/views/my_ilias_accounts/index.php
@@ -55,7 +55,7 @@
                     <? if ($module->isAllowed('edit')) $actionMenu->addButton(
                             'edit',
                             _('In ILIAS bearbeiten'),
-                            Icon::create('learnmodule+edit', Icon::ROLE_CLICKABLE, [
+                            Icon::create('edit', Icon::ROLE_CLICKABLE, [
                                 'title'        => _('In ILIAS bearbeiten'),
                                 'formaction'   => $controller->url_for($module->getRoute('edit')),
                                 'formtarget'       => '_blank',
@@ -111,7 +111,7 @@
                     <? if ($ilias->ilias_config['allow_change_account'] && ($ilias->user->getUserType() === IliasUser::USER_TYPE_CREATED)) $actionMenu->addButton(
                             'new_account',
                             _('Account neu zuordnen'),
-                            Icon::create('person+new', Icon::ROLE_CLICKABLE, [
+                            Icon::create('person', Icon::ROLE_CLICKABLE, [
                                 'title'        => _('Account neu zuordnen'),
                                 'formaction'   => $controller->url_for('my_ilias_accounts/new_account/'.$ilias_index),
                                 'data-confirm' =>
@@ -124,7 +124,7 @@
                     <? if ($ilias->ilias_config['allow_change_account'] && ($ilias->user->getUserType() === IliasUser::USER_TYPE_ORIGINAL)) $actionMenu->addButton(
                             'change_account',
                             _('Account-Zuordnung aufheben'),
-                            Icon::create('person+remove', Icon::ROLE_CLICKABLE, [
+                            Icon::create('trash', Icon::ROLE_CLICKABLE, [
                                 'title'        => _('Account-Zuordnung aufheben'),
                                 'formaction'   => $controller->url_for('my_ilias_accounts/change_account/'.$ilias_index.'/remove'),
                                 'data-confirm' =>
@@ -136,7 +136,7 @@
                     <? if ($ilias->user->getUserType() === IliasUser::USER_TYPE_CREATED) $actionMenu->addButton(
                             'update_account',
                             _('Account aktualisieren'),
-                            Icon::create('person+refresh', Icon::ROLE_CLICKABLE, [
+                            Icon::create('refresh', Icon::ROLE_CLICKABLE, [
                                 'title'        => _('Account aktualisieren'),
                                 'formaction'   => $controller->url_for('my_ilias_accounts/change_account/'.$ilias_index.'/update')
                             ])
diff --git a/app/views/my_studygroups/_course.php b/app/views/my_studygroups/_course.php
index fc3ca414134f7c8d8721deacc347a45658058502..fcdae826e3cdd345c63d05164711ae1aa992b6ed 100644
--- a/app/views/my_studygroups/_course.php
+++ b/app/views/my_studygroups/_course.php
@@ -53,7 +53,7 @@
 
             <? elseif ($group["binding"]) : ?>
                 <a href="<?= URLHelper::getLink('', ['auswahl' => $group['seminar_id'], 'cmd' => 'no_kill']) ?>">
-                    <?= Icon::create('door-leave+decline', 'inactive', ['title' => _("Die Teilnahme ist bindend. Bitte wenden Sie sich an die Lehrenden.")])->asImg(20) ?>
+                    <?= Icon::create('door-leave', 'inactive', ['title' => _("Die Teilnahme ist bindend. Bitte wenden Sie sich an die Lehrenden.")])->asImg(20) ?>
                 </a>
             <?
             else : ?>
diff --git a/app/views/news/admin_news.php b/app/views/news/admin_news.php
index 95c819f124c68911ed53d5538e58b283f8744d59..590becae3a0b2a0240dd7e525f03f59cdb6b1771 100644
--- a/app/views/news/admin_news.php
+++ b/app/views/news/admin_news.php
@@ -130,7 +130,7 @@
                             $menu->addLink(
                                 $controller->url_for('news/edit_news/new/template/' . $news['object']->news_id),
                                 _('Kopieren, um neue Ankündigung zu erstellen'),
-                                Icon::create('news+export'),
+                                Icon::create('clipboard'),
                                 ['data-dialog' => '1', 'target' => '_blank']
                             );
                             if ($news['object']->havePermission('unassign', $news['range_id'])) {
diff --git a/app/views/news/display.php b/app/views/news/display.php
index 22434f9b50093f07ef3f103e481e582a2a8e2d28..356ec1f12494c860ccb5318b95d40b0a8a39d666 100644
--- a/app/views/news/display.php
+++ b/app/views/news/display.php
@@ -14,7 +14,7 @@
         <? endif; ?>
         <? if ($perm && Config::get()->NEWS_RSS_EXPORT_ENABLE): ?>
             <a data-dialog="size=auto;reload-on-close" title="<?=_('RSS-Feed konfigurieren') ?>" href="<?= $controller->link_for('news/rss_config/' . $range); ?>">
-                <?= Icon::create('rss+add') ?>
+                <?= Icon::create('admin') ?>
             </a>
         <? endif; ?>
         <? if ($rss_id): ?>
diff --git a/app/views/oer/market/details.php b/app/views/oer/market/details.php
index 7d54dc6cc9bcd1e9f86dfe6b2a3c07caaa0898c5..5a3763755c1c23ca15b1d068c6b217d9343c9d53 100644
--- a/app/views/oer/market/details.php
+++ b/app/views/oer/market/details.php
@@ -325,7 +325,7 @@ if ($GLOBALS['perm']->have_perm("autor")) {
     $actions->addLink(
         _('Zu Veranstaltung hinzufügen'),
         $controller->url_for( "oer/market/add_to_course/" . $material->getId()),
-        Icon::create("seminar+move_right", Icon::ROLE_CLICKABLE),
+        Icon::create("seminar", Icon::ROLE_CLICKABLE),
         ['data-dialog' => "1"]
     );
 }
diff --git a/app/views/oer/market/index.php b/app/views/oer/market/index.php
index 0b33a712cd8843d9210de9cb17071bee1ca55775..eccab17b8faf5d35911ab00943a943e427658f87 100644
--- a/app/views/oer/market/index.php
+++ b/app/views/oer/market/index.php
@@ -61,7 +61,7 @@ if ($GLOBALS['perm']->have_perm("autor")) {
     $actions->addLink(
         $abo ? _('Neuigkeiten abbestellen') : _('Neuigkeiten abonnieren'),
         $controller->url_for("oer/market/abo"),
-        $abo ? Icon::create("rss+decline", Icon::ROLE_CLICKABLE) : Icon::create("rss", Icon::ROLE_CLICKABLE),
+        $abo ? Icon::create("decline", Icon::ROLE_CLICKABLE) : Icon::create("rss", Icon::ROLE_CLICKABLE),
         ['data-dialog' => "size=small"]
     );
     Sidebar::Get()->addWidget($actions);
diff --git a/app/views/online/user-row.php b/app/views/online/user-row.php
index cc4b12f2083c486533337eb0d4bd1d3e409df509..f63d5a02fbbd8369a02460aba3b0b49877ecaa8a 100644
--- a/app/views/online/user-row.php
+++ b/app/views/online/user-row.php
@@ -38,13 +38,13 @@
             <? $actionMenu->addLink(
                 $controller->url_for('online/buddy/remove?username=' . $user['username']),
                 _('Aus den Kontakten entfernen'),
-                Icon::create('person+remove', 'clickable')
+                Icon::create('trash', 'clickable')
             ) ?>
         <? else: ?>
             <? $actionMenu->addLink(
                 $controller->url_for('online/buddy/add?username=' . $user['username']),
                 _('Zu den Kontakten hinzufügen'),
-                Icon::create('person+add', 'clickable')
+                Icon::create('add', 'clickable')
             ) ?>
         <? endif; ?>
         <?= $actionMenu->render() ?>
diff --git a/app/views/questionnaire/widget.php b/app/views/questionnaire/widget.php
index 24aa9e40c6532ed93832ed2e60371f4de5cf3dde..044f246aa2a85c5001a67a0980fa2ed09d859591 100644
--- a/app/views/questionnaire/widget.php
+++ b/app/views/questionnaire/widget.php
@@ -17,7 +17,7 @@
                     </a>
                 <? endif ?>
                 <a href="<?= URLHelper::getLink("dispatch.php/questionnaire/" . ($range_type == 'course' || $range_type == 'institute' ? 'course' : ''). "overview") ?>" title="<?= _('Fragebögen verwalten') ?>">
-                    <?= Icon::create("edit", "clickable")->asimg("16px", ['class' => "text-bottom"]) ?>
+                    <?= Icon::create("admin", "clickable")->asimg("16px", ['class' => "text-bottom"]) ?>
                 </a>
             <? endif ?>
         </nav>
diff --git a/app/views/resources/booking/_add_edit_form.php b/app/views/resources/booking/_add_edit_form.php
index bd02f0a60635df6b6c96037593e730c9c02336fd..16f7cd6fb0d5d55cc4a6d8db0fa164a98a801cfa 100644
--- a/app/views/resources/booking/_add_edit_form.php
+++ b/app/views/resources/booking/_add_edit_form.php
@@ -577,7 +577,7 @@
                                 <?= $interval->takes_place ? ' invisible' : ''; ?>
                                 "
                                            data-interval_id="<?= htmlReady($interval->id) ?>">
-                                            <?= Icon::create('trash+decline')->asImg(
+                                            <?= Icon::create('refresh')->asImg(
                                                 [
                                                     'class' => 'text-bottom',
                                                     'title' => _('wiederherstellen')
diff --git a/app/views/shared/contacts/index.php b/app/views/shared/contacts/index.php
index f52a315c63fb00dcee020f610e54c07fac444b06..ab7698341abc2dccec685cd47aeb28fd2a73f3c1 100644
--- a/app/views/shared/contacts/index.php
+++ b/app/views/shared/contacts/index.php
@@ -37,7 +37,7 @@
                     $actions->addLink(
                         $controller->url_for('shared/contacts/add_ranges_to_contact', $mvv_contact->contact_id),
                         _('Ansprechpartner zuordnen'),
-                        Icon::create('person+add'),
+                        Icon::create('person'),
                         ['data-dialog' => 'size=auto']
                     );
                     $actions->addLink(
diff --git a/app/views/shared/contacts/range.php b/app/views/shared/contacts/range.php
index 78d9a14f1c99394277fca2f79363ef7de4dc6432..c61e43ef994699926fbaf4a8c35c5ac9d181d1fc 100644
--- a/app/views/shared/contacts/range.php
+++ b/app/views/shared/contacts/range.php
@@ -10,7 +10,7 @@
         <span class="actions">
             <? if ($perm_contacts >= MvvPerm::PERM_CREATE) : ?>
                 <a href="<?= $controller->url_for('shared/contacts/add_ansprechpartner', 'range', $range_type, $range_id);?>" data-dialog="size=auto">
-                    <?= Icon::create('headache+add', Icon::ROLE_CLICKABLE, ['title' => _('Ansprechpartner hinzufügen')]); ?>
+                    <?= Icon::create('person', Icon::ROLE_CLICKABLE, ['title' => _('Ansprechpartner hinzufügen')]); ?>
                 </a>
             <? endif ?>
             <? if (reset($contacts) && MvvPerm::get(reset($contacts))->haveFieldPerm('position', MvvPerm::PERM_WRITE)) : ?>
diff --git a/app/views/studiengaenge/fachbereichestgteile/index.php b/app/views/studiengaenge/fachbereichestgteile/index.php
index 6ae4dab98669aab1a82ad97c48c88f5bd504fe01..f8c95ef6de4d5702960dec9abcf917e89c957ef8 100644
--- a/app/views/studiengaenge/fachbereichestgteile/index.php
+++ b/app/views/studiengaenge/fachbereichestgteile/index.php
@@ -23,7 +23,7 @@
                     <td class="actions dont-hide" style="white-space: nowrap;">
                         <? if (MvvPerm::havePermCreate('StudiengangTeil')) : ?>
                             <a href="<?= $controller->url_for('/stgteil_fachbereich/' . $fachbereich['institut_id']) ?>">
-                                <?= Icon::create('file+add', Icon::ROLE_CLICKABLE , ['title' => _('Neuen Studiengangteil in diesem Fachbereich anlegen')])->asImg(); ?>
+                                <?= Icon::create('file', Icon::ROLE_CLICKABLE , ['title' => _('Neuen Studiengangteil in diesem Fachbereich anlegen')])->asImg(); ?>
                             </a>
                         <? endif; ?>
                     </td>
@@ -36,4 +36,4 @@
             </tbody>
         <? endforeach ?>
     </table>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/views/studiengaenge/faecher/index.php b/app/views/studiengaenge/faecher/index.php
index 188e23bd24fd0a954b2732edfe8e5826e3e43009..a71ed08dea661fedff2ffe470530ae9d2d5a4e08 100644
--- a/app/views/studiengaenge/faecher/index.php
+++ b/app/views/studiengaenge/faecher/index.php
@@ -29,7 +29,7 @@
                     <td class="dont-hide actions">
                         <? if (MvvPerm::havePermCreate('StudiengangTeil')) : ?>
                             <a href="<?= $controller->url_for('/stgteil_fach/' . $fach->id) ?>">
-                                <?= Icon::create('file+add',  Icon::ROLE_CLICKABLE ,['title' => _('Neuen Studiengangteil für gewähltes Fach anlegen')])->asImg(); ?>
+                                <?= Icon::create('file',  Icon::ROLE_CLICKABLE ,['title' => _('Neuen Studiengangteil für gewähltes Fach anlegen')])->asImg(); ?>
                             </a>
                         <? endif; ?>
                     </td>
@@ -60,4 +60,4 @@
             </tfoot>
         <? endif; ?>
     </table>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/views/studiengaenge/studiengangteile/index.php b/app/views/studiengaenge/studiengangteile/index.php
index 5b0a1f5edf0f52e30897e1bc4a966a33ae768281..68fedb487675892f8c4c2e836d2e8a8bc17fce49 100644
--- a/app/views/studiengaenge/studiengangteile/index.php
+++ b/app/views/studiengaenge/studiengangteile/index.php
@@ -44,7 +44,7 @@
                                 <? $actionMenu->addLink(
                                     $controller->url_for('/version/' . $stgteil->getId()),
                                     _('Neue Version anlegen'),
-                                    Icon::create('file+add', Icon::ROLE_CLICKABLE, ['title' => _('Neue Version anlegen')])
+                                    Icon::create('file', Icon::ROLE_CLICKABLE, ['title' => _('Neue Version anlegen')])
                                 ) ?>
                             <? endif; ?>
                             <? if (MvvPerm::havePermWrite($stgteil)) : ?>
diff --git a/app/views/studiengaenge/versionen/versionen.php b/app/views/studiengaenge/versionen/versionen.php
index 2f052bda541a3e5b9db09ef46fff0c1bd5bdc9dd..97680ac206eb26e73dcdf147298bb37ecb66b349 100644
--- a/app/views/studiengaenge/versionen/versionen.php
+++ b/app/views/studiengaenge/versionen/versionen.php
@@ -37,7 +37,7 @@
                         <? $actionMenu->addLink(
                             $controller->url_for('/abschnitt', ['version_id' => $version->id]),
                             _('Studiengangteil-Abschnitt anlegen'),
-                            Icon::create('file+add', Icon::ROLE_CLICKABLE, ['title' => _('Studiengangteil-Abschnitt anlegen')]),
+                            Icon::create('file', Icon::ROLE_CLICKABLE, ['title' => _('Studiengangteil-Abschnitt anlegen')]),
                             ['data-dialog' => true])
                         ?>
                     <? endif; ?>
diff --git a/lib/classes/Icon.class.php b/lib/classes/Icon.class.php
index 3070aecd2a5af2bf107617bd3eb42c3c3d3451e2..30d3f3a4317705efcbf23a346c2e73c4e066a60e 100644
--- a/lib/classes/Icon.class.php
+++ b/lib/classes/Icon.class.php
@@ -90,7 +90,7 @@ class Icon
      * constructor instead.
      *
      * @param String $shape      Shape of the icon, may contain a mixed definition
-     *                           like 'seminar+add'
+     *                           like 'seminar'
      * @param String $role       Role of the icon, defaults to Icon::DEFAULT_ROLE
      * @param Array $attributes  Additional attributes like 'title';
      *                           only use semantic ones describing
@@ -113,7 +113,7 @@ class Icon
      * Constructor of the object.
      *
      * @param String $shape      Shape of the icon, may contain a mixed definition
-     *                           like 'seminar+add'
+     *                           like 'seminar'
      * @param String $role       Role of the icon, defaults to Icon::DEFAULT_ROLE
      * @param Array $attributes  Additional attributes like 'title';
      *                           only use semantic ones describing
@@ -380,7 +380,7 @@ class Icon
         return mb_strpos($shape, 'http') === 0;
     }
 
-    // transforms a shape w/ possible additions (`shape+addition`) to a path `(addition/)?shape`
+    // transforms a shape w/ possible additions (`shape`) to a path `(addition/)?shape`
     private function shapeToPath()
     {
         return self::isStatic($this->shape)
diff --git a/lib/classes/MultiPersonSearch.class.php b/lib/classes/MultiPersonSearch.class.php
index 972b7ab5827df78bd61d6e811a6a405b5043a94a..1b37cb0701fc7b6ffe6d3334f9a2e90e5eefe5e8 100644
--- a/lib/classes/MultiPersonSearch.class.php
+++ b/lib/classes/MultiPersonSearch.class.php
@@ -516,7 +516,7 @@ class MultiPersonSearch {
     private function setDefaultValues() {
         $this->title = _('Personen hinzufügen');
         $this->description = _('Bitte wählen Sie aus, wen Sie hinzufügen möchten.');
-        $this->linkIconPath = Icon::create("community+add", "clickable", ['title' => _('Personen hinzufügen')]);
+        $this->linkIconPath = Icon::create("add", "clickable", ['title' => _('Personen hinzufügen')]);
     }
 
     /**
diff --git a/lib/classes/sidebar/SearchWidget.php b/lib/classes/sidebar/SearchWidget.php
index 626078ef9187e99825d311c48f871a6ec300026e..f7dcdc184534910214e0a11b78f6a689ea92e979 100644
--- a/lib/classes/sidebar/SearchWidget.php
+++ b/lib/classes/sidebar/SearchWidget.php
@@ -150,7 +150,7 @@ class SearchWidget extends SidebarWidget
             $reset_link = sprintf(
                 '<a href="%s">%s %s</a>',
                 URLHelper::getLink($this->url, array_merge($reset_params, ['reset-search' => 1])),
-                Icon::create('search+decline')->asImg(['class' => 'text-top']),
+                Icon::create('decline')->asImg(['class' => 'text-top']),
                 _('Zurücksetzen')
             );
             $this->template_variables['reset_search'] = $reset_link;
diff --git a/lib/filesystem/FilesystemVueDataManager.php b/lib/filesystem/FilesystemVueDataManager.php
index 9054de628a32dcb9222b8482c2a1541335b92558..0714356f7215d9753851db9c479753dcc67db79e 100644
--- a/lib/filesystem/FilesystemVueDataManager.php
+++ b/lib/filesystem/FilesystemVueDataManager.php
@@ -83,13 +83,13 @@ class FilesystemVueDataManager
             $actionMenu->addLink(
                 URLHelper::getURL('dispatch.php/file/choose_destination/move/' . $folder->getId(), ['isfolder' => 1]),
                 _('Ordner verschieben'),
-                Icon::create('folder-empty+move_right', 'clickable', ['size' => 20]),
+                Icon::create('arr_1right', 'clickable', ['size' => 20]),
                 ['data-dialog' => 'size=auto']
             );
             $actionMenu->addLink(
                 URLHelper::getURL('dispatch.php/file/choose_destination/copy/' . $folder->getId(), ['isfolder' => 1]),
                 _('Ordner kopieren'),
-                Icon::create('folder-empty+add', 'clickable', ['size' => 20]),
+                Icon::create('clipboard', 'clickable', ['size' => 20]),
                 ['data-dialog' => 'size=auto']
             );
             $actionMenu->addLink(
diff --git a/lib/filesystem/HiddenFolder.php b/lib/filesystem/HiddenFolder.php
index 60a8cbd1e43bda2499c2744bee8e965fc8d31c94..460b8523569ffabcd80e103549032a74c4fb26c7 100644
--- a/lib/filesystem/HiddenFolder.php
+++ b/lib/filesystem/HiddenFolder.php
@@ -45,8 +45,8 @@ class HiddenFolder extends PermissionEnabledFolder
     public function getIcon($role = Icon::DEFAULT_ROLE)
     {
         $shape = $this->is_empty
-               ? 'folder-lock-empty+visibility-invisible'
-               : 'folder-lock-full+visibility-invisible';
+               ? 'folder-lock-empty'
+               : 'folder-lock-full';
         return Icon::create($shape, $role);
     }
 
diff --git a/lib/filesystem/StandardFile.php b/lib/filesystem/StandardFile.php
index 2e9f1ba83769001ce31ee429af82d6d194d3a54b..05f6979e39206d1f521660170de034b1d455391e 100644
--- a/lib/filesystem/StandardFile.php
+++ b/lib/filesystem/StandardFile.php
@@ -257,7 +257,7 @@ class StandardFile implements FileType, ArrayAccess, StandardFileInterface
             $actionMenu->addLink(
                 URLHelper::getURL('dispatch.php/file/choose_destination/move/' . $this->fileref->id),
                 _('Datei verschieben'),
-                Icon::create('file+move_right', Icon::ROLE_CLICKABLE, ['size' => 20]),
+                Icon::create('arr_1right', Icon::ROLE_CLICKABLE, ['size' => 20]),
                 ['data-dialog' => 'size=auto'],
                 'file-move'
             );
@@ -266,14 +266,14 @@ class StandardFile implements FileType, ArrayAccess, StandardFileInterface
             $actionMenu->addLink(
                 URLHelper::getURL('dispatch.php/file/choose_destination/copy/' . $this->fileref->id),
                 _('Datei kopieren'),
-                Icon::create('file+add', Icon::ROLE_CLICKABLE, ['size' => 20]),
+                Icon::create('files', Icon::ROLE_CLICKABLE, ['size' => 20]),
                 ['data-dialog' => 'size=auto'],
                 'file-copy'
             );
             $actionMenu->addLink(
                 $this->fileref->getDownloadURL('force_download'),
                 _('Link kopieren'),
-                Icon::create('group'),
+                Icon::create('clipboard'),
                 ['class' => 'copyable-link'],
                 'link-to-clipboard'
             );
@@ -305,7 +305,7 @@ class StandardFile implements FileType, ArrayAccess, StandardFileInterface
                 $actionMenu->addLink(
                     URLHelper::getURL('dispatch.php/course/feedback/create_form/'. $this->fileref->id . '/FileRef'),
                     _('Neues Feedback-Element'),
-                    Icon::create('star+add', Icon::ROLE_CLICKABLE, ['size' => 20]),
+                    Icon::create('star', Icon::ROLE_CLICKABLE, ['size' => 20]),
                     ['data-dialog' => '1']
                 );
             }
diff --git a/lib/models/Freetext.php b/lib/models/Freetext.php
index e96c706fda9a80a31ebb52a3490454626c8676c2..0c8272b99651dbb297177aff77c0a13c037d1c2b 100644
--- a/lib/models/Freetext.php
+++ b/lib/models/Freetext.php
@@ -15,7 +15,7 @@ class Freetext extends QuestionnaireQuestion implements QuestionType
     public static function getIcon($active = false, $add = false)
     {
         return Icon::create(
-            ($add ?  'add/' : '') . 'guestbook',
+            'guestbook',
             $active ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO
         );
     }
diff --git a/lib/models/Test.php b/lib/models/Test.php
index 3e5cc860c36e31bf922aebb14159649de2f4f59e..53e87906121f5b7e8d376588c171aae40e628e91 100644
--- a/lib/models/Test.php
+++ b/lib/models/Test.php
@@ -8,7 +8,7 @@ class Test extends QuestionnaireQuestion implements QuestionType
 {
     public static function getIcon($active = false, $add = false)
     {
-        return Icon::create($add ?  'test+add' : 'test', $active ? 'clickable' : 'info');
+        return Icon::create('test', $active ? 'clickable' : 'info');
     }
 
     public static function getName()
diff --git a/lib/models/Vote.php b/lib/models/Vote.php
index a27fbace3ee803115f2b7ccc74e40bdb72e7ba09..6060f0beb24e99b4a2d944a6be04f587f56e62a3 100644
--- a/lib/models/Vote.php
+++ b/lib/models/Vote.php
@@ -7,7 +7,7 @@ class Vote extends QuestionnaireQuestion implements QuestionType
 {
     public static function getIcon($active = false, $add = false)
     {
-        return Icon::create($add ?  'vote+add' : 'vote', $active ? 'clickable' : 'info');
+        return Icon::create('vote', $active ? 'clickable' : 'info');
     }
 
     public static function getName()
diff --git a/lib/modules/ActivityFeed.php b/lib/modules/ActivityFeed.php
index 6fa9ce3c21d43fa8aa8df96d7967b9f7640e49f4..7fddce4adb38d68ce90e60c04c8ca4b778b34f33 100644
--- a/lib/modules/ActivityFeed.php
+++ b/lib/modules/ActivityFeed.php
@@ -31,7 +31,7 @@ class ActivityFeed extends CorePlugin implements PortalPlugin
         $icons[] = $navigation;
 
         $navigation = new Navigation('', '#', ['cid' => null]);
-        $navigation->setImage(Icon::create('headache+visibility-visible', 'clickable'));
+        $navigation->setImage(Icon::create('person-online', 'clickable'));
         $navigation->setLinkAttributes([
             'id'    => 'toggle-user-activities',
             'title' => _('Eigene Aktivitäten ein-/ausblenden'),
diff --git a/lib/modules/NewsWidget.php b/lib/modules/NewsWidget.php
index 440d13d84d483c02e0e88dbf4385da3cd59a1eed..f158631d6136ba92a9bc4862d1dc4352ea838126 100644
--- a/lib/modules/NewsWidget.php
+++ b/lib/modules/NewsWidget.php
@@ -53,7 +53,7 @@ class NewsWidget extends CorePlugin implements PortalPlugin
             $icons[] = $navigation;
             if (Config::get()->NEWS_RSS_EXPORT_ENABLE) {
                 $navigation = new Navigation('', 'dispatch.php/news/rss_config/studip');
-                $navigation->setImage(Icon::create('rss+add', 'clickable', ["title" => _('RSS-Feed konfigurieren')]), ["rel" => 'size=auto']);
+                $navigation->setImage(Icon::create('rss', 'clickable', ["title" => _('RSS-Feed konfigurieren')]), ["rel" => 'size=auto']);
                 $icons[] = $navigation;
             }
         }
diff --git a/lib/wiki.inc.php b/lib/wiki.inc.php
index d1a0dbe719d22311888fa44c1197cdd6764a7e5b..09397b05e84596376844997d4f0e888d95230cde 100644
--- a/lib/wiki.inc.php
+++ b/lib/wiki.inc.php
@@ -1361,7 +1361,7 @@ function getShowPageInfobox($keyword, $latest_version)
             $widget->addLink(
                 _('Seiten importieren'),
                 URLHelper::getURL('dispatch.php/wiki/import/' . Context::getId()),
-                Icon::create('wiki+add')
+                Icon::create('import')
             )->asDialog('size=auto');
         }
 
diff --git a/templates/blubber/course_context.php b/templates/blubber/course_context.php
index f5aca3258af60c8d84462e029cb15bce5e296ab6..e4fd91b4b09315e2ef600775f726c497eb1fecaf 100644
--- a/templates/blubber/course_context.php
+++ b/templates/blubber/course_context.php
@@ -65,7 +65,7 @@
            class="followunfollow<?= $unfollowed ? " unfollowed" : "" ?>"
            title="<?= _("Benachrichtigungen für diese Konversation abstellen.") ?>"
            data-thread_id="<?= htmlReady($thread->id) ?>">
-            <?= Icon::create("notification2+remove")->asImg(20, ['class' => "follow text-bottom"]) ?>
+            <?= Icon::create("decline")->asImg(20, ['class' => "follow text-bottom"]) ?>
             <?= Icon::create("notification2")->asImg(20, ['class' => "unfollow text-bottom"]) ?>
             <?= _("Benachrichtigungen aktiviert") ?>
         </a>
diff --git a/templates/blubber/global_context.php b/templates/blubber/global_context.php
index 1a5c24299ee3eb82b0cc4f0cbb042756513d593c..77c4a2905e6a56b15abc188b47ef5c0f92e5aae0 100644
--- a/templates/blubber/global_context.php
+++ b/templates/blubber/global_context.php
@@ -8,7 +8,7 @@
        class="followunfollow<?= $unfollowed ? " unfollowed" : "" ?>"
        title="<?= _("Benachrichtigungen für diese Konversation abstellen.") ?>"
        data-thread_id="global">
-        <?= Icon::create("notification2+remove")->asImg(20, ['class' => "follow text-bottom"]) ?>
+        <?= Icon::create("decline")->asImg(20, ['class' => "follow text-bottom"]) ?>
         <?= Icon::create("notification2")->asImg(20, ['class' => "unfollow text-bottom"]) ?>
         <?= _("Benachrichtigungen aktiviert") ?>
     </a>
diff --git a/tests/unit/lib/classes/IconClassTest.php b/tests/unit/lib/classes/IconClassTest.php
index 4596d7e9abf5ea1f08aacba7c73315f1b3e74fd2..eb743b90d96ba6ee3272b1d69127704b10533331 100644
--- a/tests/unit/lib/classes/IconClassTest.php
+++ b/tests/unit/lib/classes/IconClassTest.php
@@ -34,16 +34,16 @@ class IconClassTest extends \Codeception\Test\Unit
     function testIconCreateAsImgWithAddition()
     {
         $this->assertEquals(
-            '<img width="16" height="16" src="images/icons/blue/add/vote.svg" alt="" class="icon-role-clickable icon-shape-vote+add">',
-            Icon::create('vote+add', 'clickable')->asImg()
+            '<img width="16" height="16" src="images/icons/blue/vote.svg" alt="" class="icon-role-clickable icon-shape-vote">',
+            Icon::create('vote', 'clickable')->asImg()
         );
     }
 
     function testIconCreateAsImgWithSize()
     {
         $this->assertEquals(
-            '<img width="20" height="20" src="images/icons/blue/add/vote.svg" alt="" class="icon-role-clickable icon-shape-vote+add">',
-            Icon::create('vote+add', 'clickable')->asImg(20)
+            '<img width="20" height="20" src="images/icons/blue/vote.svg" alt="" class="icon-role-clickable icon-shape-vote">',
+            Icon::create('vote', 'clickable')->asImg(20)
         );
     }
 
@@ -135,16 +135,16 @@ class IconClassTest extends \Codeception\Test\Unit
     function testIconCreateAsCSSWithSize()
     {
         $this->assertEquals(
-            'background-image:url(images/icons/blue/add/vote.svg);background-size:17px 17px;',
-            Icon::create('vote+add', 'clickable')->asCSS(17)
+            'background-image:url(images/icons/blue/vote.svg);background-size:17px 17px;',
+            Icon::create('vote', 'clickable')->asCSS(17)
         );
     }
 
     function testIconCreateAsImagePath()
     {
         $this->assertEquals(
-            'images/icons/blue/add/vote.svg',
-            Icon::create('vote+add', 'clickable')->asImagePath()
+            'images/icons/blue/vote.svg',
+            Icon::create('vote', 'clickable')->asImagePath()
         );
     }