diff --git a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditor.xhtml b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditor.xhtml
index ce419aae6..fb2234dd0 100644
--- a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditor.xhtml
+++ b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditor.xhtml
@@ -455,7 +455,7 @@
                             type="button"
                         >
                             <!--bootstrap:svgIcon icon="blockquote-left" />-->
-                            <librecms:remixSvgIcon icon="ri-double-quote-l" />
+                            <librecms:remixSvgIcon icon="ri-double-quotes-l" />
                         </button>
                         <button
                             class="btn btn-outline-dark tiptap-codeblock"
@@ -463,7 +463,7 @@
                             type="button"
                         >                            
                             <!--<bootstrap:svgIcon icon="code-square" />-->
-                            <librecms:remixSvgIcon icon="ri-code-box" />
+                            <librecms:remixSvgIcon icon="ri-code-box-line" />
                         </button>
                     </div>
                     <div class="px-2 cms-tiptap-editor-button-row cms-tiptap-editor-lists">
@@ -581,11 +581,11 @@
                         </button>
                         <button
                             class="btn btn-outline-dark tiptap-insert-table-row-after"
-                            title="#{CmsAdminMessage['cms_editor.buttons.insert_table_row_after']}"
+                            title="#{CmsAdminMessages['cms_editor.buttons.insert_table_row_after']}"
                             type="button"
                         >
                             <!--<img src="#{request.contextPath}/icons/cms-editor/table-add-row-after.svg" />-->
-                            <librecms:remixSvgIcon icon="ri-insert-row-below" />
+                            <librecms:remixSvgIcon icon="ri-insert-row-bottom" />
                         </button>
                         <button
                             class="btn btn-outline-dark tiptap-table-remove-row"
@@ -596,7 +596,7 @@
                         </button>
                         <button
                             class="btn btn-outline-dark tiptap-insert-table-column-before"
-                            title="#{CmsAdminMessage['cms_editor.buttons.insert_table_column_before']}"
+                            title="#{CmsAdminMessages['cms_editor.buttons.insert_table_column_before']}"
                             type="button"
                         >
                             <!--<img src="#{request.contextPath}/icons/cms-editor/table-add-column-before.svg" />-->
@@ -616,7 +616,7 @@
                             type="button"
                         >
                             <!--<img src="#{request.contextPath}/icons/cms-editor/table-remove-column.svg" />-->
-                            <librecms:remixSvgIcon icon="ri-remove-column" />
+                            <librecms:remixSvgIcon icon="ri-delete-column" />
                         </button>
                         <button 
                             class="btn btn-outline-dark tiptap-toggle-table-header-row"