diff --git a/templates/admin/default/assets/less/thelia/bootstrap-select.less b/templates/admin/default/assets/less/thelia/bootstrap-select.less
index 9c5f1fc28..5fb302a33 100644
--- a/templates/admin/default/assets/less/thelia/bootstrap-select.less
+++ b/templates/admin/default/assets/less/thelia/bootstrap-select.less
@@ -58,10 +58,7 @@
 
 .bootstrap-select > .btn {
     width: 100%;
-}
-
-.error .bootstrap-select .btn {
-    border: 1px solid #b94a48;
+    .form-control-focus();
 }
 
 
@@ -79,6 +76,7 @@
     left: 12px;
     right: 25px;
     text-align: left;
+    color: @input-color;
 }
 
 .bootstrap-select.btn-group .btn .caret {
@@ -132,6 +130,14 @@
     overflow: hidden;
 }
 
+.bootstrap-select.btn-group .dropdown-menu li a{
+    color: @input-color;
+
+    &:hover{
+        color: #FFF;
+    }
+}
+
 .bootstrap-select.btn-group .dropdown-menu li {
     position: relative;
 
diff --git a/templates/admin/default/assets/less/thelia/forms.less b/templates/admin/default/assets/less/thelia/forms.less
index 52c4b5b54..2291c15e9 100755
--- a/templates/admin/default/assets/less/thelia/forms.less
+++ b/templates/admin/default/assets/less/thelia/forms.less
@@ -167,6 +167,36 @@ form .info {
     }
 }
 
+// Form validation states
+//
+// Used in forms.less to generate the form validation CSS for warnings, errors,
+// and successes.
+
+.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) {
+  // Color the label and help text
+  .help-block,
+  .control-label {
+    color: @text-color;
+  }
+  // Set the border and box shadow on specific inputs to match
+  .form-control, .bootstrap-select .btn {
+    border-color: @border-color;
+    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
+    &:focus {
+      border-color: darken(@border-color, 10%);
+      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);
+      .box-shadow(@shadow);
+    }
+  }
+  // Set validation states also for addons
+  .input-group-addon {
+    color: @text-color;
+    border-color: @border-color;
+    background-color: @background-color;
+  }
+}
+
+
 // -- Sign in --
 .form-signin{
     // .form-control {