diff --git a/app/soapbox/features/aliases/components/search.js b/app/soapbox/features/aliases/components/search.js
index 1416b03904..4230639446 100644
Binary files a/app/soapbox/features/aliases/components/search.js and b/app/soapbox/features/aliases/components/search.js differ
diff --git a/app/soapbox/features/list_editor/components/search.js b/app/soapbox/features/list_editor/components/search.js
index 0f300a6e34..c3d8837454 100644
Binary files a/app/soapbox/features/list_editor/components/search.js and b/app/soapbox/features/list_editor/components/search.js differ
diff --git a/app/styles/components/aliases.scss b/app/styles/components/aliases.scss
index a9888a85bd..b5906289db 100644
--- a/app/styles/components/aliases.scss
+++ b/app/styles/components/aliases.scss
@@ -18,24 +18,21 @@
     }
   }
 
-  &_search {
+  &_search.search {
     display: flex;
+    align-items: center;
     flex-direction: row;
-    margin: 10px;
+    border-bottom: none;
 
     .search__input {
       padding: 7px 30px 6px 10px;
+      background: none;
     }
 
     > label {
       flex: 1 1;
     }
 
-    > .search__icon .fa {
-      top: 8px;
-      right: 102px !important;
-    }
-
     > .button {
       width: 80px;
       margin-left: 10px;
diff --git a/app/styles/components/filters.scss b/app/styles/components/filters.scss
index ccdc030d7f..93ebd230b1 100644
--- a/app/styles/components/filters.scss
+++ b/app/styles/components/filters.scss
@@ -97,4 +97,8 @@
       }
     }
   }
+
+  .simple_form select {
+    margin-top: 0;
+  }
 }
diff --git a/app/styles/components/list-forms.scss b/app/styles/components/list-forms.scss
index 0212ebd1f8..bc784fd31f 100644
--- a/app/styles/components/list-forms.scss
+++ b/app/styles/components/list-forms.scss
@@ -39,8 +39,8 @@
       flex: 1 1;
     }
 
-    > .search__icon .fa {
-      right: 102px !important;
+    > .search__icon {
+      position: relative;
     }
 
     > .button {
diff --git a/app/styles/components/search.scss b/app/styles/components/search.scss
index d7f7282579..57b8eb3636 100644
--- a/app/styles/components/search.scss
+++ b/app/styles/components/search.scss
@@ -183,8 +183,8 @@
     padding: 12px 36px 12px 16px;
   }
 
-  .search__icon .svg-icon {
-    right: 24px;
+  .search__icon {
+    position: relative;
   }
 }