diff --git a/admin-dev/themes/default/css/_toggle-switch.scss b/admin-dev/themes/default/css/_toggle-switch.scss
index 9d09b2699..9c80120c0 100755
--- a/admin-dev/themes/default/css/_toggle-switch.scss
+++ b/admin-dev/themes/default/css/_toggle-switch.scss
@@ -17,7 +17,8 @@ https://github.com/ghinda/css-toggle-switch
 }
 
 .switch label {
-	padding: 0
+	padding: 0;
+	cursor: pointer;
 }
 
 /* Toggle Switches */
@@ -191,7 +192,7 @@ https://github.com/ghinda/css-toggle-switch
 	.toggle,
 	.switch {
 		display: block;
-		height: 30px;
+		height: 38px;
 	}
 	
 	.switch *,
@@ -217,7 +218,7 @@ https://github.com/ghinda/css-toggle-switch
 	.toggle label,
 	.toggle p,
 	.switch label {
-		line-height: 30px;
+		line-height: 38px;
 		vertical-align: middle;
 	}
 	
@@ -240,40 +241,28 @@ https://github.com/ghinda/css-toggle-switch
 	
 	@-webkit-keyframes bugfix { from { position: relative; } to { position: relative; } }
 
-	/* Standalone Themes */
-
-
-	/* Candy Theme
-	 * Based on the "Sort Switches / Toggles (PSD)" by Ormal Clarck
-	 * http://www.premiumpixels.com/freebies/sort-switches-toggles-psd/
-	 */
-	 
-	.candy {
-		background-color: #C0C0C0;
+	/* Standalone Themes */ 
+	.prestashop-switch {
+		min-width: 150px;
 		color: #474949;
 		font-weight: 500;
 		text-align: center;
-		border-radius: 3px;	
+		border-radius: 3px;
 	}
-
-	.candy input:checked + label {
+	.prestashop-switch input:checked + label {
 		color: #fff;
 		text-shadow: none;
 	}
-		
-	.candy .slide-button {
+	.prestashop-switch .slide-button {
 
 		background-color: #3D89CC;
 		border-radius: 3px;
 		border: none;
 	}
-
-	.candy p {
+	.prestashop-switch p {
 		color: #333;
 	}
-
-	.candy span {
+	.prestashop-switch span {
 		color: #fff;
 	}
-
-}
+}
\ No newline at end of file
diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 749a11b36..262815201 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -6768,7 +6768,8 @@ https://github.com/ghinda/css-toggle-switch
 
 @media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000319}}
 .switch label {
-  padding: 0; }
+  padding: 0;
+  cursor: pointer; }
 
 /* Toggle Switches */
 /* We can't test for a specific feature,
@@ -6777,7 +6778,7 @@ https://github.com/ghinda/css-toggle-switch
 @media only screen {
   /* Checkbox
    */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000332}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000333}}
   .toggle {
     position: relative;
     padding: 0;
@@ -6786,7 +6787,7 @@ https://github.com/ghinda/css-toggle-switch
   /* Position the label over all the elements, except the slide-button
    * Clicking anywhere on the label will change the switch-state
    */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000341}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000342}}
   .toggle label {
     position: relative;
     z-index: 3;
@@ -6795,13 +6796,13 @@ https://github.com/ghinda/css-toggle-switch
 
   /* Don't hide the input from screen-readers and keyboard access
    */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000351}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000352}}
   .toggle input {
     position: absolute;
     opacity: 0;
     z-index: 5; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000357}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000358}}
   .toggle p {
     position: absolute;
     left: -100px;
@@ -6810,7 +6811,7 @@ https://github.com/ghinda/css-toggle-switch
     padding-right: 100px;
     text-align: left; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000368}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000369}}
   .toggle p span {
     position: absolute;
     top: 0;
@@ -6821,11 +6822,11 @@ https://github.com/ghinda/css-toggle-switch
     margin-left: 100px;
     text-align: center; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000381}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000382}}
   .toggle p span:last-child {
     left: 50%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000385}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000386}}
   .toggle .slide-button {
     position: absolute;
     right: 0;
@@ -6838,17 +6839,17 @@ https://github.com/ghinda/css-toggle-switch
 
   /* Radio Switch
    */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\0000399}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003100}}
   .switch {
     position: relative;
     padding: 0; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003104}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003105}}
   .switch input {
     position: absolute;
     opacity: 0; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003109}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003110}}
   .switch label {
     position: relative;
     z-index: 2;
@@ -6858,7 +6859,7 @@ https://github.com/ghinda/css-toggle-switch
     margin: 0;
     text-align: center; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003121}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003122}}
   .switch .slide-button {
     position: absolute;
     top: 0;
@@ -6868,72 +6869,72 @@ https://github.com/ghinda/css-toggle-switch
     width: 50%;
     height: 100%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003132}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003133}}
   .switch input:last-of-type:checked ~ .slide-button {
     left: 50%; }
 
   /* Switch with 3 items */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003138}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003139}}
   .switch.switch-three label,
   .switch.switch-three .slide-button {
     width: 33.3%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003142}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003143}}
   .switch.switch-three input:checked:nth-of-type(2) ~ .slide-button {
     left: 33.3%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003146}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003147}}
   .switch.switch-three input:checked:last-of-type ~ .slide-button {
     left: 66.6%; }
 
   /* Switch with 4 items */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003152}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003153}}
   .switch.switch-four label,
   .switch.switch-four .slide-button {
     width: 25%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003156}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003157}}
   .switch.switch-four input:checked:nth-of-type(2) ~ .slide-button {
     left: 25%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003160}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003161}}
   .switch.switch-four input:checked:nth-of-type(3) ~ .slide-button {
     left: 50%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003164}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003165}}
   .switch.switch-four input:checked:last-of-type ~ .slide-button {
     left: 75%; }
 
   /* Switch with 5 items */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003170}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003171}}
   .switch.switch-five label,
   .switch.switch-five .slide-button {
     width: 20%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003174}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003175}}
   .switch.switch-five input:checked:nth-of-type(2) ~ .slide-button {
     left: 20%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003178}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003179}}
   .switch.switch-five input:checked:nth-of-type(3) ~ .slide-button {
     left: 40%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003182}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003183}}
   .switch.switch-five input:checked:nth-of-type(4) ~ .slide-button {
     left: 60%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003186}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003187}}
   .switch.switch-five input:checked:last-of-type ~ .slide-button {
     left: 80%; }
 
   /* Shared */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003192}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003193}}
   .toggle,
   .switch {
     display: block;
-    height: 30px; }
+    height: 38px; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003198}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003199}}
   .switch *,
   .toggle * {
     -webkit-box-sizing: border-box;
@@ -6942,7 +6943,7 @@ https://github.com/ghinda/css-toggle-switch
     -o-box-sizing: border-box;
     box-sizing: border-box; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003207}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003208}}
   .switch .slide-button,
   .toggle .slide-button {
     display: block;
@@ -6952,19 +6953,19 @@ https://github.com/ghinda/css-toggle-switch
     -o-transition: all 0.3s ease-out;
     transition: all 0.3s ease-out; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003219}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003220}}
   .toggle label,
   .toggle p,
   .switch label {
-    line-height: 30px;
+    line-height: 38px;
     vertical-align: middle; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003224}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003225}}
   .toggle input:checked ~ .slide-button {
     right: 50%; }
 
   /* Outline the toggles when the inputs are focused */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003230}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003231}}
   .toggle input:focus ~ .slide-button,
   .switch input:focus + label {
     outline: 1px dotted #888; }
@@ -6972,7 +6973,7 @@ https://github.com/ghinda/css-toggle-switch
   /* Bugfix for older Webkit, including mobile Webkit. Adapted from:
    * http://css-tricks.com/webkit-sibling-bug/
    */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003237}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003238}}
   .switch, .toggle {
     -webkit-animation: bugfix infinite 1s; }
 
@@ -6984,78 +6985,75 @@ https://github.com/ghinda/css-toggle-switch
       position: relative; } }
 
   /* Standalone Themes */
-  /* Candy Theme
-   * Based on the "Sort Switches / Toggles (PSD)" by Ormal Clarck
-   * http://www.premiumpixels.com/freebies/sort-switches-toggles-psd/
-   */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003251}}
-  .candy {
-    background-color: #C0C0C0;
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003245}}
+  .prestashop-switch {
+    min-width: 150px;
     color: #474949;
     font-weight: 500;
     text-align: center;
     border-radius: 3px; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003259}}
-  .candy input:checked + label {
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003252}}
+  .prestashop-switch input:checked + label {
     color: #fff;
     text-shadow: none; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003264}}
-  .candy .slide-button {
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003256}}
+  .prestashop-switch .slide-button {
     background-color: #3D89CC;
     border-radius: 3px;
     border: none; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003271}}
-  .candy p {
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003262}}
+  .prestashop-switch p {
     color: #333; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003275}}
-  .candy span {
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/_toggle-switch\.scss}line{font-family:\00003265}}
+  .prestashop-switch span {
     color: #fff; } }
 @media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\000035}}
 html, body {
   height: 100%;
-  background: #ebeff8; }
+  background: #eeeeee; }
 
 @media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\000039}}
 body.fixed-top {
   position: relative;
   top: 56px;
-  margin-bottom: 50px; }
+  margin-bottom: 50px;
+  font-family: "Open Sans", sans-serif; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000314}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000315}}
 #main {
   position: relative;
   min-height: 100%;
   height: 100%; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000319}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000320}}
 #content {
   height: 100%;
   padding: 20px;
   margin: 0 0 90px 240px;
