diff --git a/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js b/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js
index 02448d4..beff9e7 100644
--- a/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js
+++ b/src/bundle/Resources/public/js/scripts/admin.contenttype.matrix.js
@@ -3,8 +3,8 @@
     const SELECTOR_COLUMN = '.ibexa-matrix-settings__column';
     const SELECTOR_COLUMNS_CONTAINER = '.ibexa-table__body';
     const SELECTOR_COLUMN_CHECKBOX = '.ibexa-matrix-settings__column-checkbox';
-    const SELECTOR_ADD_COLUMN = '.ibexa-btn--add-column';
-    const SELECTOR_REMOVE_COLUMN = '.ibexa-btn--remove-column';
+    const SELECTOR_ADD_COLUMN = '.ids-btn--add-column';
+    const SELECTOR_REMOVE_COLUMN = '.ids-btn--remove-column';
     const SELECTOR_TEMPLATE = '.ibexa-matrix-settings__column-template';
     const ERROR_NODE_SELECTOR = '.ibexa-form-error';
     const NUMBER_PLACEHOLDER = /__number__/g;
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js
index 4bc8dbe..48411d6 100644
--- a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js
+++ b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_matrix.js
@@ -1,7 +1,7 @@
 (function (global, doc, ibexa) {
-    const SELECTOR_REMOVE_MATRIX_BULK = '.ibexa-btn--bulk-remove-matrix';
-    const SELECTOR_REMOVE_MATRIX_ENTRY = '.ibexa-btn--remove-matrix-entry';
-    const SELECTOR_ADD_MATRIX_ENTRY = '.ibexa-btn--add-matrix-entry';
+    const SELECTOR_REMOVE_MATRIX_BULK = '.ids-btn--bulk-remove-matrix';
+    const SELECTOR_REMOVE_MATRIX_ENTRY = '.ids-btn--remove-matrix-entry';
+    const SELECTOR_ADD_MATRIX_ENTRY = '.ids-btn--add-matrix-entry';
     const SELECTOR_MATRIX_ENTRIES_CONTAINER = '.ibexa-table__body';
     const SELECTOR_MATRIX_ENTRY_TEMPLATE = '.ibexa-data-source__entry-template';
     const SELECTOR_MATRIX_ENTRY_CHECKBOX = '.ibexa-table__ibexa_matrix-entry-checkbox';
diff --git a/src/bundle/Resources/public/scss/fieldType/_ibexa_matrix.scss b/src/bundle/Resources/public/scss/fieldType/_ibexa_matrix.scss
index e7bec44..a9e04af 100644
--- a/src/bundle/Resources/public/scss/fieldType/_ibexa_matrix.scss
+++ b/src/bundle/Resources/public/scss/fieldType/_ibexa_matrix.scss
@@ -18,7 +18,7 @@
     }
 
     .ibexa-table__cell {
-        .ibexa-btn--remove-matrix-entry {
+        .ids-btn--remove-matrix-entry {
             padding: calculateRem(4px);
         }
     }
diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig
index 131f0dd..16234c4 100644
--- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig
@@ -32,26 +32,26 @@
                 {% trans_default_domain 'ibexa_matrix_fieldtype' %}
 
                 {% block actions %}
-                    <button
-                        type="button"
-                        class="btn ibexa-btn ibexa-btn--secondary ibexa-btn--small ibexa-btn--add-matrix-entry"
-                        {{ readonly ? 'disabled' }}
+                    <twig:ibexa:button
+                        type="secondary"
+                        size="small"
+                        icon="add"
+                        icon_size="small-medium"
+                        :disabled="readonly"
+                        class="ids-btn--add-matrix-entry"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
-                            <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
-                        </svg>
-                        <span class="ibexa-btn__label">{{ 'ibexa_matrix.add'|trans|desc('Add') }}</span>
-                    </button>
-                    <button
-                        type="button"
-                        class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-btn--bulk-remove-matrix"
-                        {{ readonly ? 'disabled' }}
+                        {{ 'ibexa_matrix.add'|trans|desc('Add') }}
+                    </twig:ibexa:button>
+                    <twig:ibexa:button
+                        type="tertiary-alt"
+                        size="small"
+                        icon="trash"
+                        icon_size="small-medium"
+                        :disabled="readonly"
+                        class="ids-btn--bulk-remove-matrix"
                     >
-                        <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
-                            <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
-                        </svg>
-                        <span class="ibexa-btn__label">{{ 'ibexa_matrix.remove'|trans|desc('Delete') }}</span>
-                    </button>
+                        {{ 'ibexa_matrix.remove'|trans|desc('Delete') }}
+                    </twig:ibexa:button>
                 {% endblock %}
             {% endembed %}
         {% endblock %}
@@ -72,15 +72,14 @@
     {% endset %}
 
     {% set col_actions %}
-        <button
-            type="button"
-            class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ibexa-btn--remove-matrix-entry"
-            {{ readonly ? 'disabled' }}
-        >
-            <svg class="ibexa-icon ibexa-icon--small-medium ibexa-icon--edit">
-                <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
-            </svg>
-        </button>
+        <twig:ibexa:button
+            type="tertiary-alt"
+            icon="trash"
+            icon_size="small-medium"
+            :disabled="readonly"
+            title="{{ 'ibexa_matrix.remove_entry'|trans|desc('Remove') }}"
+            class="ids-btn--remove-matrix-entry"
+        />
     {% endset %}
 
     {% set body_row_cols = [{ has_checkbox: true, content: col_checkbox }] %}
diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig
index fddc43b..0503def 100644
--- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig
+++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig
@@ -73,22 +73,24 @@
                 {% embed '@ibexadesign/ui/component/table/table_header.html.twig' %}
                     {% trans_default_domain 'ibexa_matrix_fieldtype' %}
                     {% block actions %}
-                        <button type="button" class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small ibexa-btn--add-column">
-                            <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">
-                                {{ 'field.column.add_new'|trans|desc('Add') }}
-                            </span>
-                        </button>
-                        <button type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-btn--remove-column">
-                            <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">
-                                {{ 'field.column.delete'|trans|desc('Delete') }}
-                            </span>
-                        </button>
+                        <twig:ibexa:button
+                            type="tertiary"
+                            size="small"
+                            icon="add"
+                            icon_size="small-medium"
+                            class="ids-btn--add-column"
+                        >
+                            {{ 'field.column.add_new'|trans|desc('Add') }}
+                        </twig:ibexa:button>
+                        <twig:ibexa:button
+                            type="tertiary-alt"
+                            size="small"
+                            icon="trash"
+                            icon_size="small-medium"
+                            class="ids-btn--remove-column"
+                        >
+                            {{ 'field.column.delete'|trans|desc('Delete') }}
+                        </twig:ibexa:button>
                     {% endblock %}
                 {% endembed %}
             {% endblock %}