diff --git a/resources/assets/javascripts/chunks/wysiwyg.js b/resources/assets/javascripts/chunks/wysiwyg.js
index b2d9987ea7ea65e17d2e8828678a5d6356ca6866..b5161b195376c2af9c8b3925a7d7ba8e8b814b29 100644
--- a/resources/assets/javascripts/chunks/wysiwyg.js
+++ b/resources/assets/javascripts/chunks/wysiwyg.js
@@ -179,7 +179,7 @@ ClassicEditor.defaultConfig = {
             '|',
             'sourceEditing',
         ],
-        shouldNotGroupWhenFull: false,
+        shouldNotGroupWhenFull: true,
     },
     fontColor: {
         colors: customColorPalette,
diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss
index 826f10641321751e25f005b54e9b251b969748b5..c83fc2fb17b480cf4bcb1584a979d5be09a43481 100644
--- a/resources/assets/stylesheets/scss/forms.scss
+++ b/resources/assets/stylesheets/scss/forms.scss
@@ -172,7 +172,6 @@ form.default {
         box-sizing: border-box;
         border: solid 1px $content-color-40;
         margin: 0 0 10px;
-        min-width: auto;
         padding: $gap 10px 10px;
 
         > legend {
diff --git a/resources/assets/stylesheets/scss/studip-cke-ui.scss b/resources/assets/stylesheets/scss/studip-cke-ui.scss
index 1ec725bd012955afae1900652e2826a11cf0ae66..65a29555276cfa1c6c0308948445fa9a1c61a4b2 100644
--- a/resources/assets/stylesheets/scss/studip-cke-ui.scss
+++ b/resources/assets/stylesheets/scss/studip-cke-ui.scss
@@ -68,8 +68,8 @@
 .ck.ck-icon, .ck.ck-icon * {
     color: var(--base-color);
 }
-.ck.ck-button.ck-on .ck.ck-icon,
-.ck.ck-button.ck-on .ck.ck-icon *,
+.ck.ck-button.ck-on:not(.ck-dropdown__button) .ck.ck-icon,
+.ck.ck-button.ck-on:not(.ck-dropdown__button) .ck.ck-icon *,
 .ck.ck-button:not(.ck-dropdown__button.ck-button_with-text):not(.ck-disabled):hover .ck.ck-icon,
 .ck.ck-button:not(.ck-dropdown__button.ck-button_with-text):not(.ck-disabled):hover .ck.ck-icon * {
     color: var(--white);
@@ -108,7 +108,9 @@
 .ck.ck-button.ck-off.ck-button_with-text:hover {
     background-color: var(--base-color);
 }
-.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover {
+.ck.ck-button.ck-on.ck-dropdown__button,
+.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover,
+a.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover {
     background-color: var(--white);
     color: var(--base-color);
 }
@@ -395,12 +397,6 @@ form.default .ck-source-editing-area textarea {
     max-width: calc(100% - 20px);
 }
 
-.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sw {
-    right: -5px;
-    top: calc(100% + 4px);
-}
-
-/* toolbar fix for dialogs */
 .studip-dialog {
     .ck-editor {
         overflow: hidden;
@@ -409,11 +405,3 @@ form.default .ck-source-editing-area textarea {
         }
     }
 }
-
-form.default textarea:not(.size-l) + .ck-editor {
-    .ck-toolbar__grouped-dropdown {
-        .ck-toolbar {
-            max-width: calc(48em - 2px);
-        }
-    }
-}