-  border-left: 1px solid black;
+  border-left: 1px solid #cecece;
   background-color: white; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000326}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000327}}
 .page-sidebar {
-  top: 52px;
+  top: 65px;
   position: fixed;
   width: 240px; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000330}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000331}}
   .page-sidebar > ul {
     margin: 0;
     padding: 0; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000333}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000334}}
     .page-sidebar > ul li {
       list-style: none; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000337}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000338}}
     .page-sidebar > ul > li.active > a {
       color: white;
       background-color: #1a1a1a; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000340}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000341}}
     .page-sidebar > ul > li > a {
       text-transform: uppercase;
       font-size: 12px;
@@ -7063,58 +7061,58 @@ body.fixed-top {
       display: block;
       padding: 8px 0 8px 15px;
       border-bottom: 1px solid #cecece; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000347}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000348}}
       .page-sidebar > ul > li > a:hover {
         text-decoration: none; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000349}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000350}}
     .page-sidebar > ul > li img {
       margin-right: 10px; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000351}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000352}}
     .page-sidebar > ul > li ul {
       margin: 0;
       padding: 0;
       border-bottom: 1px solid #cecece;
       background-color: white; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000357}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000358}}
       .page-sidebar > ul > li ul li a {
         font-size: 12px;
         display: block;
         padding: 3px 15px 3px 20px;
         border: none;
         border-bottom: 1px solid whitesmoke; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000363}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000364}}
         .page-sidebar > ul > li ul li a i {
           margin-top: 4px;
           color: #cecece; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000366}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000367}}
         .page-sidebar > ul > li ul li a:hover {
           background-color: whitesmoke;
           text-decoration: none; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000369}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000370}}
           .page-sidebar > ul > li ul li a:hover i {
             color: #004d7b; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000372}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000373}}
       .page-sidebar > ul > li ul li.active a {
         color: #1a1a1a;
         background-color: #adb0b8; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000375}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000376}}
         .page-sidebar > ul > li ul li.active a i {
           color: black; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000378}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000379}}
     .page-sidebar > ul li:not(.active) ul {
       display: none; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000380}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000381}}
     .page-sidebar > ul li.expanded ul {
       display: block;
       background-color: white; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000384}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000385}}
   .page-sidebar > ul > li > ul.sub-menu {
     display: none;
     list-style: none;
     clear: both;
     margin: 8px 0px 8px 0px; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000390}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000391}}
 #footer {
   width: 100%;
   position: fixed;
@@ -7123,7 +7121,7 @@ body.fixed-top {
   font-size: 12px;
   color: #999999;
   background-color: #272822; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000398}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\0000399}}
   #footer .go-top {
     display: block;
     text-decoration: none;
@@ -7135,26 +7133,13 @@ body.fixed-top {
     font-size: 16px;
     background-color: #111111;
     padding: 0px 6px 0px 6px; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003109}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003110}}
   #footer .go-top i {
     color: #666666;
     font-size: 22px;
     margin-bottom: 5px; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003114}}
-.table {
-  word-wrap: break-word; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003116}}
-  .table input, .table select {
-    margin: 0; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003118}}
-  .table td.center, .table th.center {
-    text-align: center; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003120}}
-  .table tr:hover {
-    background-color: #777777; }
-
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003123}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003115}}
 #menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"] {
   font-size: 18px;
   border-radius: 35px;
@@ -7165,75 +7150,81 @@ body.fixed-top {
   text-align: center;
   line-height: 30px; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003133}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003125}}
 label span.label-tooltip {
   color: #0086ce;
   text-decoration: none;
   border-bottom: dashed 1px #647858; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003138}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003130}}
 label.required:before {
   content: "*";
   color: red;
   font-size: 14px; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003146}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003138}}
 .icon-AdminCatalog {
   background-color: #7a1009; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003149}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003141}}
 .icon-AdminParentOrders {
   background-color: #7a3509; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003152}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003144}}
 .icon-AdminParentCustomer {
   background-color: #7a5b09; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003155}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003147}}
 .icon-AdminPriceRule {
   background-color: #737a09; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003158}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003150}}
 .icon-AdminParentShipping {
   background-color: #4e7a09; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003161}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003153}}
 .icon-AdminParentLocalization {
   background-color: #287a09; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003164}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003156}}
 .icon-AdminParentModules {
   background-color: #097a10; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003167}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003159}}
 .icon-AdminParentPreferences {
   background-color: #097a35; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003170}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003162}}
 .icon-AdminTools {
   background-color: #097a5b; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003173}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003165}}
 .icon-AdminAdmin {
   background-color: #09737a; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003176}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003168}}
 .icon-AdminParentStats {
   background-color: #094e7a; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003180}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003172}}
 .navbar-inner {
   box-shadow: none !important; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003182}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003174}}
   .navbar-inner .input-append {
     margin-bottom: 0; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003189}}
-.toolbar_btn:hover {
-  color: #474949;
-  border-color: #474949; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003178}}
+.toolbar_btn {
+  padding: 2px 5px !important;
+  font-size: 11px;
+  margin-right: 3px; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003184}}
+  .toolbar_btn:hover {
+    color: #3d89cc;
+    border-color: #3d89cc;
+    background-color: white !important; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003193}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003189}}
 [class^="process-icon-"], [class*=" process-icon-"] {
   height: 32px;
   min-width: 32px;
@@ -7249,39 +7240,130 @@ label.required:before {
   -webkit-font-smoothing: antialiased;
   *margin-right: 0.3em; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003237}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003233}}
 .page-head {
   position: relative;
   padding: 5px 5px 0 20px;
-  min-height: 84px;
+  min-height: 63px;
   margin-bottom: 20px;
-  background: #ebeff8; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003243}}
+  background: #eeeeee; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003239}}
   .page-head .page-title {
     margin: 0;
     float: left;
     padding: 0;
-    line-height: 80px;
+    font-size: 20px;
+    line-height: 55px;
     color: #272822;
-    font-weight: normal;
-    text-transform: uppercase; }
+    font-weight: 300;
+    text-transform: uppercase;
+    font-family: "Ubuntu", sans-serif; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003252}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003250}}
 .page-bar {
   float: right;
   padding: 0;
   height: 68px; }
 
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003257}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003255}}
 .btn-toolbar {
   margin: 0; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003259}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003257}}
   .btn-toolbar .nav-tabs {
     margin: 0; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003261}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003259}}
   .btn-toolbar .nav-tabs > li > a {
     color: #333333; }
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003263}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003261}}
     .btn-toolbar .nav-tabs > li > a > .active > a, .btn-toolbar .nav-tabs > li > a > .active > a:hover {
       color: #3399ff;
       background: whitesmoke; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003267}}
+select.input-tiny,
+input[type="text"].input-tiny,
+input[type="password"].input-tiny {
+  width: 80px;
+  float: left; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003274}}
+form legend {
+  font-family: "Ubuntu", sans-serif;
+  padding: 0 0 0 10px;
+  margin: 20px 0;
+  float: left;
+  color: #cccccc;
+  font-weight: 300; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003283}}
+.fixed-width-XS {
+  width: 40px; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003285}}
+.fixed-width-S {
+  width: 80px; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003287}}
+.fixed-width-M {
+  width: 120px; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003289}}
+.fixed-width-L {
+  width: 160px; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003291}}
+.fixed-width-XL {
+  width: 200px; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003295}}
+tr.filter {
+  background-color: #eeeeee; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003298}}
+input[type="text"].filter, input[type="password"].filter, select.filter {
+  min-height: 30px;
+  height: 30px;
+  font-size: 12px; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003303}}
+.btn, .toolbar_btn {
+  text-transform: uppercase; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003306}}
+.btn-group-action {
+  white-space: nowrap; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003308}}
+  .btn-group-action a {
+    color: white;
+    text-decoration: none; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003314}}
+.table thead > tr > th {
+  font-weight: normal;
+  vertical-align: top; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003317}}
+  .table thead > tr > th span.title_box {
+    display: block;
+    word-wrap: nowrap;
+    white-space: nowrap; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003321}}
+    .table thead > tr > th span.title_box.active {
+      font-weight: bold; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003323}}
+    .table thead > tr > th span.title_box a {
+      text-decoration: none; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003325}}
+    .table thead > tr > th span.title_box a.active {
+      color: black; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003327}}
+.table input, .table select {
+  margin: 0; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003329}}
+.table td.center, .table th.center {
+  text-align: center; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Applications\/AMPPS\/www\/checkout\.kg\/PS_BOOTSTRAP\/admin-dev\/themes\/default\/css\/admin-theme\.sass}line{font-family:\00003331}}
+.table tbody > tr > td {
+  vertical-align: middle;
+  word-wrap: nowrap;
+  font-size: 12px;
+  padding: 3px 7px 3px 7px; }
diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass
index c6a4dd5e0..69f2fdf4b 100755
--- a/admin-dev/themes/default/css/admin-theme.sass
+++ b/admin-dev/themes/default/css/admin-theme.sass
@@ -4,12 +4,13 @@
 
 html, body
 	height: 100%
-	background: #EBEFF8
+	background: #EEEEEE
 
 body.fixed-top
 	position: relative
 	top: 56px
 	margin-bottom: 50px
+	font-family: 'Open Sans', sans-serif
 
 #main
 	position: relative
@@ -20,11 +21,11 @@ body.fixed-top
 	height: 100%
 	padding: 20px
 	margin: 0 0 90px 240px
-	border-left: 1px solid black
+	border-left: 1px solid #CECECE
 	background-color: white
 
 .page-sidebar
