diff --git a/changelog/unreleased/enhancement-input-background-color b/changelog/unreleased/enhancement-input-background-color
new file mode 100644
index 000000000..a50c797e9
--- /dev/null
+++ b/changelog/unreleased/enhancement-input-background-color
@@ -0,0 +1,8 @@
+Enhancement: Input background color
+
+The background color for input fields has been adjusted to better match with the overall design.
+
+https://github.com/owncloud/web/issues/7353
+https://github.com/owncloud/web/issues/7373
+https://github.com/owncloud/owncloud-design-system/pull/2345
+https://github.com/owncloud/owncloud-design-system/pull/2352
diff --git a/changelog/unreleased/enhancement-remove-button-border b/changelog/unreleased/enhancement-remove-button-border
index 4f37037c6..b68c9131f 100644
--- a/changelog/unreleased/enhancement-remove-button-border
+++ b/changelog/unreleased/enhancement-remove-button-border
@@ -4,4 +4,5 @@ The outer border for buttons has been removed. Outline buttons now have an inner
 
 https://github.com/owncloud/web/issues/7353
 https://github.com/owncloud/web/issues/7373
-https://github.com/owncloud/owncloud-design-system/pull/7861
+https://github.com/owncloud/owncloud-design-system/pull/2345
+https://github.com/owncloud/owncloud-design-system/pull/2352
diff --git a/changelog/unreleased/enhancement-select-hover-state b/changelog/unreleased/enhancement-select-hover-state
deleted file mode 100644
index c6904a8a4..000000000
--- a/changelog/unreleased/enhancement-select-hover-state
+++ /dev/null
@@ -1,7 +0,0 @@
-Enhancement: Select hover state
-
-The hover state of the `OcSelect` component has been adjusted to better match with the overall design.
-
-https://github.com/owncloud/web/issues/7353
-https://github.com/owncloud/web/issues/7373
-https://github.com/owncloud/owncloud-design-system/pull/7861
diff --git a/src/components/atoms/OcButton/OcButton.vue b/src/components/atoms/OcButton/OcButton.vue
index dbb82bc04..ac4bbd6d2 100644
--- a/src/components/atoms/OcButton/OcButton.vue
+++ b/src/components/atoms/OcButton/OcButton.vue
@@ -262,7 +262,7 @@ export default {
   color: var(--oc-color-text-inverse);
   display: inline-flex;
   font-weight: 400;
-  padding: 0.4rem 0.7rem;
+  padding: 0.5rem 0.8rem;
   text-align: left;
   text-decoration: none;
 
@@ -428,11 +428,15 @@ export default {
   }
 
   &-group {
-    display: flex;
+    display: inline-flex;
     flex-flow: row wrap;
+    outline: 1px solid var(--oc-color-swatch-primary-default);
+    outline-offset: -1px;
+    border-radius: 5px;
 
     .oc-button {
       border-radius: 0;
+      outline: 0;
 
       &:first-of-type {
         border-radius: 5px 0 0 5px;
diff --git a/src/components/atoms/OcSelect/OcSelect.vue b/src/components/atoms/OcSelect/OcSelect.vue
index 457f25043..70f5a8088 100644
--- a/src/components/atoms/OcSelect/OcSelect.vue
+++ b/src/components/atoms/OcSelect/OcSelect.vue
@@ -164,7 +164,7 @@ export default {
     &__search::placeholder,
     &__dropdown-toggle,
     &__dropdown-menu {
-      background-color: var(--oc-color-background-secondary);
+      background-color: var(--oc-color-input-bg);
       border: 1px solid var(--oc-color-input-border);
       color: var(--oc-color-input-text-default);
     }
diff --git a/src/tokens/ods/color.yaml b/src/tokens/ods/color.yaml
index a96e0ee02..4296e9ae4 100644
--- a/src/tokens/ods/color.yaml
+++ b/src/tokens/ods/color.yaml
@@ -105,7 +105,7 @@ color:
     border:
       value: rgb(206, 221, 238)
     bg:
-      value: rgb(240, 244, 248)
+      value: rgb(255, 255, 255)
   icon:
     folder:
       value: rgb(44, 101, 255)