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
index c6904a8a4..fc9f76387 100644
--- a/changelog/unreleased/enhancement-select-hover-state
+++ b/changelog/unreleased/enhancement-select-hover-state
@@ -1,7 +1,8 @@
-Enhancement: Select hover state
+Enhancement: Background of OcInput and OcSelect
 
-The hover state of the `OcSelect` component has been adjusted to better match with the overall design.
+The background color of the `OcInput` and 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
+https://github.com/owncloud/owncloud-design-system/pull/2345
+https://github.com/owncloud/owncloud-design-system/pull/2352
diff --git a/src/components/atoms/OcButton/OcButton.vue b/src/components/atoms/OcButton/OcButton.vue
index dbb82bc04..c5296eaec 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;
 
diff --git a/src/components/molecules/OcTextInput/OcTextInput.vue b/src/components/molecules/OcTextInput/OcTextInput.vue
index 3b4dbbca1..af6f9bdc3 100644
--- a/src/components/molecules/OcTextInput/OcTextInput.vue
+++ b/src/components/molecules/OcTextInput/OcTextInput.vue
@@ -276,12 +276,12 @@ export default {
 .oc-text-input {
   @extend .oc-input;
 
-  background-color: var(--oc-color-input-bg);
+  background-color: var(--oc-color-background-secondary);
   border: 1px solid var(--oc-color-input-border);
   color: var(--oc-color-input-text-muted);
 
   &:focus {
-    background-color: var(--oc-color-input-bg);
+    background-color: var(--oc-color-background-secondary);
     border-color: var(--oc-color-input-text-default);
     color: var(--oc-color-input-text-default);
   }