-	top: 52px
+	top: 65px
 	position: fixed
 	width: 240px
 	> ul
@@ -111,15 +112,6 @@ body.fixed-top
 		font-size: 22px
 		margin-bottom: 5px
 
-.table
-	word-wrap: break-word
-	input, select
-		margin: 0
-	td.center, th.center
-		text-align: center
-	tr:hover
-		background-color: #777
-
 #menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"]
 	font-size: 18px
 	border-radius: 35px
@@ -186,9 +178,13 @@ $icon-color: #7A0928
 .toolbar_btn
 	@extend .btn
 	@extend .btn-primary
+	padding: 2px 5px !important
+	font-size: 11px
+	margin-right: 3px
 	&:hover
-		color: #474949
-		border-color: #474949
+		color: #3D89CC
+		border-color: #3D89CC
+		background-color: white !important
 
 [class^="process-icon-"], [class*=" process-icon-"]
 	height: 32px
@@ -237,17 +233,19 @@ $icon-color: #7A0928
 .page-head
 	position: relative
 	padding: 5px 5px 0 20px
-	min-height: 84px
+	min-height: 63px
 	margin-bottom: 20px
-	background: #EBEFF8
+	background: #EEEEEE
 	.page-title 
 		margin: 0
 		float: left
 		padding: 0
-		line-height: 80px
+		font-size: 20px
+		line-height: 55px
 		color: #272822
-		font-weight: normal
+		font-weight: 300
 		text-transform: uppercase
+		font-family: 'Ubuntu', sans-serif
 
 .page-bar
 	float: right
@@ -263,3 +261,76 @@ $icon-color: #7A0928
 		> .active > a, > .active > a:hover
 			color: #3399ff
 			background: #f5f5f5
+
+/////////////////////// WIP DRAFT
+//form
+select.input-tiny,
+input[type="text"].input-tiny,
+input[type="password"].input-tiny
+	width: 80px
+	float: left
+
+//fieldset title
+form legend
+	font-family: 'Ubuntu', sans-serif
+	padding: 0 0 0 10px
+	margin: 20px 0
+	float: left
+	color: #ccc
+	font-weight: 300
+
+//some helpers to get fixed width
+.fixed-width-XS
+	width: 40px
+.fixed-width-S
+	width: 80px
+.fixed-width-M
+	width: 120px
+.fixed-width-L
+	width: 160px
+.fixed-width-XL
+	width: 200px
+
+//filter table
+tr.filter
+	background-color: #EEEEEE
+
+input[type="text"].filter, input[type="password"].filter, select.filter
+	min-height: 30px
+	height: 30px
+	font-size: 12px
+
+.btn
+	text-transform: uppercase
+
+.btn-group-action
+	white-space: nowrap
+	a
+		color: white
+		text-decoration: none
+
+.table
+	//word-wrap: break-word
+	thead > tr > th
+		font-weight: normal
+		vertical-align: top
+		span.title_box
+			display: block
+			word-wrap: nowrap
+			white-space: nowrap
+			&.active
+				font-weight: bold
+			a
+				text-decoration: none
+			a.active
+				color: black
+	input, select
+		margin: 0
+	td.center, th.center
+		text-align: center
+	tbody > tr > td
+		vertical-align: middle
+		word-wrap: nowrap
+		font-size: 12px
+		padding: 3px 7px 3px 7px
+
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
index f6c0b398f..1da0e6877 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
@@ -1,127 +1,153 @@
-<div class="control-group well">
-	<label class="control-label">{l s='Free shipping'}</label>
-	<div class="controls">
-		<label class="t radio" for="free_shipping_on">
+<div class="row">
+	<label class="control-label  col-lg-3">{l s='Free shipping'}</label>
+	<div class="input-group col-lg-2">
+		<span class="switch prestashop-switch">
 			<input type="radio" name="free_shipping" id="free_shipping_on" value="1" {if $currentTab->getFieldValue($currentObject, 'free_shipping')|intval}checked="checked"{/if} />
-			 <i class="icon-check-sign"></i> {l s='Yes'}
-		</label>
-		<label class="t radio" for="free_shipping_off"> 
+			<label class="t radio" for="free_shipping_on">
+			 	<i class="icon-check-sign"></i> {l s='Yes'}
+			</label>
 			<input type="radio" name="free_shipping" id="free_shipping_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'free_shipping')|intval}checked="checked"{/if} />
-			<i class="icon-ban-circle"></i> {l s='No'}
-		</label>
+			<label class="t radio" for="free_shipping_off">
+				<i class="icon-ban-circle"></i> {l s='No'}
+			</label>
+			<span class="slide-button btn btn-default"></span>
+		</span>
 	</div>
 </div>
 
-<div class="control-group well">
-	<label class="control-label">{l s='Apply a discount'}</label>
-	<div class="controls">
-		<label class="t radio" for="apply_discount_percent">
+<div class="row">
+	<label class="control-label col-lg-3">{l s='Apply a discount'}</label>
+	<div class="input-group col-lg-8">
+		<span class="switch prestashop-switch switch-three">
 			<input type="radio" name="apply_discount" id="apply_discount_percent" value="percent" {if $currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval > 0}checked="checked"{/if} />
-			 <i class="icon-check-sign"></i> {l s='Percent (%)'}
-		</label>
-		<label class="t radio" for="apply_discount_amount">
+			<label class="t radio" for="apply_discount_percent">
+				 <i class="icon-check-sign"></i> {l s='Percent (%)'}
+			</label>
 			<input type="radio" name="apply_discount" id="apply_discount_amount" value="amount" {if $currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval > 0}checked="checked"{/if} />
-			 <i class="icon-check-sign"></i> {l s='Amount'}
-		</label>
-		<label class="t radio" for="apply_discount_off">
+			<label class="t radio" for="apply_discount_amount">
+				 <i class="icon-check-sign"></i> {l s='Amount'}
+			</label>
 			<input type="radio" name="apply_discount" id="apply_discount_off" value="off" {if !$currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval > 0 && !$currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval > 0}checked="checked"{/if} />
-			 <i class="icon-ban-circle"></i> {l s='None'}
-		</label>
+			<label class="t radio" for="apply_discount_off">
+				 <i class="icon-ban-circle"></i> {l s='None'}
+			</label>
+			<span class="slide-button btn btn-default"></span>
+		</span>
 	</div>
+</div>
 
+<div id="apply_discount_percent_div" class="row">
+	<label class="control-label col-lg-3">{l s='Value'}</label>
+	<div class="input-group col-lg-2">
+		<span class="input-group-addon">%</span>
+		<input type="text" id="reduction_percent" class="input-mini" name="reduction_percent" value="{$currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval}" />
+	</div>
+	<span class="help-block"><i class="icon-warning-sign"></i> {l s='Does not apply to the shipping costs'}</span>
+</div>
 
-	<div id="apply_discount_percent_div">
-		<label class="control-label">{l s='Value'}</label>
-		<div class="controls">
-			<input type="text" id="reduction_percent" class="input-mini" name="reduction_percent" value="{$currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval}" /> %
-			<span class="help-block">{l s='Does not apply to the shipping costs'}</span>
+<div id="apply_discount_amount_div" class="row">
+	<label class="control-label col-lg-3">{l s='Amount'}</label>
+	<div class="col-lg-7">
+		<div class="row">
+			<div class="col-lg-4">
+				<input type="text" id="reduction_amount" name="reduction_amount" value="{$currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval}" onchange="this.value = this.value.replace(/,/g, '.');" />
+			</div>
+			<div class="col-lg-4">
+				<select name="reduction_currency" >
+				{foreach from=$currencies item='currency'}
+					<option value="{$currency.id_currency|intval}" {if $currentTab->getFieldValue($currentObject, 'reduction_currency') == $currency.id_currency || (!$currentTab->getFieldValue($currentObject, 'reduction_currency') && $currency.id_currency == $defaultCurrency)}selected="selected"{/if}>{$currency.iso_code}</option>
+				{/foreach}
+				</select>
+			</div>
+			<div class="col-lg-4">
+				<select name="reduction_tax" >
+					<option value="0" {if $currentTab->getFieldValue($currentObject, 'reduction_tax') == 0}selected="selected"{/if}>{l s='Tax excluded'}</option>
+					<option value="1" {if $currentTab->getFieldValue($currentObject, 'reduction_tax') == 1}selected="selected"{/if}>{l s='Tax included'}</option>
+				</select>
+			</div>
 		</div>
 	</div>
+</div>
 
-	<div id="apply_discount_amount_div">
-		<label class="control-label">{l s='Amount'}</label>
-		<div class="controls">
-			<input type="text" id="reduction_amount" class="input-mini" name="reduction_amount" value="{$currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval}" onchange="this.value = this.value.replace(/,/g, '.');" />
-			<select name="reduction_currency" class="input-small">
-			{foreach from=$currencies item='currency'}
-				<option value="{$currency.id_currency|intval}" {if $currentTab->getFieldValue($currentObject, 'reduction_currency') == $currency.id_currency || (!$currentTab->getFieldValue($currentObject, 'reduction_currency') && $currency.id_currency == $defaultCurrency)}selected="selected"{/if}>{$currency.iso_code}</option>
-			{/foreach}
-			</select>
-			<select name="reduction_tax" class="input-medium">
-				<option value="0" {if $currentTab->getFieldValue($currentObject, 'reduction_tax') == 0}selected="selected"{/if}>{l s='Tax excluded'}</option>
-				<option value="1" {if $currentTab->getFieldValue($currentObject, 'reduction_tax') == 1}selected="selected"{/if}>{l s='Tax included'}</option>
-			</select>
-		</div>
-	</div>
-
-	<div id="apply_discount_to_div">
-		<label class="control-label">{l s='Apply a discount to'}</label>
-		<div class="controls">
-
+<div id="apply_discount_to_div" class="row">
+	<label class="control-label col-lg-3">{l s='Apply a discount to'}</label>
+	<div class="col-lg-7">
+		<p class="checkbox">
 			<label class="t radio" for="apply_discount_to_order">
 				<input type="radio" name="apply_discount_to" id="apply_discount_to_order" value="order" {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == 0}checked="checked"{/if} />
 				 {l s='Order (without shipping)'}
 			</label>
