diff --git a/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js b/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js
index bbf1cd46ce..9057dae6d7 100644
--- a/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js
+++ b/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js
@@ -2,7 +2,7 @@ import { getTranslator } from './context.helper';
 import { getIconPath } from './icon.helper';
 
 const formatErrorLine = (errorMessage) => {
-    const errorIcon = `<svg class="ibexa-icon ibexa-icon--small ibexa-form-error__icon">
+    const errorIcon = `<svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-error__icon">
         <use xlink:href="${getIconPath('notice')}"></use>
     </svg>`;
     const container = document.createElement('em');
diff --git a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig
index ade4eecb2c..273bf304d0 100644
--- a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig
@@ -27,7 +27,7 @@
                 {% endset %}
 
                 {% set col_icon %}
-                    <svg class="ibexa-icon ibexa-icon--small">
+                    <svg class="ibexa-icon ibexa-icon--small-medium">
                         <use xlink:href="{{ ibexa_content_type_icon(bookmark.contentType.identifier) }}"></use>
                     </svg>
                 {% endset %}
@@ -61,7 +61,7 @@
                             data-content-id="{{ bookmark.contentInfo.id }}"
                             data-language-code="{{ bookmark.contentInfo.mainLanguageCode }}"
                         >
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                                 <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                             </svg>
                         </button>
diff --git a/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig
index 0ede0d3d7b..9af7d06c19 100644
--- a/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig
@@ -35,7 +35,7 @@
     {%- if errors|length > 0 -%}
         {%- for error in errors -%}
             <em class="ibexa-field-edit__error ibexa-form-error__row">
-                <svg class="ibexa-icon ibexa-icon--small ibexa-form-error__icon">
+                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-error__icon">
                     <use xlink:href="{{ ibexa_icon_path('notice') }}"></use>
                 </svg>
                 {{ error.message }}
diff --git a/src/bundle/Resources/views/themes/admin/account/profile/view.html.twig b/src/bundle/Resources/views/themes/admin/account/profile/view.html.twig
index c1d75dae86..0f56a61756 100644
--- a/src/bundle/Resources/views/themes/admin/account/profile/view.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/profile/view.html.twig
@@ -38,7 +38,7 @@
 
                         {% if can_edit_profile and ibexa_is_current_user(user) %}
                             <a href="{{ path('ibexa.user.profile.edit') }}" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small">
-                                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                                     <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                                 </svg>
                                 <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig b/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig
index 925ca854e1..5541a70cfd 100644
--- a/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig
@@ -35,7 +35,7 @@
                                     href="{{ path('ibexa.user_settings.update', { 'identifier': settings_group.identifier }) }}"
                                     class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small"
                                 >
-                                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                                         <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                                     </svg>
                                     <span class="ibexa-btn__label">
@@ -79,7 +79,7 @@
                             class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small
                                   {% if can_change_password == false %} disabled{% endif %}"
                         >
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                                 <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                             </svg>
                             <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig
index 7313373d87..a1e57c3dfa 100644
--- a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig
@@ -37,7 +37,7 @@
                     }]) %}
 
                     {% set col_raw %}
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_content_type_icon(row.contentType.identifier) }}"></use>
                         </svg>
                     {% endset %}
@@ -155,7 +155,7 @@
         data-bs-toggle="modal"
         data-bs-target="#{{ modal_data_target }}"
     >
-        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
             <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
         </svg>
         <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig
index bfe23a21bf..0f3b0b393a 100644
--- a/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig
@@ -27,7 +27,7 @@
     {%- if errors|length > 0 -%}
         {%- for error in errors -%}
             <em class="ibexa-field-edit__error ibexa-form-error__row">
-                <svg class="ibexa-icon ibexa-icon--small ibexa-form-error__icon">
+                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-error__icon">
                     <use xlink:href="{{ ibexa_icon_path('notice') }}"></use>
                 </svg>
                 {{ error.message }}
diff --git a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig
index 82300c234f..c2459ee785 100644
--- a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig
@@ -105,7 +105,7 @@
         {% endblock %}
         {% block bottom %}
             <span class="ibexa-icon-tag">
-                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--{{ content_type.identifier }}">
+                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--{{ content_type.identifier }}">
                     <use xlink:href="{{ ibexa_content_type_icon(content_type.identifier) }}"></use>
                 </svg>
                 {{ content_type.name }}
diff --git a/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig
index 5549dd46ad..6a3dcd7d34 100644
--- a/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig
@@ -47,7 +47,7 @@
             type="button"
             class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small ibexa-btn--add-draft"
         >
-            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                 <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
             </svg>
             <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
index 76f815b075..72062f6e92 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
@@ -68,7 +68,7 @@
                             </span>
                         </div>
                         <label class="ibexa-content-locations__visibility-toggler-label {{ not location.invisible ? 'ibexa-content-locations__visibility-toggler-label--hidden' }}">
-                            <svg class="ibexa-icon ibexa-icon--small ">
+                            <svg class="ibexa-icon ibexa-icon--small-medium">
                                 <use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>
                             </svg>
                             {{ 'tab.locations.hidden_content_or_superior'|trans|desc('Content or its ancestor is hidden') }}
@@ -153,7 +153,7 @@
         class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small ibexa-btn--udw-add"
         {{ not can_add ? 'disabled' }}
     >
-        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
             <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
         </svg>
         <span class="ibexa-btn__label">
@@ -170,7 +170,7 @@
         data-bs-toggle="modal"
         data-bs-target="#{{ modal_data_target }}"
     >
-        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
             <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
         </svg>
         <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig
index e6b00d77f6..fa5611933a 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig
@@ -101,7 +101,7 @@
             data-bs-toggle="modal"
             data-bs-target="#add-translation-modal"
         >
-            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                 <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
             </svg>
             <span class="ibexa-btn__label">
@@ -118,7 +118,7 @@
             data-bs-toggle="modal"
             data-bs-target="#{{ modal_data_target }}"
         >
-            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                 <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
             </svg>
             <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig
index 201f5ccb4e..13263aac6f 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig
@@ -54,7 +54,7 @@
             data-bs-toggle="modal"
             data-bs-target="#ibexa-modal--custom-url-alias"
         >
-            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                 <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
             </svg>
             <span class="ibexa-btn__label">
@@ -71,7 +71,7 @@
             data-bs-toggle="modal"
             data-bs-target="#{{ modal_data_target }}"
         >
-            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                 <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
             </svg>
             <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/versions/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/versions/tab.html.twig
index a9969012a0..9e1299e369 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/versions/tab.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/versions/tab.html.twig
@@ -105,7 +105,7 @@
         data-bs-target="#{{ modal_data_target }}"
         title="{{ 'tab.versions.action.delete'|trans|desc('Delete version') }}"
     >
-        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
             <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
         </svg>
     </button>
diff --git a/src/bundle/Resources/views/themes/admin/content_type/available_field_types.html.twig b/src/bundle/Resources/views/themes/admin/content_type/available_field_types.html.twig
index 8e0c86259b..46f5e98df7 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/available_field_types.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/available_field_types.html.twig
@@ -30,7 +30,7 @@
                         </svg>
                     </div>
                     <div class="ibexa-available-field-type__type">
-                        <svg class="ibexa-icon ibexa-available-field-type__type-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-available-field-type__type-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('input-number') }}"></use>
                         </svg>
                     </div>
diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/index.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/index.html.twig
index 4c37867951..7bdb2e85f1 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/index.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/index.html.twig
@@ -26,7 +26,7 @@
                     href="{{ path('ibexa.content_type.add', {contentTypeGroupId: content_type_group.id}) }}"
                     class="btn ibexa-btn ibexa-btn--primary"
                 >
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                         <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
                     </svg>
                     <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/list.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/list.html.twig
index 73d5038185..38242319a8 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/list.html.twig
@@ -29,7 +29,7 @@
                     href="{{ path('ibexa.content_type_group.create') }}"
                     class="btn ibexa-btn ibexa-btn--primary"
                 >
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                         <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
                     </svg>
                     <span class="ibexa-btn__label">
@@ -72,7 +72,7 @@
                 raw: true,
             }]) %}
             {% set col_raw %}
-                <svg class="ibexa-icon ibexa-icon--small">
+                <svg class="ibexa-icon ibexa-icon--small-medium">
                     <use xlink:href="{{ ibexa_content_type_group_icon(content_type_group.identifier) }}"></use>
                 </svg>
             {% endset %}
@@ -109,7 +109,7 @@
                         href="{{ edit_url }}"
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-btn--no-text"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                             <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                         </svg>
                     </a>
@@ -151,7 +151,7 @@
                                 data-bs-toggle="modal"
                                 data-bs-target="#{{ modal_data_target }}"
                             >
-                                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                                     <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                                 </svg>
                                 <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/content_type/edit_section.html.twig b/src/bundle/Resources/views/themes/admin/content_type/edit_section.html.twig
index ab5431fe1a..5264e1d125 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/edit_section.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/edit_section.html.twig
@@ -8,7 +8,7 @@
         <h2 class="ibexa-content-type-edit__section-column-header">{% block title %}{% endblock %}</h2>
         {% if notice_message is defined %}
             <div class="ibexa-content-type-edit__notice">
-                <svg class="ibexa-icon ibexa-icon--small ibexa-content-type-edit__notice-icon">
+                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-content-type-edit__notice-icon">
                     <use xlink:href="{{ ibexa_icon_path('about-info') }}"></use>
                 </svg>
                 {{ notice_message }}
diff --git a/src/bundle/Resources/views/themes/admin/content_type/field_definitions.html.twig b/src/bundle/Resources/views/themes/admin/content_type/field_definitions.html.twig
index c352aa6878..918ca6ede4 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/field_definitions.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/field_definitions.html.twig
@@ -78,7 +78,7 @@
             class="ibexa-content-type-edit__add-field-definitions-group-btn btn ibexa-btn ibexa-btn--info"
             data-is-disabled="{{ is_field_definitions_draggable ? 'false' : 'true' }}"
         >
-            <svg class="ibexa-icon ibexa-icon--small">
+            <svg class="ibexa-icon ibexa-icon--small-medium">
                 <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
             </svg>
             {{ 'content_type.view.edit.add'|trans|desc('Add') }}
diff --git a/src/bundle/Resources/views/themes/admin/content_type/list.html.twig b/src/bundle/Resources/views/themes/admin/content_type/list.html.twig
index 49c9b813a2..b785ad1817 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/list.html.twig
@@ -30,7 +30,7 @@
         }]) %}
 
         {% set col_raw %}
-            <svg class="ibexa-icon ibexa-icon--small">
+            <svg class="ibexa-icon ibexa-icon--small-medium">
                 <use xlink:href="{{ ibexa_content_type_icon(content_type.identifier) }}"></use>
             </svg>
         {% endset %}
@@ -104,7 +104,7 @@
                             data-bs-toggle="modal"
                             data-bs-target="#{{ modal_data_target }}"
                         >
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                                 <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                             </svg>
                             <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig b/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig
index 7e8cf6c11c..32492f7ecf 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig
@@ -9,7 +9,7 @@
     <a title="{{ 'content_type.action.edit'|trans|desc('Edit') }}"
        href="{{ edit_url }}"
         {% if class_name %}class="{{ class_name }}"{% endif %}>
-        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
             <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
         </svg>
     </a>
@@ -23,7 +23,7 @@
         data-content-type-identifier="{{ content_type.identifier }}"
         data-content-type-group-id="{{ content_type_group.id }}"
         {% if class_name %}class="{{ class_name }}"{% endif %}>
-        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--copy">
+        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--copy">
             <use xlink:href="{{ ibexa_icon_path('copy') }}"></use>
         </svg>
     </button>
diff --git a/src/bundle/Resources/views/themes/admin/language/list.html.twig b/src/bundle/Resources/views/themes/admin/language/list.html.twig
index ceb7c0b195..52d1deda3c 100644
--- a/src/bundle/Resources/views/themes/admin/language/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/language/list.html.twig
@@ -102,7 +102,7 @@
                         href="{{ path('ibexa.language.edit', {'languageId': language.id}) }}"
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                         </svg>
                     </a>
@@ -145,7 +145,7 @@
                                 data-bs-toggle="modal"
                                 data-bs-target="#{{ modal_data_target }}"
                             >
-                                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                                     <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                                 </svg>
                                 <span class="ibexa-btn__small">
diff --git a/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig
index c78ad9d9f9..c631835c9a 100644
--- a/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig
@@ -27,7 +27,7 @@
             {% set col_raw %}
                 <a href="{{ view_url }}">{{ url.url|u.truncate(50) }}</a>
                 <a href="{{ url.url }}" target="_blank">
-                    <svg class="ibexa-icon ibexa-icon--small">
+                    <svg class="ibexa-icon ibexa-icon--small-medium">
                         <use xlink:href="{{ ibexa_icon_path('open-newtab') }}"></use>
                     </svg>
                 </a>
@@ -50,7 +50,7 @@
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                         title="{{ 'url.action.edit'|trans|desc('Edit') }}"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                             <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                         </svg>
                     </a>
diff --git a/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig
index c421b93c7a..8ddf15a8c0 100644
--- a/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig
+++ b/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig
@@ -40,7 +40,7 @@
                         <a href="{{ path('ibexa.link_manager.edit', { urlId: url.id }) }}"
                            class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text mx-2 float-right"
                            title="{{ 'url.action.edit'|trans|desc('Edit') }}">
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                                 <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                             </svg>
                         </a>
@@ -106,7 +106,7 @@
                         data-content-id="{{ content.id }}"
                         data-language-code="{{ content.mainLanguageCode }}"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                             <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                         </svg>
                     </button>
diff --git a/src/bundle/Resources/views/themes/admin/object_state/list.html.twig b/src/bundle/Resources/views/themes/admin/object_state/list.html.twig
index 864ab1b529..b8eba400cc 100644
--- a/src/bundle/Resources/views/themes/admin/object_state/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/object_state/list.html.twig
@@ -44,7 +44,7 @@
                     href="{{ path('ibexa.object_state.state.update', {'objectStateId': object_state.id}) }}"
                     class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                 >
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                         <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                     </svg>
                 </a>
@@ -79,7 +79,7 @@
                             href="{{ path('ibexa.object_state.state.add', {'objectStateGroupId': object_state_group.id}) }}"
                             class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small"
                         >
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                                 <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
                             </svg>
                             <span class="ibexa-btn__label">
@@ -96,7 +96,7 @@
                             data-bs-toggle="modal"
                             data-bs-target="#{{ modal_data_target }}"
                         >
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                                 <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                             </svg>
                             <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig
index ad8151216f..d79beaae9e 100644
--- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig
@@ -31,7 +31,7 @@
                     href="{{ path('ibexa.object_state.group.add') }}"
                     class="btn ibexa-btn ibexa-btn--primary"
                 >
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                         <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
                     </svg>
                     <span class="ibexa-btn__label">
@@ -88,7 +88,7 @@
                         href="{{ path('ibexa.object_state.group.update', {'objectStateGroupId': object_state_group.id}) }}"
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                             <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                         </svg>
                     </a>
@@ -128,7 +128,7 @@
                                 data-bs-toggle="modal"
                                 data-bs-target="#{{ modal_data_target }}"
                             >
-                                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                                     <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                                 </svg>
                                 <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/section/list.html.twig b/src/bundle/Resources/views/themes/admin/section/list.html.twig
index 5e26c1350d..dc1e47ad27 100644
--- a/src/bundle/Resources/views/themes/admin/section/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/section/list.html.twig
@@ -30,7 +30,7 @@
                     href="{{ path('ibexa.section.create') }}"
                     class="btn ibexa-btn ibexa-btn--primary"
                 >
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                         <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
                     </svg>
                     <span class="ibexa-btn__label">
@@ -99,7 +99,7 @@
                         data-udw-config="{{ ibexa_udw_config('multiple', {'type': 'section_assign'}) }}"
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                     >
-                        <svg class="ibexa-icon ibexa-icon--relations ibexa-icon--small ibexa-btn--open-udw">
+                        <svg class="ibexa-icon ibexa-icon--relations ibexa-icon--small-medium ibexa-btn--open-udw">
                             <use xlink:href="{{ ibexa_icon_path('assign-section') }}"></use>
                         </svg>
                     </a>
@@ -110,7 +110,7 @@
                         href="{{ path('ibexa.section.update', {'sectionId': section.id}) }}"
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                             <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                         </svg>
                     </a>
@@ -152,7 +152,7 @@
                                 data-bs-toggle="modal"
                                 data-bs-target="#{{ modal_data_target }}"
                             >
-                                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                                     <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                                 </svg>
                                 <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/section/view.html.twig b/src/bundle/Resources/views/themes/admin/section/view.html.twig
index 4d2b7621bc..409e11d8f0 100644
--- a/src/bundle/Resources/views/themes/admin/section/view.html.twig
+++ b/src/bundle/Resources/views/themes/admin/section/view.html.twig
@@ -46,7 +46,7 @@
                 href="{{ path('ibexa.section.update', {'sectionId': section.id}) }}"
                 class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small"
             >
-                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                     <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                 </svg>
                 <span class="ibexa-btn__label">
@@ -59,7 +59,7 @@
                 {% if not deletable %}disabled{% endif %}
                 {{ modalDataAttributes }}
             >
-                <svg class="ibexa-icon ibexa-icon--small">
+                <svg class="ibexa-icon ibexa-icon--small-medium">
                     <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                 </svg>
                 <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/trash/list.html.twig b/src/bundle/Resources/views/themes/admin/trash/list.html.twig
index 87237ea4a8..2aa53dbe29 100644
--- a/src/bundle/Resources/views/themes/admin/trash/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/trash/list.html.twig
@@ -140,7 +140,7 @@
                 }]) %}
 
                 {% set col_raw %}
-                    <svg class="ibexa-icon ibexa-icon--small">
+                    <svg class="ibexa-icon ibexa-icon--small-medium">
                         <use xlink:href="{{ ibexa_content_type_icon(trash_item.contentType.identifier) }}"></use>
                     </svg>
                 {% endset %}
@@ -311,7 +311,7 @@
                                     data-bs-toggle="modal"
                                     data-bs-target="#{{ modal_data_target }}"
                                 >
-                                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                                         <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                                     </svg>
                                     <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/ui/action_list.html.twig b/src/bundle/Resources/views/themes/admin/ui/action_list.html.twig
index 741c77085a..a3e24adba2 100644
--- a/src/bundle/Resources/views/themes/admin/ui/action_list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/action_list.html.twig
@@ -17,7 +17,7 @@
     {% endif %}
 
     <{{ element }} {{ html.attributes(attr) }}>
-        <svg class="ibexa-icon ibexa-icon--small">
+        <svg class="ibexa-icon ibexa-icon--small-medium">
             <use xlink:href="{{ ibexa_icon_path(action.extras.icon) }}"></use>
         </svg>
     </{{ element }}>
diff --git a/src/bundle/Resources/views/themes/admin/ui/anchor_navigation_menu.html.twig b/src/bundle/Resources/views/themes/admin/ui/anchor_navigation_menu.html.twig
index 3d51120ba2..def19d1a7e 100644
--- a/src/bundle/Resources/views/themes/admin/ui/anchor_navigation_menu.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/anchor_navigation_menu.html.twig
@@ -5,7 +5,7 @@
                 class="btn ibexa-btn ibexa-btn--ghost ibexa-anchor-navigation-menu__close"
                 href="{{ close_href }}"
             >
-                <svg class="ibexa-icon ibexa-icon--small">
+                <svg class="ibexa-icon ibexa-icon--small-medium">
                     <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                 </svg>
                 <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/adaptive_filters/adaptive_filters.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/adaptive_filters/adaptive_filters.html.twig
index d23d193352..183a3e1713 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/adaptive_filters/adaptive_filters.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/adaptive_filters/adaptive_filters.html.twig
@@ -74,7 +74,7 @@
 
 {% macro collapse_btn(attr, expand_label, collapse_label) %}
     <button {{ html.attributes(attr) }}>
-        <svg class="ibexa-icon ibexa-icon--small">
+        <svg class="ibexa-icon ibexa-icon--small-medium">
             <use xlink:href="{{ ibexa_icon_path('caret-next') }}"></use>
         </svg>
         <span class="ibexa-btn__label ibexa-btn__label--more">
@@ -121,7 +121,7 @@
                             type="button"
                             class="btn ibexa-btn ibexa-btn--ghost ibexa-adaptive-filters__clear-btn"
                         >
-                            <svg class="ibexa-icon ibexa-icon--small">
+                            <svg class="ibexa-icon ibexa-icon--small-medium">
                                 <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                             </svg>
                             <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/alert/alert.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/alert/alert.html.twig
index c9d0a613c6..2d0971e660 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/alert/alert.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/alert/alert.html.twig
@@ -20,7 +20,7 @@
     {% block icon %}
         {% set icon = icon_name_map[type] is defined ? icon_name_map[type] : '' %}
         <div class="ibexa-alert__icon-wrapper">
-            <svg class="ibexa-icon ibexa-alert__icon ibexa-icon--small">
+            <svg class="ibexa-icon ibexa-alert__icon ibexa-icon--small-medium">
                 <use xlink:href="{{ icon_path is defined ? icon_path : ibexa_icon_path(icon) }}"></use>
             </svg>
         </div>
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/autosave/autosave.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/autosave/autosave.html.twig
index 9c277595ea..3f88f1ebd4 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/autosave/autosave.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/autosave/autosave.html.twig
@@ -6,19 +6,19 @@
         {{ is_dark_mode|default(false) ? 'ibexa-autosave--light' }}"
     {% if is_enabled %}title="{{ 'content.autosave.turn_off.message'|trans()|desc('You can turn autosave off in your user settings') }}"{% endif %}
 >
-    <svg class="ibexa-icon ibexa-icon--small ibexa-autosave__icon-error">
+    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-autosave__icon-error">
         <use xlink:href="{{ ibexa_icon_path('autosave-error') }}"></use>
     </svg>
-    <svg class="ibexa-icon ibexa-icon--small ibexa-autosave__icon-off">
+    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-autosave__icon-off">
         <use xlink:href="{{ ibexa_icon_path('autosave-off') }}"></use>
     </svg>
-    <svg class="ibexa-icon ibexa-icon--small ibexa-autosave__icon-on">
+    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-autosave__icon-on">
         <use xlink:href="{{ ibexa_icon_path('autosave-on') }}"></use>
     </svg>
-    <svg class="ibexa-icon ibexa-icon--small ibexa-autosave__icon-saved">
+    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-autosave__icon-saved">
         <use xlink:href="{{ ibexa_icon_path('autosave-saved') }}"></use>
     </svg>
-    <svg class="ibexa-icon ibexa-icon--small ibexa-autosave__icon-saving">
+    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-autosave__icon-saving">
         <use xlink:href="{{ ibexa_icon_path('autosave-saving') }}"></use>
     </svg>
 
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/collapse.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/collapse.html.twig
index 6a32bcda61..e5b879e006 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/collapse.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/collapse.html.twig
@@ -28,7 +28,7 @@
                 {% if extra_actions is defined %}
                     {% for action in extra_actions %}
                         <button type="button" class="ibexa-collapse__extra-action-button btn ibexa-btn ibexa-btn--no-text {{ action.button_class|default('') }}">
-                            <svg class="ibexa-icon ibexa-icon--{{ action.icon_size|default('small') }}">
+                            <svg class="ibexa-icon ibexa-icon--{{ action.icon_size|default('small-medium') }}">
                                 <use xlink:href="{{ ibexa_icon_path(action.icon_name) }}"></use>
                             </svg>
                         </button>
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/context_menu/context_menu.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/context_menu/context_menu.html.twig
index 766f2943c6..107882a69e 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/context_menu/context_menu.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/context_menu/context_menu.html.twig
@@ -11,7 +11,7 @@
         ibexa-adaptive-items__item--selector
     ">
         <button class="{{ selector_btn_classes ~ ' ibexa-btn--more' }}">
-            <svg class="ibexa-icon ibexa-icon--small">
+            <svg class="ibexa-icon ibexa-icon--small-medium">
                 <use xlink:href="{{ ibexa_icon_path('options') }}"></use>
             </svg>
         </button>
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig
index 11d5d6fc0b..4a5f8add8c 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig
@@ -77,7 +77,7 @@
                                         </span>
                                         <svg
                                             class="
-                                                ibexa-icon ibexa-icon--small
+                                                ibexa-icon ibexa-icon--small-medium
                                                 ibexa-details__show-more-btn-icon"
                                         >
                                             <use xlink:href="{{ ibexa_icon_path('arrow-caret-down') }}"></use>
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig
index ba95fb9c86..2e8ed6dac9 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig
@@ -26,12 +26,12 @@
             <input type="checkbox" name="dropdown-checkbox" class="ibexa-input ibexa-input--checkbox" {% if is_selected %}checked{% endif %} />
         {% endif %}
         {% if icon is defined and icon != '' %}
-            <svg class="ibexa-icon ibexa-icon--small {{ icon_class|default('') }}">
+            <svg class="ibexa-icon ibexa-icon--small-medium {{ icon_class|default('') }}">
                 <use xlink:href="{{ ibexa_icon_path(icon) }}"></use>
             </svg>
         {% endif %}
         {% if choice.icon is defined %}
-            <svg class="ibexa-icon ibexa-icon--small">
+            <svg class="ibexa-icon ibexa-icon--small-medium">
                 <use xlink:href="{{ ibexa_icon_path(choice.icon) }}"></use>
             </svg>
         {% endif %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_selected_item_icon.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_selected_item_icon.html.twig
index 6af328cadf..6e6df0d567 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_selected_item_icon.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_selected_item_icon.html.twig
@@ -1,3 +1,3 @@
-<svg class="ibexa-icon ibexa-icon--small">
+<svg class="ibexa-icon ibexa-icon--small-medium">
     <use xlink:href="{{ ibexa_icon_path(icon|default('')) }}"></use>
 </svg>
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/embedded_item_actions/embedded_item_actions.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/embedded_item_actions/embedded_item_actions.html.twig
index 93202adff0..c82b3e106b 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/embedded_item_actions/embedded_item_actions.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/embedded_item_actions/embedded_item_actions.html.twig
@@ -11,7 +11,7 @@
             class="btn ibexa-btn ibexa-btn--small ibexa-btn--ghost ibexa-btn--no-text ibexa-embedded-item-actions__menu-trigger-btn"
             data-is-menu-attached="{{ is_menu_attached|default(0) }}"
         >
-            <svg class="ibexa-icon ibexa-icon--small">
+            <svg class="ibexa-icon ibexa-icon--small-medium">
                 <use xlink:href="{{ ibexa_icon_path('options') }}"></use>
             </svg>
         </button>
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/extra_actions/extra_actions.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/extra_actions/extra_actions.html.twig
index bec1880d4e..66d0055b3a 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/extra_actions/extra_actions.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/extra_actions/extra_actions.html.twig
@@ -12,7 +12,7 @@
     <div class="ibexa-extra-actions__header">
         <h2>{{ title|default('') }}</h2>
         <button class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ibexa-btn--close">
-            <svg class="ibexa-icon ibexa-icon--small">
+            <svg class="ibexa-icon ibexa-icon--small-medium">
                 <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
             </svg>
         </button>
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/input_text.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/input_text.html.twig
index 6b0f6ed574..9c83dc7462 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/input_text.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/input_text.html.twig
@@ -50,10 +50,10 @@
                         tabindex="5"
                         {{ is_disabled ? 'disabled' }}
                     >
-                        <svg class="ibexa-icon ibexa-icon--small ibexa-input-text-wrapper__password-show">
+                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-input-text-wrapper__password-show">
                             <use xlink:href="{{ ibexa_icon_path('view') }}"></use>
                         </svg>
-                        <svg class="ibexa-icon ibexa-icon--small ibexa-input-text-wrapper__password-hide d-none">
+                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-input-text-wrapper__password-hide d-none">
                             <use xlink:href="{{ ibexa_icon_path('view-hide') }}"></use>
                         </svg>
                     </button>
@@ -64,7 +64,7 @@
                         tabindex="-1"
                         {{ is_disabled ? 'disabled' }}
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('search') }}"></use>
                         </svg>
                     </button>
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/inputs/input_date_time_picker.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/inputs/input_date_time_picker.html.twig
index 44e4814102..d18d8e943f 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/inputs/input_date_time_picker.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/inputs/input_date_time_picker.html.twig
@@ -35,7 +35,7 @@
             class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ibexa-input-text-wrapper__action-btn ibexa-input-text-wrapper__action-btn--calendar"
             {{ is_disabled ? 'disabled' }}
         >
-            <svg class="ibexa-icon ibexa-icon--small">
+            <svg class="ibexa-icon ibexa-icon--small-medium">
                 <use xlink:href="{{ ibexa_icon_path('date') }}"></use>
             </svg>
         </button>
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/multilevel_popup_menu/multilevel_popup_menu_item.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/multilevel_popup_menu/multilevel_popup_menu_item.html.twig
index afa511ac51..e593886e75 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/multilevel_popup_menu/multilevel_popup_menu_item.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/multilevel_popup_menu/multilevel_popup_menu_item.html.twig
@@ -40,7 +40,7 @@
                             </span>
                         {%- endblock -%}
 
-                        <svg class="ibexa-icon ibexa-icon--small ibexa-popup-menu__subitems-arrow">
+                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-popup-menu__subitems-arrow">
                             <use xlink:href="{{ ibexa_icon_path('arrow-caret-right') }}"></use>
                         </svg>
 
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/split_btn/split_btn.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/split_btn/split_btn.html.twig
index 323aaefd64..dfc1ebccce 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/split_btn/split_btn.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/split_btn/split_btn.html.twig
@@ -52,7 +52,7 @@
         {% block toggle_btn %}
             <button {{ html.attributes(toggler_btn_attr) }}>
                 {% block toggle_btn_label %}
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-split-btn__toggler-icon">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-split-btn__toggler-icon">
                         <use xlink:href="{{ ibexa_icon_path('caret-down') }}"></use>
                     </svg>
                 {% endblock %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/tab/tabs_header.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/tab/tabs_header.html.twig
index a323d19957..3938459dc9 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/tab/tabs_header.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/tab/tabs_header.html.twig
@@ -29,7 +29,7 @@
                 >
                     <a class="nav-link ibexa-tabs__link" role="button">
                         {% block btn_more_content %}
-                            <svg class="ibexa-icon ibexa-icon--small">
+                            <svg class="ibexa-icon ibexa-icon--small-medium">
                                 <use xlink:href="{{ ibexa_icon_path('options') }}"></use>
                             </svg>
                         {% endblock %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/tab_switcher/popup_menu_item.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/tab_switcher/popup_menu_item.html.twig
index 7800012171..b12032b4e8 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/tab_switcher/popup_menu_item.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/tab_switcher/popup_menu_item.html.twig
@@ -3,7 +3,7 @@
 <li class="ibexa-popup-menu__item {{ class|default('') }}">
     <button type="button" class="ibexa-popup-menu__item-content {{ content_class|default('') }}" {{ macros.attributes(action_attr|default({})) }}>
         {{ label }}
-        <svg class="ibexa-icon ibexa-icon--small ibexa-tabs__tab-error-icon">
+        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-tabs__tab-error-icon">
             <use xlink:href="{{ ibexa_icon_path('warning-triangle') }}"></use>
         </svg>
     </button>
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/table/table_header.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/table/table_header.html.twig
index 2d725ccb19..04a35423a0 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/table/table_header.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/table/table_header.html.twig
@@ -11,7 +11,7 @@
                 {{ notice_class|default('') }}
                 {{ not notice_message|default('') and not show_notice|default(false) ? 'ibexa-table-header__notice--hidden' }}"
             >
-                <svg class="ibexa-icon ibexa-icon--small ibexa-table-header__notice-icon">
+                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-table-header__notice-icon">
                     <use xlink:href="{{ ibexa_icon_path(notice_icon|default('about-info')) }}"></use>
                 </svg>
                 {{ notice_message|default('') }}
diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig
index 7b2707ccc7..cb9fe447ef 100644
--- a/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig
@@ -17,7 +17,7 @@
             data-udw-config="{{ ibexa_udw_config('create', {'type': 'content_create'}) }}"
             {% if not can_create_content %}disabled{% endif %}
         >
-            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                 <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
             </svg>
             <span>{{ 'dashboard.create'|trans|desc('Create content') }}</span>
diff --git a/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig b/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig
index f05d33d41d..ca98aa6f68 100644
--- a/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig
@@ -11,7 +11,7 @@
                 <div class="ibexa-edit-header__info-bar">
                     <div class="ibexa-edit-header__info-bar-action-type">
                         {% if icon_name is defined %}
-                            <svg class="ibexa-icon ibexa-icon--small">
+                            <svg class="ibexa-icon ibexa-icon--small-medium">
                                 <use xlink:href="{{ ibexa_icon_path(icon_name|lower) }}"></use>
                             </svg>
                         {% endif %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/edit_translation_button.html.twig b/src/bundle/Resources/views/themes/admin/ui/edit_translation_button.html.twig
index 53a2e5ff66..116fe247ba 100644
--- a/src/bundle/Resources/views/themes/admin/ui/edit_translation_button.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/edit_translation_button.html.twig
@@ -11,7 +11,7 @@
         data-content-id="{{ contentId }}"
         data-language-code="{{ language.languageCode }}"
     >
-        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
             <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
         </svg>
     </button>
@@ -24,7 +24,7 @@
             title="{{ title }}"
             type="button"
         >
-            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                 <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
             </svg>
         </button>
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig
index 8f1560d5c9..e7c79d7343 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig
@@ -18,7 +18,7 @@
             title="{{ 'ibexa_author.action.add'|trans|desc('Add') }}"
             {{ readonly|default(false) ? 'disabled' }}
         >
-            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                 <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
             </svg>
             <span class="ibexa-btn__label">{{ 'ibexa_author.action.add'|trans|desc('Add') }}</span>
@@ -29,7 +29,7 @@
             title="{{ 'ibexa_author.action.delete'|trans|desc('Delete') }}"
             disabled
         >
-            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                 <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
             </svg>
             <span class="ibexa-btn__label">{{ 'ibexa_author.action.delete'|trans|desc('Delete') }}</span>
@@ -65,7 +65,7 @@
                 title="{{ 'ibexa_author.action.delete'|trans|desc('Delete') }}"
                 disabled
             >
-                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                     <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                 </svg>
             </button>
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_binaryfile.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_binaryfile.html.twig
index c5a1de6bea..e2343e25c0 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_binaryfile.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_binaryfile.html.twig
@@ -24,7 +24,7 @@
                         download
                         {{ readonly ? 'disabled' }}
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('download') }}"></use>
                         </svg>
                         <span class="ibexa-btn__label">{{ 'ibexa_binaryfile.action.download'|trans|desc('Download') }}</span>
@@ -34,7 +34,7 @@
                         class="ibexa-field-edit-preview__action--remove btn ibexa-btn ibexa-btn--ghost ibexa-btn--small"
                         {{ readonly ? 'disabled' }}
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                         </svg>
                         <span class="ibexa-btn__label">{{ 'ibexa_binaryfile.action.remove'|trans|desc('Delete') }}</span>
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig
index 02e30556ee..a82fccfa97 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig
@@ -28,7 +28,7 @@
                         class="ibexa-field-edit-preview__action ibexa-field-edit-preview__action--remove btn ibexa-btn ibexa-btn--ghost ibexa-btn--small"
                         {{ readonly ? 'disabled' }}
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                         </svg>
                         <span class="ibexa-btn__label">{{ 'content.field_type.ibexa_image.delete'|trans|desc('Delete') }}</span>
@@ -39,7 +39,7 @@
                         target="_blank"
                         {{ readonly ? 'disabled' }}
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('open-newtab') }}"></use>
                         </svg>
                         <span class="ibexa-btn__label">{{ 'content.field_type.ibexa_image.preview'|trans|desc('Preview') }}</span>
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig
index 71d1cb7832..a593ec8b3e 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig
@@ -119,7 +119,7 @@
                         class="ibexa-field-edit-preview__action--remove btn ibexa-btn ibexa-btn--ghost ibexa-btn--small"
                         {{ readonly ? 'disabled' }}
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                         </svg>
                         <span class="ibexa-btn__label">{{ 'fieldtype.ibexa_image_asset.delete'|trans|desc('Delete') }}</span>
@@ -130,7 +130,7 @@
                         target="_blank"
                         {{ readonly ? 'disabled' }}
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('open-newtab') }}"></use>
                         </svg>
                         <span class="ibexa-btn__label">{{ 'content.field_type.ibexa_image.preview'|trans|desc('Preview') }}</span>
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_media.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_media.html.twig
index 0b7364d5c8..75e4a3e36f 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_media.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_media.html.twig
@@ -22,7 +22,7 @@
                         class="ibexa-field-edit-preview__action--remove btn ibexa-btn ibexa-btn--ghost ibexa-btn--small"
                         {{ readonly ? 'disabled' }}
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                         </svg>
                         <span class="ibexa-btn__label">{{ 'content.field_type.ibexa_media.delete'|trans|desc('Delete') }}</span>
@@ -33,7 +33,7 @@
                         target="_blank"
                         {{ readonly ? 'disabled' }}
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('open-newtab') }}"></use>
                         </svg>
                         <span class="ibexa-btn__label">{{ 'content.field_type.ibexa_media.download'|trans|desc('Download') }}</span>
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig
index a4e0e96c78..97a9bb7939 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig
@@ -14,7 +14,7 @@
             title="{{ 'ibexa_object_relation_list.delete_selected_relations'|trans|desc('Delete') }}"
             {{ readonly ? 'disabled' }}
         >
-            <svg class="ibexa-icon ibexa-icon--small">
+            <svg class="ibexa-icon ibexa-icon--small-medium">
                 <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
             </svg>
         </button>
@@ -283,7 +283,7 @@
                                 disabled
                                 {% if not has_relations %}hidden="true"{% endif %}
                             >
-                                <svg class="ibexa-icon ibexa-icon--small">
+                                <svg class="ibexa-icon ibexa-icon--small-medium">
                                     <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                                 </svg>
                                 <span class="ibexa-btn__label">{{ 'ibexa_object_relation_list.delete_selected_relations'|trans|desc('Delete') }}</span>
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig
index 1d15c452b6..f8e49d76ec 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig
@@ -229,7 +229,7 @@
             {{ field.value.fileName }}
             {{ field.value.fileSize|ibexa_file_size( 1 ) }}
             <a class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ml-4" download href="{{ path( route_reference.getRoute(), route_reference.getParams() ) }}">
-                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--download">
+                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--download">
                     <use xlink:href="{{ ibexa_icon_path('download') }}"></use>
                 </svg>
             </a>
diff --git a/src/bundle/Resources/views/themes/admin/ui/form/assign_section_widget.html.twig b/src/bundle/Resources/views/themes/admin/ui/form/assign_section_widget.html.twig
index 0d4faa1310..f5fe838ee3 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form/assign_section_widget.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form/assign_section_widget.html.twig
@@ -10,7 +10,7 @@
         {%- endif -%}
     {%- endif -%}
     <button type="{{ type|default('button') }}" {{ block('button_attributes') }}>
-        <svg class="ibexa-icon ibexa-icon--small">
+        <svg class="ibexa-icon ibexa-icon--small-medium">
             <use xlink:href="{{ ibexa_icon_path('assign-section') }}"></use>
         </svg>
         <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
index 002a40686d..cd2930a87b 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -60,7 +60,7 @@
         {%- else -%}
             <div class="ibexa-instant-filter__group-item" data-identifier="{{ option.value }}">
                 <label class="ibexa-instant-filter__group-item-label-icon" for="{{ form[key].vars.id }}">
-                    <svg class="ibexa-icon ibexa-icon--small">
+                    <svg class="ibexa-icon ibexa-icon--small-medium">
                         <use xlink:href="{{ ibexa_content_type_icon(option.value) }}"></use>
                     </svg>
                 </label>
@@ -174,7 +174,7 @@
         {%- endif -%}
     {%- endif -%}
     <button type="{{ type }}" {{ block('button_attributes') }}>
-        <svg class="ibexa-icon ibexa-icon--small">
+        <svg class="ibexa-icon ibexa-icon--small-medium">
             <use xlink:href="{{ ibexa_icon_path('restore') }}"></use>
         </svg>
         <span class="ibexa-btn__label">
@@ -196,7 +196,7 @@
         {%- endif -%}
     {%- endif -%}
     <button type="{{ type }}" {{ block('button_attributes') }}>
-        <svg class="ibexa-icon ibexa-icon--small">
+        <svg class="ibexa-icon ibexa-icon--small-medium">
             <use xlink:href="{{ ibexa_icon_path('restore-parent') }}"></use>
         </svg>
         <span class="ibexa-btn__label">
@@ -235,7 +235,7 @@
         {%- endif -%}
     {%- endif -%}
     <button type="{{ type }}" {{ block('button_attributes') }}>
-        <svg class="ibexa-icon ibexa-icon--small">
+        <svg class="ibexa-icon ibexa-icon--small-medium">
             <use xlink:href="{{ ibexa_icon_path(icon|default('')) }}"></use>
         </svg>
         {%- if title -%}
@@ -374,7 +374,7 @@
         {%- set form_errors_attr = form_errors_attr|default({})|merge({class: (form_errors_attr.class|default('') ~ ' ibexa-form-error__row')|trim}) -%}
         {%- for error in errors -%}
             <em {% with { attr: form_errors_attr } %}{{ block('attributes') }}{% endwith %}>
-                <svg class="ibexa-icon ibexa-icon--small ibexa-form-error__icon">
+                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-error__icon">
                     <use xlink:href="{{ ibexa_icon_path('notice') }}"></use>
                 </svg>
                 {{ error.message }}
@@ -419,7 +419,7 @@
 
         <small id="{{ id }}_help"{% with { attr: help_attr } %}{{ block('attributes') }}{% endwith %}>
             {% if with_icon %}
-                <svg class="ibexa-icon ibexa-icon--small ibexa-form-help__icon">
+                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-help__icon">
                     <use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>
                 </svg>
             {% endif %}
@@ -518,7 +518,7 @@
     {% trans_default_domain 'ibexa_admin_ui' %}
 
     {%- set title_icon -%}
-        <svg class="ibexa-icon ibexa-icon--small">
+        <svg class="ibexa-icon ibexa-icon--small-medium">
             <use xlink:href="{{ ibexa_icon_path('un-focus') }}"></use>
         </svg>
     {%- endset -%}
diff --git a/src/bundle/Resources/views/themes/admin/ui/menu/anchor_menu.html.twig b/src/bundle/Resources/views/themes/admin/ui/menu/anchor_menu.html.twig
index 05774bbab2..bc7bbecefb 100644
--- a/src/bundle/Resources/views/themes/admin/ui/menu/anchor_menu.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/menu/anchor_menu.html.twig
@@ -107,7 +107,7 @@
         >
             {{ block('label') }}
         </a>
-        <svg class="ibexa-icon ibexa-icon--small ibexa-tabs__tab-error-icon">
+        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-tabs__tab-error-icon">
             <use xlink:href="{{ ibexa_icon_path('warning-triangle') }}"></use>
         </svg>
     </{{ itemTagElement }}>
@@ -151,7 +151,7 @@
                             <svg class="ibexa-icon ibexa-icon--tiny-small">
                                 <use xlink:href="{{ ibexa_icon_path('caret-double-next') }}"></use>
                             </svg>
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-tabs__tab-error-icon">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-tabs__tab-error-icon">
                                 <use xlink:href="{{ ibexa_icon_path('warning-triangle') }}"></use>
                             </svg>
                         </a>
diff --git a/src/bundle/Resources/views/themes/admin/ui/menu/context_menu.html.twig b/src/bundle/Resources/views/themes/admin/ui/menu/context_menu.html.twig
index 1a6d13176f..3a94f192db 100644
--- a/src/bundle/Resources/views/themes/admin/ui/menu/context_menu.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/menu/context_menu.html.twig
@@ -140,7 +140,7 @@
 
         <{{element}}{{macros.attributes(attributes)}}>
             {% if item.extras.icon is defined %}
-                <svg class="ibexa-icon ibexa-icon--small">
+                <svg class="ibexa-icon ibexa-icon--small-medium">
                     <use xlink:href="{{ ibexa_icon_path(item.extras.icon) }}"></use>
                 </svg>
             {% endif %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/menu/main_2nd_level.html.twig b/src/bundle/Resources/views/themes/admin/ui/menu/main_2nd_level.html.twig
index ddc2557eb9..8c36c72f71 100644
--- a/src/bundle/Resources/views/themes/admin/ui/menu/main_2nd_level.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/menu/main_2nd_level.html.twig
@@ -44,7 +44,7 @@
                                 class="ibexa-main-menu__tooltip-trigger ibexa-btn ibexa-btn--small ibexa-btn--no-text"
                                 data-popup-target-selector="#{{ child.name }}-popup"
                             >
-                                <svg class="ibexa-icon ibexa-icon--small">
+                                <svg class="ibexa-icon ibexa-icon--small-medium">
                                     <use xlink:href="{{ ibexa_icon_path('menu') }}"></use>
                                 </svg>
                             </button>
@@ -66,7 +66,7 @@
         </div>
         <div class="ibexa-main-menu__toggler-container">
             <button class="ibexa-main-menu__toggler ibexa-btn ibexa-btn--small ibexa-btn--no-text">
-                <svg class="ibexa-icon ibexa-icon--small">
+                <svg class="ibexa-icon ibexa-icon--small-medium">
                     <use xlink:href="{{ ibexa_icon_path('expand-left') }}"></use>
                 </svg>
             </button>
diff --git a/src/bundle/Resources/views/themes/admin/ui/menu/user.html.twig b/src/bundle/Resources/views/themes/admin/ui/menu/user.html.twig
index 2cde33416f..e941a00036 100644
--- a/src/bundle/Resources/views/themes/admin/ui/menu/user.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/menu/user.html.twig
@@ -10,7 +10,7 @@
                 data-bs-toggle="modal"
                 data-bs-target="#view-notifications"
         >
-            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--light">
+            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--light">
                 <use xlink:href="{{ ibexa_icon_path('bell') }}"></use>
             </svg>
             <span class="ibexa-header-user-menu__notice-dot ibexa-header-user-menu__notice-dot--no-notice"></span>
diff --git a/src/bundle/Resources/views/themes/admin/ui/search/results.html.twig b/src/bundle/Resources/views/themes/admin/ui/search/results.html.twig
index 562532e55b..c0bff9ec5f 100644
--- a/src/bundle/Resources/views/themes/admin/ui/search/results.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/search/results.html.twig
@@ -41,7 +41,7 @@
             {% for result in results %}
                 {% set body_row_cols = [] %}
                 {% set col_raw %}
-                    <svg class="ibexa-icon ibexa-icon--small">
+                    <svg class="ibexa-icon ibexa-icon--small-medium">
                         <use xlink:href="{{ ibexa_content_type_icon(result.content_type.identifier) }}"></use>
                     </svg>
                 {% endset %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/tag.html.twig b/src/bundle/Resources/views/themes/admin/ui/tag.html.twig
index 303d4fa3a9..ef899db4ea 100644
--- a/src/bundle/Resources/views/themes/admin/ui/tag.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/tag.html.twig
@@ -12,7 +12,7 @@
         }) }}
     </div>
     <div class="ibexa-tag__spinner" {% if not is_loading_state %} hidden {% endif %}>
-        <svg class="ibexa-icon ibexa-icon--small ibexa-spin">
+        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-spin">
             <use xlink:href="{{ ibexa_icon_path('spinner') }}"></use>
         </svg>
     </div>
diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig
index df7390fd8c..46587e9484 100644
--- a/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig
@@ -68,7 +68,7 @@
                     class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                     title="{{ 'url_wildcard.action.edit'|trans|desc('Edit') }}"
                 >
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                         <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                     </svg>
                 </a>
@@ -77,7 +77,7 @@
                     class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                     disabled
                 >
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                         <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                     </svg>
                 </span>
@@ -118,7 +118,7 @@
                         data-bs-toggle="modal"
                         data-bs-target="#{{ modal_create_data_target }}"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                             <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
                         </svg>
                         <span class="ibexa-btn__label">
@@ -134,7 +134,7 @@
                         data-bs-target="#{{ modal_delete_data_target }}"
                         title="{{ 'url_wildcard.list.action.delete_url_wildcards'|trans|desc('Delete URL wildcards') }}"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                             <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                         </svg>
                         <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig
index 5ae3579180..9765292517 100644
--- a/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig
+++ b/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig
@@ -33,7 +33,7 @@
                 </label>
                 {{ form_widget(form.forward) }}
                 <small class="ibexa-form-help">
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-form-help__icon">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-help__icon">
                         <use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>
                     </svg>
                     <span class="ibexa-custom-url-from__helper-text">
diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig
index a594103b62..69b4d2d3cc 100644
--- a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig
+++ b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig
@@ -46,7 +46,7 @@
                             <label class="ibexa-label">{{ 'url_wildcard.modal.create.redirect'|trans|desc('Redirect to wildcard destination') }}</label>
                             {{ form_widget(form.forward) }}
                             <small class="ibexa-form-help">
-                                <svg class="ibexa-icon ibexa-icon--small ibexa-form-help__icon">
+                                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-help__icon">
                                     <use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>
                                 </svg>
                                 <span class="ibexa-custom-url-from__helper-text">
diff --git a/src/bundle/Resources/views/themes/admin/user/invitation/issue_duplicate.html.twig b/src/bundle/Resources/views/themes/admin/user/invitation/issue_duplicate.html.twig
index 9c6691af68..b85614ee07 100644
--- a/src/bundle/Resources/views/themes/admin/user/invitation/issue_duplicate.html.twig
+++ b/src/bundle/Resources/views/themes/admin/user/invitation/issue_duplicate.html.twig
@@ -1,7 +1,7 @@
 {% trans_default_domain 'ibexa_user_invitation' %}
 
 <small class="ibexa-form-help ibexa-user-invitation-modal__issue-duplicate">
-    <svg class="ibexa-icon ibexa-icon--small ibexa-form-help__icon">
+    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-help__icon">
         <use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>
     </svg>
     {{ 'modal.issue.entry.deuplicate.merged'|trans|desc('Merged') }}
diff --git a/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_empty.html.twig b/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_empty.html.twig
index 6125c82d0f..a7f30f5e51 100644
--- a/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_empty.html.twig
+++ b/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_empty.html.twig
@@ -1,7 +1,7 @@
 {% trans_default_domain 'ibexa_user_invitation' %}
 
 <em class="ibexa-form-error__row ibexa-user-invitation-modal__issue-email-empty">
-    <svg class="ibexa-icon ibexa-icon--small ibexa-form-error__icon">
+    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-error__icon">
         <use xlink:href="{{ ibexa_icon_path('notice') }}"></use>
     </svg>
     {{ 'modal.issue.email.empty.message'|trans|desc('Email cannot be empty') }}
diff --git a/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_not_valid.html.twig b/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_not_valid.html.twig
index c41501bd80..a1c8b3db1c 100644
--- a/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_not_valid.html.twig
+++ b/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_not_valid.html.twig
@@ -1,7 +1,7 @@
 {% trans_default_domain 'ibexa_user_invitation' %}
 
 <em class="ibexa-form-error__row ibexa-user-invitation-modal__issue-email-invalid-format">
-    <svg class="ibexa-icon ibexa-icon--small ibexa-form-error__icon">
+    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-error__icon">
         <use xlink:href="{{ ibexa_icon_path('notice') }}"></use>
     </svg>
     {{ 'modal.issue.email.invalid.message'|trans|desc('Invalid email format') }}
diff --git a/src/bundle/Resources/views/themes/admin/user/invitation/modal.html.twig b/src/bundle/Resources/views/themes/admin/user/invitation/modal.html.twig
index 5fa11655ef..6caaa12d75 100644
--- a/src/bundle/Resources/views/themes/admin/user/invitation/modal.html.twig
+++ b/src/bundle/Resources/views/themes/admin/user/invitation/modal.html.twig
@@ -114,7 +114,7 @@
                     type="button"
                     class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small ibexa-user-invitation-modal__add-next-btn"
                 >
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                         <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
                     </svg>
                     <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/user/invitation/modal_entry.html.twig b/src/bundle/Resources/views/themes/admin/user/invitation/modal_entry.html.twig
index d9a377701a..130aa538dd 100644
--- a/src/bundle/Resources/views/themes/admin/user/invitation/modal_entry.html.twig
+++ b/src/bundle/Resources/views/themes/admin/user/invitation/modal_entry.html.twig
@@ -4,7 +4,7 @@
         type="button"
         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ibexa-user-invitation-modal__entry-delete-btn"
     >
-        <svg class="ibexa-icon ibexa-icon--small">
+        <svg class="ibexa-icon ibexa-icon--small-medium">
             <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
         </svg>
     </button>
diff --git a/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig b/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig
index 56362da115..ef84ce84a7 100644
--- a/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig
@@ -58,7 +58,7 @@
                     href="{{ path('ibexa.policy.update', { roleId: role.id, policyId: policy.id }) }}"
                     class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text{{ not is_editable[policy.id] ? ' disabled' : '' }}"
                 >
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
                         <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                     </svg>
                 </a>
@@ -94,7 +94,7 @@
                             href="{{ path('ibexa.policy.create', {roleId: role.id}) }}"
                             class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small"
                         >
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                                 <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
                             </svg>
                             <span class="ibexa-btn__label">
@@ -110,7 +110,7 @@
                             data-bs-toggle="modal"
                             data-bs-target="#{{ modal_data_target }}"
                         >
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                                 <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                             </svg>
                             <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/user/role/list.html.twig b/src/bundle/Resources/views/themes/admin/user/role/list.html.twig
index b8d504a2eb..8935a9ff24 100644
--- a/src/bundle/Resources/views/themes/admin/user/role/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/user/role/list.html.twig
@@ -29,7 +29,7 @@
                     href="{{ path('ibexa.role.create') }}"
                     class="btn ibexa-btn ibexa-btn--primary"
                 >
-                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                    <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--create">
                         <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
                     </svg>
                     <span class="ibexa-btn__label">
@@ -74,7 +74,7 @@
                         href="{{ path('ibexa.role_assignment.create', { roleId: role.id }) }}"
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('assign-user') }}"></use>
                         </svg>
                     </a>
@@ -85,7 +85,7 @@
                         href="{{ path('ibexa.role.copy', { roleId: role.id }) }}"
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('copy') }}"></use>
                         </svg>
                     </a>
@@ -96,7 +96,7 @@
                         href="{{ path('ibexa.role.update', { roleId: role.id }) }}"
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small">
+                        <svg class="ibexa-icon ibexa-icon--small-medium">
                             <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                         </svg>
                     </a>
@@ -134,7 +134,7 @@
                                 data-bs-toggle="modal"
                                 data-bs-target="#{{ modal_data_target }}"
                             >
-                                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                                <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                                     <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                                 </svg>
                                 <span class="ibexa-btn__label">
diff --git a/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig b/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig
index 619432af8f..284d25d046 100644
--- a/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig
@@ -77,7 +77,7 @@
                         <a
                             href="{{ path('ibexa.role_assignment.create', {roleId: role.id}) }}"
                             class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small">
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--relations">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--relations">
                                 <use xlink:href="{{ ibexa_icon_path('assign-user') }}"></use>
                             </svg>
                             <span class="ibexa-btn__label">
@@ -93,7 +93,7 @@
                             data-bs-toggle="modal"
                             data-bs-target="#{{ modal_data_target }}"
                         >
-                            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--trash">
                                 <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
                             </svg>
                             <span class="ibexa-btn__label">
diff --git a/src/bundle/ui-dev/src/modules/common/alert/alert.js b/src/bundle/ui-dev/src/modules/common/alert/alert.js
index 71b4fb7283..9f2a80ac0a 100644
--- a/src/bundle/ui-dev/src/modules/common/alert/alert.js
+++ b/src/bundle/ui-dev/src/modules/common/alert/alert.js
@@ -44,7 +44,7 @@ const Alert = ({
 
     return (
         <div className={className} role="alert">
-            <Icon name={iconName} customPath={iconPath} extraClasses="ibexa-icon--small ibexa-alert__icon" />
+            <Icon name={iconName} customPath={iconPath} extraClasses="ibexa-icon--small-medium ibexa-alert__icon" />
             <div className={contentClassName}>
                 {title && <div className="ibexa-alert__title">{title}</div>}
                 {subtitle && <div className="ibexa-alert__subtitle">{subtitle}</div>}
diff --git a/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js b/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
index de76a93cb9..9d545b8e2d 100644
--- a/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
+++ b/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
@@ -147,7 +147,7 @@ const Dropdown = ({
                                 className="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ibexa-input-text-wrapper__action-btn ibexa-input-text-wrapper__action-btn--search"
                                 tabIndex="-1"
                             >
-                                <Icon name="search" extraClasses="ibexa-icon--small" />
+                                <Icon name="search" extraClasses="ibexa-icon--small-medium" />
                             </button>
                         </div>
                     </div>
diff --git a/src/bundle/ui-dev/src/modules/common/popup-menu/popup.menu.search.js b/src/bundle/ui-dev/src/modules/common/popup-menu/popup.menu.search.js
index 18eee941e8..8676643b2a 100644
--- a/src/bundle/ui-dev/src/modules/common/popup-menu/popup.menu.search.js
+++ b/src/bundle/ui-dev/src/modules/common/popup-menu/popup.menu.search.js
@@ -41,7 +41,7 @@ const PopupMenuSearch = ({ numberOfItems, filterText = '', setFilterText }) => {
                             className="btn ibexa-input-text-wrapper__action-btn ibexa-input-text-wrapper__action-btn--search"
                             tabIndex="-1"
                         >
-                            <Icon name="search" extraClasses="ibexa-icon--small" />
+                            <Icon name="search" extraClasses="ibexa-icon--small-medium" />
                         </button>
                     </div>
                 </div>
diff --git a/src/bundle/ui-dev/src/modules/common/popup/popup.component.js b/src/bundle/ui-dev/src/modules/common/popup/popup.component.js
index 206413b0ef..c13a4b0eef 100644
--- a/src/bundle/ui-dev/src/modules/common/popup/popup.component.js
+++ b/src/bundle/ui-dev/src/modules/common/popup/popup.component.js
@@ -110,7 +110,7 @@ const Popup = ({
                 aria-label={closeBtnLabel}
                 onClick={hidePopup}
             >
-                <Icon name="discard" extraClasses="ibexa-icon--small" />
+                <Icon name="discard" extraClasses="ibexa-icon--small-medium" />
             </button>
         );
     };
diff --git a/src/bundle/ui-dev/src/modules/common/simple-dropdown/simple.dropdown.js b/src/bundle/ui-dev/src/modules/common/simple-dropdown/simple.dropdown.js
index 347e8dfec9..ded92e0d16 100644
--- a/src/bundle/ui-dev/src/modules/common/simple-dropdown/simple.dropdown.js
+++ b/src/bundle/ui-dev/src/modules/common/simple-dropdown/simple.dropdown.js
@@ -47,7 +47,9 @@ const SimpleDropdown = ({
 
         return (
             <li key={item.value} className={itemClass} onClick={() => onOptionClickWrapper(item)}>
-                {item.iconName && <Icon name={item.iconName} extraClasses="c-simple-dropdown__list-item-type-icon ibexa-icon--small" />}
+                {item.iconName && (
+                    <Icon name={item.iconName} extraClasses="c-simple-dropdown__list-item-type-icon ibexa-icon--small-medium" />
+                )}
                 <span>{item.label ?? item.getLabel()}</span>
                 {isItemSelected && (
                     <div className="c-simple-dropdown__list-item-checkmark">
@@ -78,7 +80,7 @@ const SimpleDropdown = ({
             return null;
         }
 
-        return <Icon name={selectedOption.iconName} extraClasses="ibexa-icon--small c-simple-dropdown__selected-item-type-icon" />;
+        return <Icon name={selectedOption.iconName} extraClasses="ibexa-icon--small-medium c-simple-dropdown__selected-item-type-icon" />;
     };
     const renderSelectedItem = () => {
         return (
diff --git a/src/bundle/ui-dev/src/modules/common/tag/tag.js b/src/bundle/ui-dev/src/modules/common/tag/tag.js
index 443ac67d60..16eac4855a 100644
--- a/src/bundle/ui-dev/src/modules/common/tag/tag.js
+++ b/src/bundle/ui-dev/src/modules/common/tag/tag.js
@@ -14,7 +14,7 @@ const Tag = ({ content, onRemove = () => {}, isDeletable = true, extraClasses =
         <div className={className}>
             <div className="ibexa-tag__content">{content}</div>
             <button type="button" className="ibexa-tag__remove-btn" onClick={onRemove}>
-                <Icon name="circle-close" extraClasses="ibexa-icon--small" />
+                <Icon name="circle-close" extraClasses="ibexa-icon--small-medium" />
             </button>
         </div>
     );
diff --git a/src/bundle/ui-dev/src/modules/common/thumbnail/thumbnail.tsx b/src/bundle/ui-dev/src/modules/common/thumbnail/thumbnail.tsx
index fee90912dd..ee7932b707 100644
--- a/src/bundle/ui-dev/src/modules/common/thumbnail/thumbnail.tsx
+++ b/src/bundle/ui-dev/src/modules/common/thumbnail/thumbnail.tsx
@@ -11,7 +11,7 @@ const Thumbnail = ({ thumbnailData, iconExtraClasses, contentTypeIconPath }: Thu
 
         return (
             <div className="c-thumbnail__icon-wrapper">
-                <Icon customPath={contentTypeIconPath} extraClasses="ibexa-icon--small" />
+                <Icon customPath={contentTypeIconPath} extraClasses="ibexa-icon--small-medium" />
             </div>
         );
     };
diff --git a/src/bundle/ui-dev/src/modules/content-tree/components/header/header.js b/src/bundle/ui-dev/src/modules/content-tree/components/header/header.js
index 64d7dab1b3..f7a88f75f0 100644
--- a/src/bundle/ui-dev/src/modules/content-tree/components/header/header.js
+++ b/src/bundle/ui-dev/src/modules/content-tree/components/header/header.js
@@ -13,7 +13,7 @@ const Header = ({ isCollapsed, toggleCollapseTree, actions, popupRef }) => {
         const iconName = isCollapsed ? 'caret-next' : 'caret-back';
         const caretIconClass = createCssClassNames({
             'ibexa-icon--tiny': isCollapsed,
-            'ibexa-icon--small': !isCollapsed,
+            'ibexa-icon--small-medium': !isCollapsed,
         });
 
         return (
@@ -22,7 +22,7 @@ const Header = ({ isCollapsed, toggleCollapseTree, actions, popupRef }) => {
                 className="ibexa-btn btn ibexa-btn--no-text ibexa-btn--tertiary c-header__toggle-btn"
                 onClick={toggleCollapseTree}
             >
-                {isCollapsed && <Icon name="content-tree" extraClasses="ibexa-icon--small" />}
+                {isCollapsed && <Icon name="content-tree" extraClasses="ibexa-icon--small-medium" />}
                 <Icon name={iconName} extraClasses={caretIconClass} />
             </button>
         );
@@ -36,7 +36,7 @@ const Header = ({ isCollapsed, toggleCollapseTree, actions, popupRef }) => {
         <div className="c-header">
             {renderCollapseButton()}
             <div className="c-header__name">
-                <Icon name="content-tree" extraClasses="ibexa-icon--small" />
+                <Icon name="content-tree" extraClasses="ibexa-icon--small-medium" />
                 {headerTitle}
             </div>
             <div className="c-header__options">
diff --git a/src/bundle/ui-dev/src/modules/content-tree/components/list-item/list.item.component.js b/src/bundle/ui-dev/src/modules/content-tree/components/list-item/list.item.component.js
index 2027df3799..37e16a2004 100644
--- a/src/bundle/ui-dev/src/modules/content-tree/components/list-item/list.item.component.js
+++ b/src/bundle/ui-dev/src/modules/content-tree/components/list-item/list.item.component.js
@@ -124,7 +124,7 @@ class ListItem extends Component {
     renderIcon() {
         const { contentTypeIdentifier, locationId } = this.props;
         const iconAttrs = {
-            extraClasses: 'ibexa-icon--small ibexa-icon--dark',
+            extraClasses: 'ibexa-icon--small-medium ibexa-icon--dark',
         };
 
         if (!this.state.isLoading || this.props.subitems.length) {
@@ -161,7 +161,7 @@ class ListItem extends Component {
         let loadingSpinner = null;
 
         if (isLoading) {
-            loadingSpinner = <Icon name="spinner" extraClasses="ibexa-spin ibexa-icon--small c-list-item__load-more-btn-spinner" />;
+            loadingSpinner = <Icon name="spinner" extraClasses="ibexa-spin ibexa-icon--small-medium c-list-item__load-more-btn-spinner" />;
         }
 
         return (
@@ -217,7 +217,7 @@ class ListItem extends Component {
                     {this.renderIcon()}
                     <span className="c-list-item__label-content" title={name}>
                         {name}
-                        {isInvisible && <Icon name="view-hide" extraClasses="ibexa-icon--small c-list-item__hidden-icon" />}
+                        {isInvisible && <Icon name="view-hide" extraClasses="ibexa-icon--small-medium c-list-item__hidden-icon" />}
                     </span>
                 </a>
                 <div className="c-list-item__actions">
diff --git a/src/bundle/ui-dev/src/modules/content-tree/components/popup-actions/popup.actions.js b/src/bundle/ui-dev/src/modules/content-tree/components/popup-actions/popup.actions.js
index 8ba70d7104..8846447869 100644
--- a/src/bundle/ui-dev/src/modules/content-tree/components/popup-actions/popup.actions.js
+++ b/src/bundle/ui-dev/src/modules/content-tree/components/popup-actions/popup.actions.js
@@ -72,7 +72,7 @@ const PopupActions = ({ listRef, options }) => {
     return (
         <>
             <div className="c-popup-actions" ref={containerRef} onClick={toggleExpanded}>
-                <Icon name="options" extraClasses="ibexa-icon--small" />
+                <Icon name="options" extraClasses="ibexa-icon--small-medium" />
             </div>
             {isExpanded && ReactDOM.createPortal(renderItemsList(), listRef.current)}
         </>
diff --git a/src/bundle/ui-dev/src/modules/multi-file-upload/components/drop-area/drop.area.component.js b/src/bundle/ui-dev/src/modules/multi-file-upload/components/drop-area/drop.area.component.js
index dfb4858ade..3b53170de3 100644
--- a/src/bundle/ui-dev/src/modules/multi-file-upload/components/drop-area/drop.area.component.js
+++ b/src/bundle/ui-dev/src/modules/multi-file-upload/components/drop-area/drop.area.component.js
@@ -59,7 +59,7 @@ export default class DropAreaComponent extends Component {
 
         return (
             <li className="c-drop-area__max-file-size-item">
-                <Icon name="about-info" extraClasses="c-drop-area__max-file-size-icon ibexa-icon--small" />
+                <Icon name="about-info" extraClasses="c-drop-area__max-file-size-icon ibexa-icon--small-medium" />
                 {Translator.trans(/* @Desc("Max. file size") */ 'max_file_size.message.general', {}, 'ibexa_multi_file_upload')}
                 <button
                     type="button"
@@ -85,7 +85,7 @@ export default class DropAreaComponent extends Component {
                     return (
                         <li key={itemKey} className="c-drop-area__max-file-size-item">
                             {!this.hasMultiMsgForFileSizes && (
-                                <Icon name="about-info" extraClasses="c-drop-area__max-file-size-icon ibexa-icon--small" />
+                                <Icon name="about-info" extraClasses="c-drop-area__max-file-size-icon ibexa-icon--small-medium" />
                             )}
                             {Translator.trans(
                                 /* @Desc("%contentTypeName% max file size: %maxFileSize%") */ 'max_file_size.message',
diff --git a/src/bundle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.item.component.js b/src/bundle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.item.component.js
index 0f92612da5..d3528a8e64 100644
--- a/src/bundle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.item.component.js
+++ b/src/bundle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.item.component.js
@@ -263,10 +263,10 @@ export default class UploadItemComponent extends Component {
         const [, iconName] = contentTypeIconUrl.split('#');
 
         if (this.isExternalInstance) {
-            return <Icon name={iconName} extraClasses="ibexa-icon--small" defaultIconName="file" />;
+            return <Icon name={iconName} extraClasses="ibexa-icon--small-medium" defaultIconName="file" />;
         }
 
-        return <Icon customPath={contentTypeIconUrl} extraClasses="ibexa-icon--small" />;
+        return <Icon customPath={contentTypeIconUrl} extraClasses="ibexa-icon--small-medium" />;
     }
 
     renderProgressBar() {
@@ -349,7 +349,7 @@ export default class UploadItemComponent extends Component {
                 tabIndex="-1"
                 type="button"
             >
-                <Icon name="trash" extraClasses="ibexa-icon--small" />
+                <Icon name="trash" extraClasses="ibexa-icon--small-medium" />
             </button>
         );
     }
@@ -392,7 +392,7 @@ export default class UploadItemComponent extends Component {
                 type="button"
                 disabled={!struct}
             >
-                <Icon name="edit" extraClasses="ibexa-icon--small" />
+                <Icon name="edit" extraClasses="ibexa-icon--small-medium" />
             </button>
         );
     }
@@ -417,7 +417,7 @@ export default class UploadItemComponent extends Component {
                 type="button"
                 disabled={!(struct || failed)}
             >
-                <Icon name="trash" extraClasses="ibexa-icon--small" />
+                <Icon name="trash" extraClasses="ibexa-icon--small-medium" />
             </button>
         );
     }
diff --git a/src/bundle/ui-dev/src/modules/multi-file-upload/multi.file.upload.module.js b/src/bundle/ui-dev/src/modules/multi-file-upload/multi.file.upload.module.js
index 1ad10737be..e521545ec7 100644
--- a/src/bundle/ui-dev/src/modules/multi-file-upload/multi.file.upload.module.js
+++ b/src/bundle/ui-dev/src/modules/multi-file-upload/multi.file.upload.module.js
@@ -168,7 +168,7 @@ export default class MultiFileUploadModule extends Component {
         });
         return (
             <button type="button" className={buttonClassName} onClick={this.showUploadPopup} disabled={uploadDisabled}>
-                <Icon name="upload" extraClasses="ibexa-icon--small" /> {label}
+                <Icon name="upload" extraClasses="ibexa-icon--small-medium" /> {label}
             </button>
         );
     }
diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/action-btn/action.btn.js b/src/bundle/ui-dev/src/modules/sub-items/components/action-btn/action.btn.js
index f5ce7da417..3c2867e9d3 100644
--- a/src/bundle/ui-dev/src/modules/sub-items/components/action-btn/action.btn.js
+++ b/src/bundle/ui-dev/src/modules/sub-items/components/action-btn/action.btn.js
@@ -19,7 +19,7 @@ const ActionButton = ({ disabled, onClick, label = null, title = null, type }) =
 
     return (
         <button type="button" className={className} title={title} onClick={handleClick} disabled={disabled}>
-            <Icon name={type} extraClasses="ibexa-icon--small" /> {label}
+            <Icon name={type} extraClasses="ibexa-icon--small-medium" /> {label}
         </button>
     );
 };
diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/grid-view/grid.view.item.component.js b/src/bundle/ui-dev/src/modules/sub-items/components/grid-view/grid.view.item.component.js
index 5d09c8a97d..ddecda18cf 100644
--- a/src/bundle/ui-dev/src/modules/sub-items/components/grid-view/grid.view.item.component.js
+++ b/src/bundle/ui-dev/src/modules/sub-items/components/grid-view/grid.view.item.component.js
@@ -35,7 +35,7 @@ const GridViewItemComponent = ({ item, generateLink }) => {
                     {contentInfo.ContentInfo.name}
                 </div>
                 <div className="ibexa-grid-view-item__detail-a">
-                    <Icon customPath={contentTypeIconUrl} extraClasses="ibexa-icon--small" />
+                    <Icon customPath={contentTypeIconUrl} extraClasses="ibexa-icon--small-medium" />
                     {contentTypeName}
                 </div>
             </div>
diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js b/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js
index 0eb83b6d11..76087cc155 100644
--- a/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js
+++ b/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js
@@ -180,7 +180,7 @@ export default class TableViewItemComponent extends PureComponent {
 
         return (
             <span className="c-table-view-item__icon-with-name-wrapper">
-                <Icon customPath={contentTypeIconUrl} extraClasses="ibexa-icon--small" />
+                <Icon customPath={contentTypeIconUrl} extraClasses="ibexa-icon--small-medium" />
                 <a {...linkAttrs}>{contentName}</a>
             </span>
         );
@@ -224,14 +224,14 @@ export default class TableViewItemComponent extends PureComponent {
                         className="btn ibexa-btn ibexa-btn--primary ibexa-btn--no-text ibexa-btn--small c-table-view-item__btn c-table-view-item__btn--submit"
                         onClick={this.handleSubmit}
                     >
-                        <Icon name="checkmark" extraClasses="ibexa-icon--small" />
+                        <Icon name="checkmark" extraClasses="ibexa-icon--small-medium" />
                     </button>
                     <button
                         type="button"
                         className="btn ibexa-btn ibexa-btn--secondary ibexa-btn--no-text ibexa-btn--small"
                         onClick={this.handleCancel}
                     >
-                        <Icon name="discard" extraClasses="ibexa-icon--small" />
+                        <Icon name="discard" extraClasses="ibexa-icon--small-medium" />
                     </button>
                 </div>
             </div>
diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.js b/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.js
index 92d4e501b7..233618a5fa 100644
--- a/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.js
+++ b/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.js
@@ -126,7 +126,7 @@ export default class ViewColumnsTogglerComponent extends Component {
 
         return (
             <button ref={this._refTogglerButton} type="button" className="c-simple-dropdown__selected" onClick={this.togglePanel}>
-                <Icon name="column-settings" extraClasses="ibexa-icon--small c-simple-dropdown__selected-item-type-icon" />
+                <Icon name="column-settings" extraClasses="ibexa-icon--small-medium c-simple-dropdown__selected-item-type-icon" />
                 <span className="c-simple-dropdown__selected-item-label">{label}</span>
                 {this.renderCaretIcon()}
             </button>
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/bookmarks-list/bookmarks.list.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/bookmarks-list/bookmarks.list.js
index 445532129e..e4052aca2a 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/bookmarks-list/bookmarks.list.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/bookmarks-list/bookmarks.list.js
@@ -144,7 +144,7 @@ const BookmarksList = ({ setBookmarkedLocationMarked, itemsPerPage = 50 }) => {
 
                 return (
                     <div key={bookmark.id} className={className} onClick={markLocation}>
-                        <Icon extraClasses="ibexa-icon--small" customPath={contentTypeInfo.thumbnail} />
+                        <Icon extraClasses="ibexa-icon--small-medium" customPath={contentTypeInfo.thumbnail} />
                         <span
                             title={bookmark.ContentInfo.Content.TranslatedName}
                             data-tooltip-container-selector=".c-bookmarks-list"
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-button/content.create.button.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-button/content.create.button.js
index 734660cc09..5b16b0df8f 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-button/content.create.button.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-button/content.create.button.js
@@ -58,7 +58,7 @@ const ContentCreateButton = ({ isDisabled = false }) => {
                 onClick={toggleContentCreateVisibility}
                 type="button"
             >
-                <Icon name="create" extraClasses="ibexa-icon--small" />
+                <Icon name="create" extraClasses="ibexa-icon--small-medium" />
                 <span className="ibexa-btn__label">{createLabel}</span>
             </button>
         </div>
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js
index 1dee8d4878..0d2615d30c 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js
@@ -241,7 +241,7 @@ const ContentCreateWidget = () => {
 
                                             return (
                                                 <div key={identifier} className={className} onClick={updateSelectedContentType}>
-                                                    <Icon customPath={thumbnail} extraClasses="ibexa-icon--small" />
+                                                    <Icon customPath={thumbnail} extraClasses="ibexa-icon--small-medium" />
                                                     <div className="form-check">
                                                         <div className="ibexa-label ibexa-label--checkbox-radio form-check-label">
                                                             {name}
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-edit-button/content.edit.button.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-edit-button/content.edit.button.js
index 5345c186e8..cb51c73aad 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-edit-button/content.edit.button.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-edit-button/content.edit.button.js
@@ -119,7 +119,7 @@ const ContentEditButton = ({ version, location, isDisabled, label = null }) => {
                 data-tooltip-container-selector=".c-udw-tab"
                 type="button"
             >
-                <Icon name="edit" extraClasses="ibexa-icon--small" />
+                <Icon name="edit" extraClasses="ibexa-icon--small-medium" />
                 {label}
             </button>
             {renderTranslationSelector()}
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-table/content.table.item.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-table/content.table.item.js
index 181a45e1aa..de9a73a3d4 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-table/content.table.item.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-table/content.table.item.js
@@ -97,7 +97,7 @@ const ContentTableItem = ({ location }) => {
         <tr className={className} onClick={markLocation}>
             {multiple && <td className="ibexa-table__cell ibexa-table__cell--has-checkbox">{renderToggleSelection()}</td>}
             <td className="ibexa-table__cell c-content-table-item__icon-wrapper">
-                <Icon extraClasses="ibexa-icon--small" customPath={contentTypeInfo.thumbnail} />
+                <Icon extraClasses="ibexa-icon--small-medium" customPath={contentTypeInfo.thumbnail} />
             </td>
             <td className="ibexa-table__cell">{location.ContentInfo.Content.TranslatedName}</td>
             <td className="ibexa-table__cell">{formatShortDateTime(new Date(location.ContentInfo.Content.lastModificationDate))}</td>
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.branch.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.branch.js
index 4ea83e866c..47d7673f40 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.branch.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.branch.js
@@ -94,7 +94,7 @@ const FinderBranch = ({ locationData, itemsPerPage = 50 }) => {
         return (
             <div className="c-finder-branch__info-wrapper">
                 <span className="c-finder-branch__icon-wrapper">
-                    <Icon extraClasses="ibexa-icon--small" customPath={iconPath} />
+                    <Icon extraClasses="ibexa-icon--small-medium" customPath={iconPath} />
                 </span>
                 <span className="c-finder-branch__name">{contentName}</span>
             </div>
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.leaf.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.leaf.js
index 66e1a67c79..a492b4b2a0 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.leaf.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/finder/finder.leaf.js
@@ -78,14 +78,14 @@ const FinderLeaf = ({ location }) => {
             <span className="c-finder-leaf__name">
                 <span className="c-finder-leaf__icon-wrapper">
                     <Icon
-                        extraClasses="ibexa-icon--small ibexa-icon--base-dark"
+                        extraClasses="ibexa-icon--small-medium ibexa-icon--base-dark"
                         customPath={contentTypesMap[location.ContentInfo.Content.ContentType._href].thumbnail}
                     />
                 </span>
                 <span title={location.ContentInfo.Content.TranslatedName} data-tooltip-container-selector=".c-udw-tab">
                     {location.ContentInfo.Content.TranslatedName}
                 </span>
-                {location.hidden && <Icon name="view-hide" extraClasses="ibexa-icon--small c-finder-leaf__hidden-icon" />}
+                {location.hidden && <Icon name="view-hide" extraClasses="ibexa-icon--small-medium c-finder-leaf__hidden-icon" />}
             </span>
         </div>
     );
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/grid-view/grid.view.item.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/grid-view/grid.view.item.js
index da5647e355..3c74bb4c45 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/grid-view/grid.view.item.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/grid-view/grid.view.item.js
@@ -93,7 +93,7 @@ const GridViewItem = ({ location, version = {} }) => {
             <div className="ibexa-grid-view-item__footer">
                 <div className="ibexa-grid-view-item__title" title={location.ContentInfo.Content.TranslatedName}>
                     {location.ContentInfo.Content.TranslatedName}
-                    {location.hidden && <Icon name="view-hide" extraClasses="ibexa-icon--small ibexa-grid-view-item__hidden-icon" />}
+                    {location.hidden && <Icon name="view-hide" extraClasses="ibexa-icon--small-medium ibexa-grid-view-item__hidden-icon" />}
                 </div>
             </div>
             {renderToggleSelection()}
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-items/selected.items.panel.item.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-items/selected.items.panel.item.js
index 8718b678d6..b671a4e346 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-items/selected.items.panel.item.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-items/selected.items.panel.item.js
@@ -46,7 +46,7 @@ const SelectedItemsPanelItem = ({ item, thumbnailData, name, description, extraC
         >
             <div className="c-selected-items-panel-item__main-content">
                 <div className="c-selected-items-panel-item__image-wrapper">
-                    <Thumbnail thumbnailData={thumbnailData} iconExtraClasses="ibexa-icon--small" />
+                    <Thumbnail thumbnailData={thumbnailData} iconExtraClasses="ibexa-icon--small-medium" />
                 </div>
                 <div className="c-selected-items-panel-item__info">
                     <span className="c-selected-items-panel-item__info-name">{name}</span>
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.item.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.item.js
index 2c2ba6014c..918041fe03 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.item.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.item.js
@@ -50,7 +50,7 @@ const SelectedLocationsItem = ({ location, permissions }) => {
             }}
         >
             <div className="c-selected-locations-item__image-wrapper">
-                <Thumbnail thumbnailData={thumbnailData} iconExtraClasses="ibexa-icon--small" />
+                <Thumbnail thumbnailData={thumbnailData} iconExtraClasses="ibexa-icon--small-medium" />
             </div>
             <div className="c-selected-locations-item__info">
                 <span className="c-selected-locations-item__info-name">{location.ContentInfo.Content.TranslatedName}</span>
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/top-menu/top.menu.search.input.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/top-menu/top.menu.search.input.js
index 167a643fbe..cb0e94888c 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/top-menu/top.menu.search.input.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/top-menu/top.menu.search.input.js
@@ -67,7 +67,7 @@ const TopMenuSearchInput = ({ isSearchOpened, setIsSearchOpened }) => {
                 value={inputValue}
             />
             <button className={searchBtnClassName} type="button" onClick={handleSearchBtnClick}>
-                <Icon name="search" extraClasses="ibexa-icon--small" />
+                <Icon name="search" extraClasses="ibexa-icon--small-medium" />
             </button>
         </div>
     );
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js
index 72a962911e..4db4085754 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js
@@ -94,7 +94,7 @@ const ContentMetaPreview = () => {
                     type="button"
                     onClick={previewContent}
                 >
-                    <Icon name="view" extraClasses="ibexa-icon--small" />
+                    <Icon name="view" extraClasses="ibexa-icon--small-medium" />
                     {previewLabel}
                 </button>
             </div>
@@ -113,7 +113,7 @@ const ContentMetaPreview = () => {
                         type="button"
                         onClick={toggleBookmarked}
                     >
-                        <Icon name={bookmarkIconName} extraClasses="ibexa-icon--small" />
+                        <Icon name={bookmarkIconName} extraClasses="ibexa-icon--small-medium" />
                         {bookmarked ? bookmarksRemoveLabel : bookmarksAddLabel}
                     </button>
                 </div>