diff --git a/app/views/custom_styles/_primer_color_mapping.erb b/app/views/custom_styles/_primer_color_mapping.erb
index 60851cf43cb9..c179ea6691cf 100644
--- a/app/views/custom_styles/_primer_color_mapping.erb
+++ b/app/views/custom_styles/_primer_color_mapping.erb
@@ -14,6 +14,7 @@
     --control-checked-bgColor-active: var(--control-checked-color) !important;
     --control-checked-bgColor-hover: var(--control-checked-color--major1) !important;
     --controlKnob-borderColor-checked: var(--control-checked-color) !important;
+    --button-primary-fgColor-rest: var(--button--primary-font-color) !important;
     --button-primary-bgColor-rest: var(--button--primary-background-color) !important;
     --button-primary-bgColor-hover: var(--button--primary-background-hover-color) !important;
     --button-primary-bgColor-disabled: var(--button--primary-background-disabled-color) !important;
diff --git a/frontend/src/global_styles/content/_types_form_configuration.sass b/frontend/src/global_styles/content/_types_form_configuration.sass
index 3e9d0cb03834..80d6ec43156b 100644
--- a/frontend/src/global_styles/content/_types_form_configuration.sass
+++ b/frontend/src/global_styles/content/_types_form_configuration.sass
@@ -5,19 +5,21 @@
   margin-bottom: 20px
 
   .group-head
-    color: var(--font-color-on-primary-dark)
+    color: var(--fgColor-white)
     padding: 7px 4px 8px 0px
     text-transform: uppercase
     .group-handle
       cursor: -webkit-grab
       cursor: grab
-      color: var(--font-color-on-primary-dark)
+      color: var(--fgColor-white)
       font-size: 12px
     op-group-edit-in-place
       display: inline-block
+      .group-edit-in-place--input
+        color: var(--fgColor-white)
     .delete-group:before
       vertical-align: bottom
-      color: var(--font-color-on-primary-dark)
+      color: var(--fgColor-white)
   .attributes
     min-height: 29px
 
@@ -30,8 +32,7 @@
     &:hover
       cursor: text
       border-color: var(--inplace-edit--border-color)
-      background: white
-      color: #222222
+      background: var(--control-bgColor-activ)
 
   .delete-group,
   .delete-attribute
@@ -43,7 +44,7 @@
       border-color: var(--content-form-error-color)
     .group-handle,
     .delete-group:before
-      color: var(--font-color-on-primary)
+      color: var(--fgColor-white)
 
 
 #type-form-conf-inactive-group
diff --git a/frontend/src/global_styles/openproject/_variable_defaults.scss b/frontend/src/global_styles/openproject/_variable_defaults.scss
index cc01b5df658e..5d8c9802e15f 100644
--- a/frontend/src/global_styles/openproject/_variable_defaults.scss
+++ b/frontend/src/global_styles/openproject/_variable_defaults.scss
@@ -68,9 +68,6 @@
   --accent-color--minor2: #a3c2da;
   --accent-color--dark-mode: #4493f8;
   --font-color-on-primary: #FFFFFF;
-  --font-color-on-primary-dark: #FFFFFF;
-  --font-color-on-secondary: #FFFFFF;
-  --font-color-on-alternative: #FFFFFF;
   --list-side-margin: 40px;
   --header-height: 55px;
   --header-bg-color: #1A67A3;