-
+		</p>
+		<p class="checkbox">
 			<label class="t radio" for="apply_discount_to_product">
 				<input type="radio" name="apply_discount_to" id="apply_discount_to_product" value="specific"  {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval > 0}checked="checked"{/if} />
 				{l s='Specific product'}
 			</label>
-
+		</p>
+		<p class="checkbox">
 			<label class="t radio" for="apply_discount_to_cheapest">
 				<input type="radio" name="apply_discount_to" id="apply_discount_to_cheapest" value="cheapest"  {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -1}checked="checked"{/if} />
 				 {l s='Cheapest product'}
 			</label>
-
+		</p>
+		<p class="checkbox">
 			<label class="t radio" for="apply_discount_to_selection">
 				<input type="radio" name="apply_discount_to" id="apply_discount_to_selection" value="selection"  {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -2}checked="checked"{/if} />
 				{l s='Selected product(s)'}
 			</label>
-		</div>
-
-		<div id="apply_discount_to_product_div">
-			<label class="control-label">{l s='Product'}</label>
-			<div class="controls">
-				<input type="hidden" id="reduction_product" name="reduction_product" value="{$currentTab->getFieldValue($currentObject, 'reduction_product')|intval}" />
-				<input type="text" id="reductionProductFilter" class="input-large" name="reductionProductFilter" value="{$reductionProductFilter|escape:'htmlall':'UTF-8'}" />
-			</div>
-		</div>
+		</p>
 	</div>
 </div>
 
+<div id="apply_discount_to_product_div" class="row">
+	<label class="control-label col-lg-3">{l s='Product'}</label>
+	<div class="input-group col-lg-5">
+		<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter|escape:'htmlall':'UTF-8'}" />
+		<input type="hidden" id="reduction_product" name="reduction_product" value="{$currentTab->getFieldValue($currentObject, 'reduction_product')|intval}" />
+		<span class="input-group-addon"><i class="icon-search"></i></span>
+	</div>
+</div>
 
-<div class="control-group well">
-	<label class="control-label">{l s='Send a free gift'}</label>
-	<div class="controls">
-		<label class="t radio" for="free_gift_on">
+<div class="row">
+	<label class="control-label col-lg-3">{l s='Send a free gift'}</label>
+	<div class="input-group col-lg-2">
+		<span class="switch prestashop-switch">
 			<input type="radio" name="free_gift" id="free_gift_on" value="1" {if $currentTab->getFieldValue($currentObject, 'gift_product')|intval}checked="checked"{/if} />
-			 <i class="icon-check-sign"></i> {l s='Yes'}
-		</label>
-		<label class="t radio" for="free_gift_off">
+			<label class="t radio" for="free_gift_on">
+				<i class="icon-check-sign"></i> {l s='Yes'}
+			</label>
 			<input type="radio" name="free_gift" id="free_gift_off" value="0" {if !$currentTab->getFieldValue($currentObject, 'gift_product')|intval}checked="checked"{/if} />
-			<i class="icon-ban-circle"></i> {l s='No'}
-		</label>
+			<label class="t radio" for="free_gift_off">
+				<i class="icon-ban-circle"></i> {l s='No'}
+			</label>
+			<span class="slide-button btn btn-default"></span>
+		</span>
 	</div>
+</div>
 
-	<div id="free_gift_div">
-		<label class="control-label">{l s='Search a product'}</label>
-		<div class="controls">
-			<input type="text" id="giftProductFilter" class="input-large" value="{$giftProductFilter}" />
-		</div>
-		<div id="gift_products_found" {if $gift_product_select == ''}style="display:none"{/if}>
-			<div id="gift_product_list">
-				<label>{l s='Matching products'}</label>
-				<select name="gift_product" id="gift_product" onclick="displayProductAttributes();">
-					{$gift_product_select}
-				</select>
-			</div>
-			<div id="gift_attributes_list" {if !$hasAttribute}style="display:none"{/if}>
-				<label>{l s='Available combinations'}</label>
-				<div id="gift_attributes_list_select">
-					{$gift_product_attribute_select}
-				</div>
-			</div>
-		</div>
-		<div id="gift_products_err" class="alert alert-block" style="display:none"></div>
+<div id="free_gift_div" class="row">
+	<label class="control-label col-lg-3">{l s='Search a product'}</label>
+	<div class="input-group col-lg-5">
+		<input type="text" id="giftProductFilter" value="{$giftProductFilter}" />
+		<span class="input-group-addon"><i class="icon-search"></i></span>
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+<div id="gift_products_found" {if $gift_product_select == ''}style="display:none"{/if}>
+	<br/>
+	<div id="gift_product_list" class="row" >
+		<label class="control-label col-lg-3">{l s='Matching products'}</label>
+		<div class="col-lg-5">
+			<select name="gift_product" id="gift_product" onclick="displayProductAttributes();">
+				{$gift_product_select}
+			</select>
+		</div>
+	</div>
+	<div id="gift_attributes_list" class="row" {if !$hasAttribute}style="display:none"{/if}>
+		<label class="control-label col-lg-3">{l s='Available combinations'}</label>
+		<div class="col-lg-5" id="gift_attributes_list_select">
+			{$gift_product_attribute_select}
+		</div>
+	</div>
+</div>
+<div id="gift_products_err" class="alert alert-block" style="display:none"></div>
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
index 743d76b29..bd938e305 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
@@ -1,276 +1,302 @@
-<div class="control-group">
-	<label class="control-label">
+<div class="row">
+	<label class="control-label col-lg-3">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='Optional: The cart rule will be available to everyone if you leave this field blank.'}">
 			{l s='Limit to a single customer'}
 		</span>
 	</label>
-	<div class="controls">
+	<div class="input-group col-lg-4">
+		<span class="input-group-addon"><i class="icon-user"></i></i></span>
 		<input type="hidden" id="id_customer" name="id_customer" value="{$currentTab->getFieldValue($currentObject, 'id_customer')|intval}" />
 		<input type="text" id="customerFilter" class="input-xlarge" name="customerFilter" value="{$customerFilter|escape:'htmlall':'UTF-8'}" />
+		<span class="input-group-addon"><i class="icon-search"></i></span>
 	</div>
 </div>
 
-<div class="control-group">
-	<label class="control-label">
+<div class="row">
+	<label class="control-label col-lg-3">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='The default period is one month.'}">
 			{l s='Valid'}
 		</span>
 	</label>
-	<div class="controls">
-		<div class="input-prepend">
-  			<span class="add-on">{l s='From'}</span>
-			<input type="text" class="datepicker input-medium" name="date_from"
-			value="{if $currentTab->getFieldValue($currentObject, 'date_from')}{$currentTab->getFieldValue($currentObject, 'date_from')|escape}{else}{$defaultDateFrom}{/if}" />
-		</div>
-		<div class="input-prepend">
-			<span class="add-on">{l s='To'}</span>
-			<input type="text" class="datepicker input-medium" name="date_to"
-			value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')|escape}{else}{$defaultDateTo}{/if}" />
+	<div class="col-lg-9">
+		<div class="row">
+			<div class="input-group col-lg-6">
+				<span class="input-group-addon">{l s='From'}</span>
+				<input type="text" class="datepicker input-medium" name="date_from"
+				value="{if $currentTab->getFieldValue($currentObject, 'date_from')}{$currentTab->getFieldValue($currentObject, 'date_from')|escape}{else}{$defaultDateFrom}{/if}" />
+				<span class="input-group-addon"><i class="icon-calendar-empty"></i></span>
+			</div>
+			<div class="input-group col-lg-6">
+				<span class="input-group-addon">{l s='To'}</span>
+				<input type="text" class="datepicker input-medium" name="date_to"
+				value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')|escape}{else}{$defaultDateTo}{/if}" />
+				<span class="input-group-addon"><i class="icon-calendar-empty"></i></span>
+			</div>
 		</div>
 	</div>
 </div>
 
-<div class="control-group">
-	<label class="control-label">
+<div class="row">
+	<label class="control-label col-lg-3">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='You can choose a minimum amount for the cart either with or without the taxes and shipping.'}">
 			{l s='Minimum amount'}
 		</span>
 	</label>
