diff --git a/app/javascript/styles/full-dark/diff.scss b/app/javascript/styles/full-dark/diff.scss
index ed889fefb1..19e36f40b2 100644
--- a/app/javascript/styles/full-dark/diff.scss
+++ b/app/javascript/styles/full-dark/diff.scss
@@ -1,15 +1,33 @@
-input,
+input[type='text'],
+input:not([type]),
 textarea {
   background: $ui-base-color !important;
   color: $primary-text-color !important;
 
+  &.setting-text {
+    border-color: $darker-text-color;
+  }
+
   &::placeholder {
     color: lighten($dark-text-color, 36%) !important;
   }
 }
 
+.column-content-select__control,
+.button.button-secondary {
+  border-color: $darker-text-color !important;
+}
+
 .emoji-mart-category-label {
-  color: $lighter-text-color !important;
+  color: $primary-text-color !important;
+}
+
+.emoji-mart-bar:first-child {
+  background: lighten($classic-base-color, 36%);
+}
+
+.emoji-mart-anchor-selected {
+  color: $primary-text-color;
 }
 
 .compose-form .compose-form__warning {