diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 04cfd0161..b735c870c 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -16,6 +16,8 @@
 // 01. Global styles
 // -----------------
 
+$admin-border-color: #d3d9dd;
+$admin-border:   2px solid $admin-border-color;
 $admin-color:    #245b80;
 $admin-text:     #434d54;
 
@@ -23,7 +25,7 @@ $sidebar:        #245b80;
 $sidebar-hover:  #25597c;
 $sidebar-active: #f4fcd0;
 
-$table-border:   2px solid #d3d9dd;
+$table-border:   $admin-border;
 $table-header:   #ecf1f6;
 
 .admin {
@@ -271,6 +273,23 @@ $table-header:   #ecf1f6;
     .input-group-label {
       height: $line-height * 2;
     }
+
+    .checkbox,
+    .radio {
+      font-weight: bold;
+    }
+
+    select {
+      height: $input-height;
+    }
+
+    [type]:not([type="button"], [type=checkbox], [type=file], [type=radio], [type=submit]),
+    select {
+      background-color: $white;
+      border: $admin-border;
+      border-radius: rem-calc(6);
+      box-shadow: none;
+    }
   }
 
   .menu.simple {
@@ -785,10 +804,6 @@ table {
       color: $text-medium;
     }
 
-    [type]:not([type="submit"]):not([type="file"]):not([type="checkbox"]):not([type="radio"]) {
-      background: $white;
-    }
-
     .legislation-process-start,
     .legislation-process-end {
       @include breakpoint(medium) {
@@ -821,7 +836,6 @@ table {
 .legislation-questions-form {
 
   [type]:not([type="submit"]):not([type="file"]):not([type="checkbox"]):not([type="radio"]) {
-    background: $white;
     margin-bottom: 0;
 
     @include breakpoint(medium) {
@@ -947,10 +961,6 @@ table {
     }
   }
 
-  [type]:not([type="submit"]):not([type="file"]):not([type="checkbox"]):not([type="radio"]) {
-    background: $white;
-  }
-
   .control {
     cursor: pointer;
     margin-bottom: 1rem;
diff --git a/app/assets/stylesheets/admin/search.scss b/app/assets/stylesheets/admin/search.scss
index 0ece75fc5..979dc63fd 100644
--- a/app/assets/stylesheets/admin/search.scss
+++ b/app/assets/stylesheets/admin/search.scss
@@ -10,6 +10,10 @@
       select {
         height: $line-height * 2;
         margin: 0 rem-calc(12);
+
+        + select {
+          margin-left: 0;
+        }
       }
     }
   }
@@ -18,6 +22,12 @@
     @include breakpoint(medium) {
       width: 50%;
     }
+
+    input:not([type="button"], [type="checkbox"], [type="file"], [type="radio"], [type="submit"]) {
+      border-bottom-right-radius: 0;
+      border-top-right-radius: 0;
+      border-right: 0;
+    }
   }
 
   [type="submit"] {
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index d993372ab..bef9212ec 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -1091,7 +1091,7 @@ form {
     }
   }
 
-  [type]:not([type=submit]):not([type=file]):not([type=checkbox]):not([type=radio]):not(.close-button) {
+  [type]:not(.close-button, [type=checkbox], [type=file], [type=radio], [type=submit]) {
     background: #f8f8f8;
     height: $input-height;
     margin-bottom: rem-calc(16);