-	<div class="controls">
-		<input type="text" class="input-mini" name="minimum_amount" value="{$currentTab->getFieldValue($currentObject, 'minimum_amount')|floatval}" />
-		<select name="minimum_amount_currency" class="input-small">
-		{foreach from=$currencies item='currency'}
-			<option value="{$currency.id_currency|intval}"
-			{if $currentTab->getFieldValue($currentObject, 'minimum_amount_currency') == $currency.id_currency
-				|| (!$currentTab->getFieldValue($currentObject, 'minimum_amount_currency') && $currency.id_currency == $defaultCurrency)}
-				selected="selected"
-			{/if}
-			>
-				{$currency.iso_code}
-			</option>
-		{/foreach}
-		</select>
-		<select name="minimum_amount_tax" class="input-small">
-			<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_tax') == 0}selected="selected"{/if}>{l s='Tax excluded'}</option>
-			<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_tax') == 1}selected="selected"{/if}>{l s='Tax included'}</option>
-		</select>
-		<select name="minimum_amount_shipping" class="input-medium">
-			<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 0}selected="selected"{/if}>{l s='Shipping excluded'}</option>
-			<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 1}selected="selected"{/if}>{l s='Shipping included'}</option>
-		</select>
+	<div class="col-lg-9">
+		<div class="row">
+			<div class="col-lg-3">
+				<input type="text" name="minimum_amount" value="{$currentTab->getFieldValue($currentObject, 'minimum_amount')|floatval}" />
+			</div>
+			<div class="col-lg-2">
+				<select name="minimum_amount_currency">
+				{foreach from=$currencies item='currency'}
+					<option value="{$currency.id_currency|intval}"
+					{if $currentTab->getFieldValue($currentObject, 'minimum_amount_currency') == $currency.id_currency
+						|| (!$currentTab->getFieldValue($currentObject, 'minimum_amount_currency') && $currency.id_currency == $defaultCurrency)}
+						selected="selected"
+					{/if}
+					>
+						{$currency.iso_code}
+					</option>
+				{/foreach}
+				</select>
+			</div>
+			<div class="col-lg-3">
+				<select name="minimum_amount_tax">
+					<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_tax') == 0}selected="selected"{/if}>{l s='Tax excluded'}</option>
+					<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_tax') == 1}selected="selected"{/if}>{l s='Tax included'}</option>
+				</select>
+			</div>
+			<div class="col-lg-4">
+				<select name="minimum_amount_shipping">
+					<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 0}selected="selected"{/if}>{l s='Shipping excluded'}</option>
+					<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 1}selected="selected"{/if}>{l s='Shipping included'}</option>
+				</select>
+			</div>
+		</div>
 	</div>
 </div>
 
-<div class="control-group">
-	<label class="control-label">
+<div class="row">
+	<label class="control-label col-lg-3">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='The cart rule will be applied to the first "X" customers only.'}">
 			{l s='Total available'}
 		</span>
 	</label>
-	<div class="controls">
-		<input type="text" class="input-mini" name="quantity" value="{$currentTab->getFieldValue($currentObject, 'quantity')|intval}" />
+	<div class="input-group col-lg-2">
+		<span class="input-group-addon">×</span>
+		<input type="text" name="quantity" value="{$currentTab->getFieldValue($currentObject, 'quantity')|intval}" />
 	</div>
 </div>
 
-<div class="control-group">
-	<label class="control-label">
+<div class="row">
+	<label class="control-label col-lg-3">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='A customer will only be able to use the cart rule "X" time(s).'}">
 			{l s='Total available for each user.'}
 		</span>
 	</label>
-	<div class="controls">
-		<input type="text" class="input-mini" name="quantity_per_user" value="{$currentTab->getFieldValue($currentObject, 'quantity_per_user')|intval}" />
+	<div class="input-group col-lg-2">
+		<span class="input-group-addon">×</span>
+		<input type="text" name="quantity_per_user" value="{$currentTab->getFieldValue($currentObject, 'quantity_per_user')|intval}" />
 	</div>
 </div>
 
 
-<div class="control-group">
-	{if $countries.unselected|@count + $countries.selected|@count > 1}
-	<div class="controls well">
-		<label class="checkbox">
-			<input type="checkbox" id="country_restriction" name="country_restriction" value="1" {if $countries.unselected|@count}checked="checked"{/if} />
-			{l s='Country selection'}
-		</label>
-		<div id="country_restriction_div">
-			<table>
-				<tr>
-					<td >
-						<p><strong>{l s='Unselected countries'}</strong></p>
-						<select id="country_select_1" class="input-large" multiple>
-							{foreach from=$countries.unselected item='country'}
-								<option value="{$country.id_country|intval}">&nbsp;{$country.name|escape}</option>
-							{/foreach}
-						</select>
-						<a id="country_select_add" class="btn btn-block clearfix">{l s='Add'} <i class="icon-arrow-right"></i></a>
-					</td>
-					<td>
-						<p><strong>{l s='Selected countries'}</strong></p>
-						<select name="country_select[]" id="country_select_2" class="input-large" multiple>
-							{foreach from=$countries.selected item='country'}
-								<option value="{$country.id_country|intval}">&nbsp;{$country.name|escape}</option>
-							{/foreach}
-						</select>
-						<a id="country_select_remove" class="btn btn-block clearfix"><i class="icon-arrow-left"></i> {l s='Remove'} </a>
-					</td>
-				</tr>
-			</table>
+
+<div class="row">
+	<label class="control-label col-lg-3">
+		<span class="label-tooltip" data-toggle="tooltip"
+			title="">
+			{l s='Restrictions'}
+		</span>
+	</label>
+	<div class="col-lg-8">
+		{if $countries.unselected|@count + $countries.selected|@count > 1}
+		<div class="row">
+			<label class="checkbox">
+				<input type="checkbox" id="country_restriction" name="country_restriction" value="1" {if $countries.unselected|@count}checked="checked"{/if} />
+				{l s='Country selection'}
+			</label>
 			<span class="help-block">{l s='This restriction applies to the country of delivery.'}</span>
+			<div id="country_restriction_div">
+				<table>
+					<tr>
+						<td >
+							<p>{l s='Unselected countries'}</p>
+							<select id="country_select_1" multiple>
+								{foreach from=$countries.unselected item='country'}
+									<option value="{$country.id_country|intval}">&nbsp;{$country.name|escape}</option>
+								{/foreach}
+							</select>
+							<a id="country_select_add" class="btn btn-block clearfix">{l s='Add'} <i class="icon-arrow-right"></i></a>
+						</td>
+						<td>
+							<p>{l s='Selected countries'}</p>
+							<select name="country_select[]" id="country_select_2" class="input-large" multiple>
+								{foreach from=$countries.selected item='country'}
+									<option value="{$country.id_country|intval}">&nbsp;{$country.name|escape}</option>
+								{/foreach}
+							</select>
+							<a id="country_select_remove" class="btn btn-block clearfix"><i class="icon-arrow-left"></i> {l s='Remove'} </a>
+						</td>
+					</tr>
+				</table>
+			</div>
 		</div>
-	</div>
-	{/if}
-	
-	{if $carriers.unselected|@count + $carriers.selected|@count > 1}
-	<div class="controls well">
-		<label class="checkbox">
-			<input type="checkbox" id="carrier_restriction" name="carrier_restriction" value="1" {if $carriers.unselected|@count}checked="checked"{/if} />
-			{l s='Carrier selection'}
-		</label>
-		<div id="carrier_restriction_div">
-			<table>
-				<tr>
-					<td>
-						<p><strong>{l s='Unselected carriers'}</strong></p>
-						<select id="carrier_select_1" class="input-large" multiple>
-							{foreach from=$carriers.unselected item='carrier'}
-								<option value="{$carrier.id_reference|intval}">&nbsp;{$carrier.name|escape}</option>
-							{/foreach}
-						</select>
-						<a id="carrier_select_add" class="btn btn-block clearfix" >{l s='Add'} <i class="icon-arrow-right"></i></a>
-					</td>
-					<td>
-						<p><strong>{l s='Selected carriers'}</strong></p>
-						<select name="carrier_select[]" id="carrier_select_2" class="input-large" multiple>
-							{foreach from=$carriers.selected item='carrier'}
-								<option value="{$carrier.id_reference|intval}">&nbsp;{$carrier.name|escape}</option>
-							{/foreach}
-						</select>
-						<a id="carrier_select_remove" class="btn btn-block clearfix"><i class="icon-arrow-left"></i> {l s='Remove'} </a>
-					</td>
-				</tr>
-			</table>
-		</div>
-	</div>
-	{/if}
+		{/if}
 
-	{if $groups.unselected|@count + $groups.selected|@count > 1}
-	<div class="controls well">
-		<label class="checkbox">
-			<input type="checkbox" id="group_restriction" name="group_restriction" value="1" {if $groups.unselected|@count}checked="checked"{/if} />
-			{l s='Customer group selection'}
-		</label>
-		<div id="group_restriction_div">
-			<table>
-				<tr>
-					<td>
-						<p><strong>{l s='Unselected groups'}</strong></p>
-						<select id="group_select_1" class="input-large" multiple>
-							{foreach from=$groups.unselected item='group'}
-								<option value="{$group.id_group|intval}">&nbsp;{$group.name|escape}</option>
-							{/foreach}
-						</select>
-						<a id="group_select_add" class="btn btn-block clearfix" >{l s='Add'} <i class="icon-arrow-right"></i></a>
-					</td>
-					<td>
-						<p><strong>{l s='Selected groups'}</strong></p>
-						<select name="group_select[]" class="input-large" id="group_select_2" multiple>
-							{foreach from=$groups.selected item='group'}
-								<option value="{$group.id_group|intval}">&nbsp;{$group.name|escape}</option>
-							{/foreach}
-						</select>
-						<a id="group_select_remove" class="btn btn-block clearfix" ><i class="icon-arrow-left"></i> {l s='Remove'}</a>
-					</td>
-				</tr>
-			</table>
+		{if $carriers.unselected|@count + $carriers.selected|@count > 1}
+		<div class="row">
+			<label class="checkbox">
+				<input type="checkbox" id="carrier_restriction" name="carrier_restriction" value="1" {if $carriers.unselected|@count}checked="checked"{/if} />
+				{l s='Carrier selection'}
+			</label>
+			<div id="carrier_restriction_div">
+				<table class="col-lg-12">
+					<tr>
+						<td>
+							<p>{l s='Unselected carriers'}</p>
+							<select id="carrier_select_1" class="input-large" multiple>
+								{foreach from=$carriers.unselected item='carrier'}
+									<option value="{$carrier.id_reference|intval}">&nbsp;{$carrier.name|escape}</option>
+								{/foreach}
+							</select>
+							<a id="carrier_select_add" class="btn btn-default btn-block clearfix" >{l s='Add'} <i class="icon-arrow-right"></i></a>
+						</td>
+						<td>
+							<p>{l s='Selected carriers'}</p>
+							<select name="carrier_select[]" id="carrier_select_2" class="input-large" multiple>
+								{foreach from=$carriers.selected item='carrier'}
+									<option value="{$carrier.id_reference|intval}">&nbsp;{$carrier.name|escape}</option>
+								{/foreach}
+							</select>
+							<a id="carrier_select_remove" class="btn btn-default btn-block clearfix"><i class="icon-arrow-left"></i> {l s='Remove'} </a>
+						</td>
+					</tr>
+				</table>
+			</div>
 		</div>
