diff --git a/src/app/pages/form/inputs/widgets/switch/switch.html b/src/app/pages/form/inputs/widgets/switch/switch.html
index 210ff3d..fcd2d17 100644
--- a/src/app/pages/form/inputs/widgets/switch/switch.html
+++ b/src/app/pages/form/inputs/widgets/switch/switch.html
@@ -1,8 +1,8 @@
 <div ng-init="switches = [ true, true, true, true, true, true ]" class="switches clearfix">
-  <switch color="success" ng-model="switches[0]"></switch>
+  <switch color="primary" ng-model="switches[5]"></switch>
   <switch color="warning" ng-model="switches[1]"></switch>
   <switch color="danger" ng-model="switches[2]"></switch>
   <switch color="info" ng-model="switches[3]"></switch>
+  <switch color="success" ng-model="switches[0]"></switch>
   <switch color="default" ng-model="switches[4]"></switch>
-  <switch color="primary" ng-model="switches[5]"></switch>
 </div>
\ No newline at end of file
diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss
index 17e6432..93de924 100644
--- a/src/sass/app/_form.scss
+++ b/src/sass/app/_form.scss
@@ -103,6 +103,9 @@ textarea.form-control {
 
 .switch-container {
   display: inline-block;
+  & {
+    @include setSwitchBorder($default);
+  }
   &.primary {
     @include setSwitchBorder($primary);
   }
@@ -122,7 +125,7 @@ textarea.form-control {
 
 .bootstrap-switch {
   border-radius: 0;
-  border: 1px solid $input-border;
+  border: 1px solid $default;
   transition: border-color ease-in-out .7s, box-shadow ease-in-out .7s;
   &:focus {
     outline: none;
@@ -146,7 +149,7 @@ textarea.form-control {
   .bootstrap-switch-handle-on {
     border-radius: 0;
     &.bootstrap-switch-default {
-      background: $input-border;
+      background: $default;
     }
     &.bootstrap-switch-success {
       background: $success;
diff --git a/src/sass/theme/_buttons.scss b/src/sass/theme/_buttons.scss
index fc2b00c..c7a4b8c 100644
--- a/src/sass/theme/_buttons.scss
+++ b/src/sass/theme/_buttons.scss
@@ -59,11 +59,19 @@ $hover: 24;
     @include styleButton($danger, $danger - $hover);
   }
 }
-
-.bootstrap-select .dropdown-toggle:focus {
-  outline: none !important;
+.bootstrap-select{
+  .dropdown-toggle:focus {
+    outline: none !important;
+  }
+  .btn-default:focus{
+    color: $default;
+  }
+  .btn{
+    transition: none;
+  }
 }
 
+
 button.btn.btn-primary {
   @include buttonColor($primary, $primary);
   &:active, &:target {