diff --git a/web/components/button.react.js b/web/components/button.react.js
--- a/web/components/button.react.js
+++ b/web/components/button.react.js
@@ -14,7 +14,7 @@
 
 export const buttonThemes: { [string]: ButtonColor } = {
   standard: {
-    backgroundColor: 'var(--btn-bg-filled)',
+    backgroundColor: 'var(--button-background-primary-default)',
   },
   danger: {
     backgroundColor: 'var(--btn-bg-danger)',
diff --git a/web/components/search.css b/web/components/search.css
--- a/web/components/search.css
+++ b/web/components/search.css
@@ -1,5 +1,5 @@
 div.searchContainer {
-  background-color: var(--text-input-bg);
+  background-color: var(--inputField-background-secondary-default);
   display: flex;
   align-items: center;
   margin: 1rem;
@@ -10,7 +10,7 @@
 
 div.searchIcon {
   display: flex;
-  color: var(--search-icon-color);
+  color: var(--inputField-label-secondary-default);
 }
 
 input.searchInput,
@@ -21,18 +21,18 @@
   padding: 4px 12px;
   flex: 1;
   border: none;
-  color: var(--search-input-color);
+  color: var(--inputField-label-primary-default);
   outline: none;
 }
 
 input.searchInput::placeholder {
-  color: var(--search-input-placeholder);
+  color: var(--inputField-label-secondary-default);
 }
 
 button.clearSearch {
-  color: var(--search-clear-color);
+  color: var(--inputField-clearIcon-primary-default);
   transition: ease-in-out 0.15s;
-  background: var(--search-clear-bg);
+  background: var(--inputField-clearBackground-primary-default);
   border-radius: 50%;
   padding: 6px;
 }
diff --git a/web/settings/relationship/user-list-row.css b/web/settings/relationship/user-list-row.css
--- a/web/settings/relationship/user-list-row.css
+++ b/web/settings/relationship/user-list-row.css
@@ -2,14 +2,14 @@
   display: flex;
   justify-content: space-between;
   padding: 16px;
-  color: var(--relationship-modal-color);
+  color: var(--text-background-tertiary-default);
   font-size: var(--l-font-18);
   line-height: var(--line-height-display);
 }
 
 .container:hover {
   cursor: pointer;
-  background-color: var(--drawer-open-community-bg);
+  background-color: var(--modal-listItem-primary-hover);
   border-radius: 8px;
 }
 
diff --git a/web/theme.css b/web/theme.css
--- a/web/theme.css
+++ b/web/theme.css
@@ -135,11 +135,6 @@
   --chat-thread-list-menu-bg: var(--shades-black-75);
   --chat-thread-list-menu-active-color: var(--shades-white-60);
   --chat-thread-list-menu-active-bg: var(--shades-black-85);
-  --search-clear-color: var(--shades-white-100);
-  --search-clear-bg: var(--shades-black-60);
-  --search-input-color: var(--shades-white-100);
-  --search-input-placeholder: var(--shades-black-50);
-  --search-icon-color: var(--shades-black-50);
   --tabs-header-active-color: var(--shades-white-100);
   --tabs-header-active-border: var(--violet-light-100);
   --tabs-header-active-background: var(--violet-dark-100);
@@ -289,11 +284,16 @@
   --modal-header-primary-default: var(--shades-white-100);
   --modal-close-primary-default: var(--shades-black-50);
   --modal-close-primary-hover: var(--shades-white-100);
+  --modal-listItem-primary-hover: var(--shades-black-90);
 
   /* Input Field */
   --inputField-background-primary-default: var(--shades-black-85);
+  --inputField-background-secondary-default: var(--shades-black-75);
   --inputField-label-primary-default: var(--shades-white-100);
+  --inputField-label-secondary-default: var(--shades-black-50);
   --inputField-border-primary-default: var(--shades-black-75);
+  --inputField-clearBackground-primary-default: var(--shades-black-60);
+  --inputField-clearIcon-primary-default: var(--shades-white-100);
 }
 
 /* Light theme */
@@ -326,9 +326,14 @@
   --modal-header-primary-default: var(--shades-black-95);
   --modal-close-primary-default: var(--shades-black-50);
   --modal-close-primary-hover: var(--shades-black-95);
+  --modal-listItem-primary-hover: var(--shades-white-70);
 
   /* Input Field */
   --inputField-background-primary-default: var(--shades-white-100);
+  --inputField-background-secondary-default: var(--shades-white-60);
   --inputField-label-primary-default: var(--shades-black-95);
+  --inputField-label-secondary-default: var(--shades-black-60);
   --inputField-border-primary-default: var(--shades-white-60);
+  --inputField-clearBackground-primary-default: var(--shades-black-50);
+  --inputField-clearIcon-primary-default: var(--shades-white-100);
 }