-	</div>
-	{/if}
+		{/if}
 
-	{if $cart_rules.unselected|@count + $cart_rules.selected|@count > 0}
-	<div class="controls well">
-		<label class="checkbox">
-			<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} />
-			{l s='Compatibility with other cart rules'}
-		</label>
-		<div id="cart_rule_restriction_div" >
-			<table>
-				<tr>
-					<td style="padding-left:20px;">
-						<p><strong>{l s='Uncombinable cart rules'}</strong></p>
-						<select id="cart_rule_select_1" class="input-large" multiple="">
-							{foreach from=$cart_rules.unselected item='cart_rule'}
-								<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name|escape}</option>
-							{/foreach}
-						</select>
-						<a id="cart_rule_select_add" class="btn btn-block clearfix">{l s='Add'} <i class="icon-arrow-right"></i></a>
-					</td>
-					<td>
-						<p><strong>{l s='Combinable cart rules'}</strong></p>
-						<select name="cart_rule_select[]" class="input-large" id="cart_rule_select_2" multiple>
-							{foreach from=$cart_rules.selected item='cart_rule'}
-								<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name|escape}</option>
-							{/foreach}
-						</select>
-						<a id="cart_rule_select_remove" class="btn btn-block clearfix" ><i class="icon-arrow-left"></i> {l s='Remove'}</a>
-					</td>
-				</tr>
-			</table>
+		{if $groups.unselected|@count + $groups.selected|@count > 1}
+		<div class="row">
+			<label class="checkbox">
+				<input type="checkbox" id="group_restriction" name="group_restriction" value="1" {if $groups.unselected|@count}checked="checked"{/if} />
+				{l s='Customer group selection'}
+			</label>
+			<div id="group_restriction_div">
+				<table class="col-lg-12">
+					<tr>
+						<td>
+							<p>{l s='Unselected groups'}</p>
+							<select id="group_select_1" class="input-large" multiple>
+								{foreach from=$groups.unselected item='group'}
+									<option value="{$group.id_group|intval}">&nbsp;{$group.name|escape}</option>
+								{/foreach}
+							</select>
+							<a id="group_select_add" class="btn btn-default btn-block clearfix" >{l s='Add'} <i class="icon-arrow-right"></i></a>
+						</td>
+						<td>
+							<p>{l s='Selected groups'}</p>
+							<select name="group_select[]" class="input-large" id="group_select_2" multiple>
+								{foreach from=$groups.selected item='group'}
+									<option value="{$group.id_group|intval}">&nbsp;{$group.name|escape}</option>
+								{/foreach}
+							</select>
+							<a id="group_select_remove" class="btn btn-default btn-block clearfix" ><i class="icon-arrow-left"></i> {l s='Remove'}</a>
+						</td>
+					</tr>
+				</table>
+			</div>
 		</div>
-	</div>
-	{/if}
+		{/if}
 
-	<div class="controls well">
-		<label class="checkbox">
-			<input type="checkbox" id="product_restriction" name="product_restriction" value="1" {if $product_rule_groups|@count}checked="checked"{/if} />
-			{l s='Product selection'}
-		</label>
-		<div id="product_restriction_div">
-			<table id="product_rule_group_table" cellpadding="0" cellspacing="0">
-				{foreach from=$product_rule_groups item='product_rule_group'}
-					{$product_rule_group}
-				{/foreach}
-			</table>
-			<a href="javascript:addProductRuleGroup();" class="btn">
-				<i class="icon-plus-sign"></i> {l s='Product selection'}
-			</a>
+		{if $cart_rules.unselected|@count + $cart_rules.selected|@count > 0}
+		<div class="row">
+			<label class="checkbox">
+				<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} />
+				{l s='Compatibility with other cart rules'}
+			</label>
+			<div id="cart_rule_restriction_div" >
+				<table class="col-lg-12">
+					<tr>
+						<td>
+							<p>{l s='Uncombinable cart rules'}</p>
+							<select id="cart_rule_select_1" multiple="">
+								{foreach from=$cart_rules.unselected item='cart_rule'}
+									<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name|escape}</option>
+								{/foreach}
+							</select>
+							<a id="cart_rule_select_add" class="btn btn-default btn-block clearfix">{l s='Add'} <i class="icon-arrow-right"></i></a>
+						</td>
+						<td>
+							<p>{l s='Combinable cart rules'}</p>
+							<select name="cart_rule_select[]" id="cart_rule_select_2" multiple>
+								{foreach from=$cart_rules.selected item='cart_rule'}
+									<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name|escape}</option>
+								{/foreach}
+							</select>
+							<a id="cart_rule_select_remove" class="btn btn-default btn-block clearfix" ><i class="icon-arrow-left"></i> {l s='Remove'}</a>
+						</td>
+					</tr>
+				</table>
+			</div>
 		</div>
-	</div>
+		{/if}
 
-	{if $shops.unselected|@count + $shops.selected|@count > 1}
-	<div class="controls well">
-		<label class="checkbox">
-			<input type="checkbox" id="shop_restriction" name="shop_restriction" value="1" {if $shops.unselected|@count}checked="checked"{/if} />
-			{l s='Shop selection'}
-		</label>
-		<div id="shop_restriction_div" >
-			<table>
-				<tr>
-					<td>
-						<p><strong>{l s='Unselected shops'}</strong></p>
-						<select id="shop_select_1" multiple>
-							{foreach from=$shops.unselected item='shop'}
-								<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option>
-							{/foreach}
-						</select>
-						<a id="shop_select_add" class="btn" >{l s='Add'} &gt;&gt; </a>
-					</td>
-					<td>
-						<p><strong>{l s='Selected shops'}</strong></p>
-						<select name="shop_select[]" id="shop_select_2" multiple>
-							{foreach from=$shops.selected item='shop'}
-								<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option>
-							{/foreach}
-						</select>
-						<a id="shop_select_remove" class="btn" > &lt;&lt; {l s='Remove'} </a>
-					</td>
-				</tr>
-			</table>
+		<div class="row">
+			<label class="checkbox">
+				<input type="checkbox" id="product_restriction" name="product_restriction" value="1" {if $product_rule_groups|@count}checked="checked"{/if} />
+				{l s='Product selection'}
+			</label>
+			<div id="product_restriction_div">
+				<table id="product_rule_group_table" cellpadding="0" cellspacing="0">
+					{foreach from=$product_rule_groups item='product_rule_group'}
+						{$product_rule_group}
+					{/foreach}
+				</table>
+				<a href="javascript:addProductRuleGroup();" class="btn btn-default ">
+					<i class="icon-plus-sign"></i> {l s='Product selection'}
+				</a>
+			</div>
 		</div>
+
+		{if $shops.unselected|@count + $shops.selected|@count > 1}
+		<div class="row">
+			<label class="checkbox">
+				<input type="checkbox" id="shop_restriction" name="shop_restriction" value="1" {if $shops.unselected|@count}checked="checked"{/if} />
+				{l s='Shop selection'}
+			</label>
+			<div id="shop_restriction_div" >
+				<table class="col-lg-12">
+					<tr>
+						<td>
+							<p>{l s='Unselected shops'}</p>
+							<select id="shop_select_1" multiple>
+								{foreach from=$shops.unselected item='shop'}
+									<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option>
+								{/foreach}
+							</select>
+							<a id="shop_select_add" class="btn btn-default" >{l s='Add'} &gt;&gt; </a>
+						</td>
+						<td>
+							<p>{l s='Selected shops'}</p>
+							<select name="shop_select[]" id="shop_select_2" multiple>
+								{foreach from=$shops.selected item='shop'}
+									<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option>
+								{/foreach}
+							</select>
+							<a id="shop_select_remove" class="btn" > &lt;&lt; {l s='Remove'} </a>
+						</td>
+					</tr>
+				</table>
+			</div>
+		</div>
+		{/if}
 	</div>
-	{/if}
-	
 </div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
index 59ed241b8..04bf8747a 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
@@ -24,22 +24,21 @@
 	<form action="{$currentIndex|escape}&token={$currentToken|escape}&addcart_rule" id="cart_rule_form" class="form-horizontal" method="post">
 		{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
 		<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
-		<div id="cart_rule_informations" class="cart_rule_tab">
-			<h2>{l s='Cart-rule information'}</h2>
+		<fieldset id="cart_rule_informations" class="cart_rule_tab">
+			<legend>{l s='Cart-rule information'}</legend>
 			{include file='controllers/cart_rules/informations.tpl'}
-		</div>
-		<div id="cart_rule_conditions" class="cart_rule_tab">
-			<h2>{l s='Cart-rule conditions'}</h2>
+		</fieldset>
+		<fieldset id="cart_rule_conditions" class="cart_rule_tab">
+			<legend>{l s='Cart-rule conditions'}</legend>
 			{include file='controllers/cart_rules/conditions.tpl'}
-		</div>
-		<div id="cart_rule_actions" class="cart_rule_tab">
-			<h2>{l s='Cart-rule actions'}</h2>
+		</fieldset>
+		<fieldset id="cart_rule_actions" class="cart_rule_tab">
+			<legend>{l s='Cart-rule actions'}</legend>
 			{include file='controllers/cart_rules/actions.tpl'}
-		</div>
-		<div>
-			<input type="submit" value="{l s='Save'}" class="btn" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn" />
-			<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
-		</div>
+		</fieldset>
+		<hr/>
+		<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn"><i class="icon-save"></i> {l s='Save'}</button>
+		<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
 	</form>
 </div>
 
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
index 7528125f7..eadbf5770 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
@@ -1,5 +1,5 @@
 <div class="row">	
-	<label class="col-lg-3 control-label required">
+	<label class="control-label col-lg-3 required">
 		<span class="label-tooltip" data-toggle="tooltip"
 		title="{l s='This will be displayed in the cart summary, as well as on the invoice.'}">
 			{l s='Name'}
@@ -7,7 +7,7 @@
 	</label>
 
 	<!-- For demo -->
-	<div class="input-group col-lg-5">
+	<div class="input-group col-lg-8">
 		{foreach from=$languages item=language}
 		<input id="name_{$language.id_lang|intval}" type="text"  name="name_{$language.id_lang|intval}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang|intval)|escape:html:'UTF-8'}">
 		<div class="input-group-btn">
@@ -34,19 +34,19 @@
 </div>
 
 <div class="row">
-	<label class="col-lg-3 control-label">
+	<label class="control-label col-lg-3">
 		<span class="label-tooltip" data-toggle="tooltip"
 		title="{l s='For your eyes only. This will never be displayed to the customer.'}">
 			{l s='Description'}
 		</span>
 	</label>
-	<div class="col-lg-5">
+	<div class="col-lg-8">
 		<textarea name="description" rows="2" >{$currentTab->getFieldValue($currentObject, 'description')|escape}</textarea>
 	</div>
 </div>
 
 <div class="row">
-	<label class="col-lg-3 control-label">
+	<label class="control-label col-lg-3">
 		<span class="label-tooltip" data-toggle="tooltip"
 		title="{l s='Caution! The rule will automatically be applied if you leave this field blank.'}">
 			{l s='Code'}
@@ -61,14 +61,14 @@
 </div>
 
 <div class="row">
-	<label class="col-lg-3 control-label">
+	<label class="control-label col-lg-3">
 		<span class="label-tooltip" data-toggle="tooltip"
 		title="{l s='If the voucher is not yet in the cart, it will be displayed in the cart summary.'}">
 			{l s='Highlight'}
 		</span>
 	</label>
 	<div class="input-group col-lg-2">
-		<span class="switch candy">
+		<span class="switch prestashop-switch">
 			<input type="radio" name="highlight" id="highlight_on" value="1" {if $currentTab->getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if}/>
 			<label class="t radio" for="highlight_on"><i class="icon-check-sign"></i> {l s='Yes'}</label>
 			<input type="radio" name="highlight" id="highlight_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if} />
@@ -79,7 +79,7 @@
 </div>
 
 <div class="row">
-	<label class="col-lg-3 control-label">
+	<label class="control-label col-lg-3">
 		<span class="label-tooltip" data-toggle="tooltip"
 		title="{l s='Only applicable if the voucher value is greater than the cart total.'}
 		{l s='If you do not allow partial use, the voucher value will be lowered to the total order amount. If you allow partial use, however, a new voucher will be created with the remainder.'}">
@@ -87,7 +87,7 @@
 		</span>
 	</label>
 	<div class="input-group col-lg-2">
-		<span class="switch candy">
+		<span class="switch prestashop-switch">
 			<input type="radio" name="partial_use" id="partial_use_on" value="1" {if $currentTab->getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} />
 			<label class="t radio" for="partial_use_on"><i class="icon-check-sign"></i> {l s='Yes'}</label>
 			<input type="radio" name="partial_use" id="partial_use_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} />
@@ -98,7 +98,7 @@
 </div>
 
 <div class="row">
-	<label class="col-lg-3 control-label">
+	<label class="control-label col-lg-3">
 		<span class="label-tooltip" data-toggle="tooltip"
 		title="{l s='Cart rules are applied by priority. A cart rule with a priority of "1" will be processed before a cart rule with a priority of "2".'}">
 			{l s='Priority'}
@@ -110,9 +110,9 @@
 </div>
 
 <div class="row">
-	<label class="col-lg-3 control-label">{l s='Status'}</label>
+	<label class="control-label col-lg-3">{l s='Status'}</label>
 	<div class="input-group col-lg-2">
-		<span class="switch candy">
+		<span class="switch prestashop-switch">
 			<input type="radio" name="active" id="active_on" value="1" {if $currentTab->getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} />
 			<label class="t radio" for="active_on"><i class="icon-check-sign"></i> {l s='Yes'}</label>
 			<input type="radio" name="active" id="active_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} />
@@ -120,5 +120,4 @@
 			<span class="slide-button btn btn-default"></span>
 		</span>
 	</div>
-</div>
-<hr/>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index 8f8280821..9ac6921b9 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -63,9 +63,9 @@
 {/block}
 
 {block name="defaultForm"}
-	<div>
+	<div class="row-fluid">
 		<div class="productTabs" style="display:none;">
-			<ul class="tab">
+			<ul class="tab nav nav-tabs">
 			{*todo href when nojs*}
 			{foreach $product_tabs key=numStep item=tab}
 				<li class="tab-row">
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl
index faa1f679d..3960c35a8 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl
@@ -54,17 +54,21 @@
 
 		</script>
 		<div class="bloc-leadin">
+
 			<div id="container_category_tree">
+
 				<a href="#" id="toggle_category_tree">
 					<form>
 						<input type="checkbox" {if $is_category_filter}checked="checked"{/if} />{l s='Filter by category'}
 					</form>
 				</a>
+
 				<div id="block_category_tree" {if !$is_category_filter}style="display:none"{/if}>
-					<br />
 					{$category_tree}
 				</div>
+				
 			</div>
+
 		</div>
 	{/if}
 {/block}
diff --git a/admin-dev/themes/default/template/footer.tpl b/admin-dev/themes/default/template/footer.tpl
index 8a13abb98..2e4c36636 100644
--- a/admin-dev/themes/default/template/footer.tpl
+++ b/admin-dev/themes/default/template/footer.tpl
@@ -29,25 +29,23 @@
 {if $display_footer}
 {hook h="displayBackOfficeFooter"}
 	<div id="footer">
-		<div class="footerLeft">
+		<div class="footerLeft col-lg-4">
 			<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br />
-			<span>{l s='Load time: '}{number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
+			<span>{l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
 		</div>
-		<div class="footerRight">
-			{if $iso_is_fr}
-				<span>Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h
-			{/if}
-			|&nbsp;<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
+		<div class="footerRight col-lg-8">
+			<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
 			|&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
-			|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>	
+			|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
+			{if $iso_is_fr}
+			<p>Questions / Renseignements / Formations : 
+				<strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h
+			<p>
+			{/if}
 		</div>
-		<div class="span pull-right">
-			<span class="go-top"><i class="icon-angle-up"></i></span>
-      	</div>
 	</div>
 	<div id="ajax_confirmation" style="display:none"></div>
 {* ajaxBox allows*}	<div id="ajaxBox" style="display:none"></div>
 {/if}
-	<div id="scrollTop"><a href="#top"></a></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 0522320e0..94585c7f3 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -103,6 +103,8 @@
 	</style>
 {/if}
 
+<link href='http://fonts.googleapis.com/css?family=Ubuntu:300|Open+Sans' rel='stylesheet' type='text/css'>
+
 </head>
 
 <body class="fixed-top">
@@ -120,7 +122,7 @@
 					<li id="orders_notif" class="dropdown" >
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 							<i class="icon-shopping-cart"></i>&nbsp;<span class="caret"></span>
-							<span id="orders_notif_number_wrapper" class="badge pull-right">
+							<span id="orders_notif_number_wrapper" class="badge">
 								<span id="orders_notif_value">0</span>
 							</span>
 						</a>
@@ -137,7 +139,7 @@
 					<li id="customers_notif" class="notifs dropdown">
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 							<i class="icon-user"></i>&nbsp;<span class="caret"></span>
-							<span id="customers_notif_number_wrapper" class="badge pull-right">
+							<span id="customers_notif_number_wrapper" class="badge">
 								<span id="customers_notif_value">0</span>
 							</span>
 						</a>
@@ -154,7 +156,7 @@
 					<li id="customer_messages_notif" class="notifs dropdown">
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 							<i class="icon-envelope"></i>&nbsp;<span class="caret"></span>
-							<span id="customer_messages_notif_number_wrapper" class="badge pull-right">
+							<span id="customer_messages_notif_number_wrapper" class="badge">
 								<span id="customer_messages_notif_value" >0</span>
 							</span>
 						</a>
@@ -173,10 +175,11 @@
 				<li id="employee_infos" class="dropdown">
 					<a href='#' class="employee_name dropdown-toggle" data-toggle="dropdown">{$first_name}&nbsp;{$last_name} <i class="icon-angle-down"></i></a>
 					<ul id="employee_links" class="dropdown-menu">
-						<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'htmlall':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee">{l s='My preferences'}</a></li>
-						<li><a id="header_logout" href="index.php?logout">{l s='logout'}</a></li>
+						<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'htmlall':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee"><i class="icon-wrench"></i> {l s='My preferences'}</a></li>
+						<li><a id="header_logout" href="index.php?logout"><i class="icon-signout"></i> {l s='logout'}</a></li>
 {if {$base_url}}
-						<li><a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}">{l s='View my shop'}</a></li>
+						<li class="divider"></li>
+						<li><a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}"><i class="icon-eye-open"></i> {l s='View my shop'}</a></li>
 {/if}
 					</ul>
 				</li>
@@ -219,7 +222,7 @@
 {/if}
 
 			<span id="ajax_running" class="navbar-text">
-				<img src="../img/admin/ajax-loader-yellow.gif" alt="" /> {l s='Loading...'}
+				<i class="icon-refresh icon-spin"></i> {l s='Loading...'}
 			</span>
 
 
diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
index 10599581f..27d63ff73 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -136,13 +136,13 @@
 	{/if}
 	{if $has_actions}
 		<td>
-			<div class="btn-group">	
+			<div class="btn-group btn-group-action">
 			{foreach $actions AS $key => $action}
 				{if $key==0}
-				<span class="btn btn-default">
+				<span class="btn btn-default btn-small">
 					{$tr.$action}
 				</span>
-				<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+				<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
 					<span class="caret"></span>&nbsp;
 				</button>
 				<ul class="dropdown-menu">
@@ -161,6 +161,6 @@
 	</tr>
 {/foreach}
 {else}
-	<tr><td class="center" colspan="{count($fields_display) + 2}">{l s='No items found'}</td></tr>
+	<tr><td class="center" colspan="{count($fields_display) + 2}"><i class="icon-warning-sign"></i> {l s='No items found'}</td></tr>
 {/if}
 </tbody>
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 26e89ba08..f2bbf89b2 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -77,47 +77,61 @@
 	{hook h=$hookName}
 {/if}
 
+
 {if !$simple_header}
-<form method="post" action="{$action}" class="form">
+<form method="post" action="{$action}" class="form-inline">
 	<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
 {/if}
-	<div class="well">
-		{if !$simple_header}
+
+	{if !$simple_header}
+	<fieldset class="well">
 		<span>
-			{if $page > 1}
-				<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp;
-				<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$table}').value={$page - 1}"/>
-			{/if}
+		{if $page > 1}
+			<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp;
+			<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$table}').value={$page - 1}"/>
+		{/if}
 
 			{l s='Page'} <b>{$page}</b> / {$total_pages}
-			{if $page < $total_pages}
-				<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$table}').value={$page + 1}"/>&nbsp;
-				<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$table}').value={$total_pages}"/>
-			{/if}
 
-			| {l s='Display'}
+		{if $page < $total_pages}
+			<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$table}').value={$page + 1}"/>&nbsp;
+			<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$table}').value={$total_pages}"/>
+		{/if}
+		</span>
 
-			<select class="input-mini" name="pagination" onchange="submit()">
+		<span>
+			&nbsp;|&nbsp;
+			<label >
+			{l s='Display'}
+			</label>
+			
+			<select class="filter fixed-width-S" name="pagination" onchange="submit()">
 				{* Choose number of results per page *}
 				{foreach $pagination AS $value}
 					<option value="{$value|intval}"{if $selected_pagination == $value} selected="selected" {elseif $selected_pagination == NULL && $value == $pagination[1]} selected="selected2"{/if}>{$value|intval}</option>
 				{/foreach}
 			</select>
+		</span>
 
-			/ {$list_total} {l s='result(s)'}
+		<span> / {$list_total} {l s='result(s)'}</span>
+		
+		<span class="pull-right">
+			<button type="submit" name="submitReset{$table}" class="btn btn-small">
+				<i class="icon-eraser"></i> {l s='Reset'}
+			</button>
+			<button type="submit" id="submitFilterButton{$table}" name="submitFilter" class="btn btn-default btn-small" />
+				<i class="icon-filter"></i> {l s='Filter'}
+			</button>
 		</span>
-		<span>
-			<input type="submit" name="submitReset{$table}" value="{l s='Reset'}" class="btn" />
-			<input type="submit" id="submitFilterButton{$table}" name="submitFilter" value="{l s='Filter'}" class="btn" />
-		</span>
-		{/if}
-		</div>
-		<table 
-		class="table table-striped table-bordered"
+	</fieldset>
+	{/if}
+	
+	<table 
+		class="table table-striped table-bordered table-hover"
 		{if $table_id} id={$table_id}{/if}
 		class="table {if $table_dnd}tableDnD{/if} {$table}"
 		cellpadding="0" cellspacing="0">
-			<!-- <col width="10px" />
+			{* <col width="10px" />
 			{foreach $fields_display AS $key => $params}
 				<col {if isset($params.width) && $params.width != 'auto'}width="{$params.width}px"{/if}/>
 			{/foreach}
@@ -125,8 +139,8 @@
 				<col width="80px" />
 			{/if}
 			{if $has_actions}
-				<col width="52px" />
-			{/if} -->
+				<col width="200px" />
+			{/if} *}
 			<thead>
 				<tr class="nodrag nodrop">
 					<th class="center">
@@ -136,15 +150,20 @@
 					</th>
 					{foreach $fields_display AS $key => $params}
 						<th {if isset($params.align)} class="{$params.align}"{/if}>
-							{if isset($params.hint)}<span class="alert alert-info" name="help_box">{$params.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-							<span class="title_box">
+							{if isset($params.hint)}
+								<span class="alert alert-info" name="help_box">{$params.hint}<span class="hint-pointer">&nbsp;</span></span>
+							{/if}
+							<span class="title_box {if isset($order_by) && ($key == $order_by)} active{/if}">
 								{$params.title}
-							</span>
 							{if (!isset($params.orderby) || $params.orderby) && !$simple_header}
-								<a href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
-								<img border="0" src="../img/admin/down{if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}_d{/if}.gif" /></a>
-								<a href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=asc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
-								<img border="0" src="../img/admin/up{if isset($order_by) && ($key == $order_by) && ($order_way == 'ASC')}_d{/if}.gif" /></a>
+								<a {if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}class="active"{/if}  href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
+								<i class="icon-caret-down"></i>
+								</a>
+
+								<a {if isset($order_by) && ($key == $order_by) && ($order_way == 'ASC')}class="active"{/if} href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=asc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
+								<i class="icon-caret-up"></i>
+								</a>
+							</span>
 							{elseif !$simple_header}
 							{/if}
 						</th>
@@ -178,7 +197,7 @@
 								--
 							{else}
 								{if $params.type == 'bool'}
-									<select class="input-mini" onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$key}">
+									<select class="filter" onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$key}">
 										<option value="">--</option>
 										<option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option>
 										<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
@@ -188,7 +207,7 @@
 									{l s='To'} <input type="text" class="filter datepicker" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
 								{elseif $params.type == 'select'}
 									{if isset($params.filter_key)}
-										<select onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
+										<select class="filter" onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
 											<option value="" {if $params.value == ''} selected="selected" {/if}>--</option>
 											{if isset($params.list) && is_array($params.list)}
 												{foreach $params.list AS $option_value => $option_display}
@@ -198,7 +217,7 @@
 										</select>
 									{/if}
 								{else}
-									<input type="text" class="filter input-small" name="{$table}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
+									<input type="text" class="filter" name="{$table}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
 								{/if}
 							{/if}
 						</td>
diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index b74b31949..cecd58b58 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -39,11 +39,11 @@ class AdminCartRulesControllerCore extends AdminController
 	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
 
 		$this->fields_list = array(
-			'id_cart_rule' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
+			'id_cart_rule' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 40),
 			'name' => array('title' => $this->l('Name')),
-			'priority' => array('title' => $this->l('Priority'), 'width' => 25),
+			'priority' => array('title' => $this->l('Priority'), 'width' => 40),
 			'code' => array('title' => $this->l('Code')),
-			'quantity' => array('title' => $this->l('Quantity'), 'width' => 25),
+			'quantity' => array('title' => $this->l('Quantity'), 'width' => 40),
 			'date_to' => array('title' => $this->l('Until')),
 			'active' => array('title' => $this->l('Status'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false),
 		);
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index ccef97b8f..1d8572b66 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -58,6 +58,7 @@ class AdminProductsControllerCore extends AdminController
 
 	public function __construct()
 	{
+		$this->bootstrap = true;
 		$this->table = 'product';
 		$this->className = 'Product';
 		$this->lang = true;
@@ -201,7 +202,7 @@ class AdminProductsControllerCore extends AdminController
 		$this->fields_list['id_product'] = array(
 			'title' => $this->l('ID'),
 			'align' => 'center',
-			'width' => 20
+			'width' => 40
 		);
 		$this->fields_list['image'] = array(
 			'title' => $this->l('Photo'),
@@ -255,7 +256,7 @@ class AdminProductsControllerCore extends AdminController
 			'align' => 'right',
 			'filter_key' => 'sav!quantity',
 			'orderby' => true,
-			'hint' => $this->l('This is the quantity available in the current shop/group.'),
+			//'hint' => $this->l('This is the quantity available in the current shop/group.'),
 		);
 		$this->fields_list['active'] = array(
 			'title' => $this->l('Status'),