diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 5fdaca21e..2b6127732 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -1,4 +1,4 @@
-/*!
+/*
  * Bootstrap v3.0.0
  *
  * Copyright 2013 Twitter, Inc
@@ -7,7 +7,7 @@
  *
  * Designed and built with all the love in the world by @mdo and @fat.
  */
-/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
+/* normalize.css v2.1.0 | MIT License | git.io/normalize */
 /* line 22, ../bower_components/sass-bootstrap/lib/_normalize.scss */
 article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary {
   display: block; }
@@ -5717,7 +5717,7 @@ th.visible-print, td.visible-print {
   /* line 523, ../bower_components/sass-bootstrap/lib/_mixins.scss */
   th.hidden-print, td.hidden-print {
     display: none !important; } }
-/*!
+/*
  *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
@@ -7652,10 +7652,10 @@ html, body {
   text-transform: uppercase;
   background-color: white;
   border-bottom: solid 1px #cccccc; }
-/* line 108, admin-theme.sass */
+/* line 109, admin-theme.sass */
 #content h3:not(.modal-title) i, #content .panel-heading:not(.modal-title) i, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) i, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header:not(.modal-title) i, #content h3:not(.modal-title) a, #content .panel-heading:not(.modal-title) a, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) a, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header:not(.modal-title) a, #content .panel-heading i, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header i, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header i, #content .panel-heading a, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header a, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header a {
   color: contrasted(#e6e8e3); }
-/* line 110, admin-theme.sass */
+/* line 111, admin-theme.sass */
 #content h3:not(.modal-title) .badge, #content .panel-heading:not(.modal-title) .badge, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .badge, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header:not(.modal-title) .badge, #content h3:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content h3:not(.modal-title) .notifs_badge, #content .panel-heading:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content .panel-heading:not(.modal-title) .notifs_badge, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header:not(.modal-title) .notifs_badge, #content .panel-heading .badge, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .badge, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .badge, #content .panel-heading #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content .panel-heading .notifs_badge, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .notifs_badge {
   background-color: white;
   -webkit-border-radius: none;
@@ -7670,33 +7670,33 @@ html, body {
   font-weight: 300;
   float: left;
   margin-left: -5px; }
-/* line 120, admin-theme.sass */
+/* line 121, admin-theme.sass */
 #content h3:not(.modal-title) .panel-heading-action, #content .panel-heading:not(.modal-title) .panel-heading-action, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header:not(.modal-title) .panel-heading-action, #content .panel-heading .panel-heading-action, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action {
   margin-right: -5px; }
-/* line 123, admin-theme.sass */
+/* line 124, admin-theme.sass */
 #content h3:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #content .panel-heading:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #content .panel-heading .panel-heading-action a.list-toolbar-btn, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action a.list-toolbar-btn, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action a.list-toolbar-btn {
   float: left;
   height: 30px;
   width: 30px;
   color: #1ba6e5;
   border-left: solid 1px #cccccc; }
-/* line 129, admin-theme.sass */
+/* line 130, admin-theme.sass */
 #content h3:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #content .panel-heading:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #content .panel-heading .panel-heading-action a.list-toolbar-btn:hover, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action a.list-toolbar-btn:hover, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action a.list-toolbar-btn:hover {
   text-decoration: none;
   color: black; }
-/* line 132, admin-theme.sass */
+/* line 133, admin-theme.sass */
 #content h3:not(.modal-title) .panel-heading-action a.list-toolbar-btn i, #content .panel-heading:not(.modal-title) .panel-heading-action a.list-toolbar-btn i, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn i, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn i, #content .panel-heading .panel-heading-action a.list-toolbar-btn i, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action a.list-toolbar-btn i, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action a.list-toolbar-btn i {
   text-align: center;
   font-size: 1.3em;
   line-height: 30px; }
-/* line 136, admin-theme.sass */
+/* line 137, admin-theme.sass */
 #content .panel-danger .panel-heading, #content .panel-danger #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header, #header_notifs_icon_wrapper .notifs_panel #content .panel-danger .notifs_panel_header {
   background-color: #8bc954 !important; }
-/* line 138, admin-theme.sass */
+/* line 139, admin-theme.sass */
 #content .panel-heading-big {
   font-size: 2em;
   text-align: center; }
-/* line 141, admin-theme.sass */
+/* line 142, admin-theme.sass */
 #content form .alert, #content form #carrier_wizard .wizard_error, #carrier_wizard #content form .wizard_error {
   clear: both; }
 @media (max-width: 768px) {
@@ -7705,7 +7705,7 @@ html, body {
     margin-left: 0;
     width: 100%; } }
 
-/* line 148, admin-theme.sass */
+/* line 149, admin-theme.sass */
 .page-head {
   width: 100%;
   height: 55px;
@@ -7719,28 +7719,31 @@ html, body {
   background-color: #8fc04d;
   -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0;
   box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0; }
-/* line 160, admin-theme.sass */
+/* line 161, admin-theme.sass */
 .page-head h2.page-title {
   padding: 0 0 0 260px;
   font-size: 18px;
   color: white;
   text-transform: uppercase; }
 @media (max-width: 768px) {
-  /* line 160, admin-theme.sass */
+  /* line 161, admin-theme.sass */
   .page-head h2.page-title {
     padding: 0 0 0 20px; } }
-/* line 168, admin-theme.sass */
+/* line 169, admin-theme.sass */
+.page-head a {
+  color: white; }
+/* line 171, admin-theme.sass */
 .page-head .btn-toolbar {
   margin: 0;
   padding: 3px 0 0 0; }
-/* line 171, admin-theme.sass */
+/* line 174, admin-theme.sass */
 .page-head .btn-toolbar .nav-tabs {
   margin: 0; }
-/* line 173, admin-theme.sass */
+/* line 176, admin-theme.sass */
 .page-head .btn-toolbar .nav-tabs > li > a {
   color: #333333; }
 
-/* line 177, admin-theme.sass */
+/* line 180, admin-theme.sass */
 .toolbar_btn {
   position: relative;
   padding: 2px 5px !important;
@@ -7750,13 +7753,13 @@ html, body {
   color: white;
   text-align: center;
   text-shadow: none; }
-/* line 186, admin-theme.sass */
+/* line 189, admin-theme.sass */
 .toolbar_btn:hover {
   color: #8fc04d;
   border-color: white;
   background-color: white !important; }
 
-/* line 191, admin-theme.sass */
+/* line 194, admin-theme.sass */
 [class^="process-icon-"], [class*=" process-icon-"] {
   height: 25px;
   min-width: 32px;
@@ -7772,20 +7775,20 @@ html, body {
   -webkit-font-smoothing: antialiased;
   *margin-right: 0.3em; }
 
-/* line 265, admin-theme.sass */
+/* line 266, admin-theme.sass */
 .navbar-inner {
   box-shadow: none !important; }
-/* line 267, admin-theme.sass */
+/* line 268, admin-theme.sass */
 .navbar-inner .input-append {
   margin-bottom: 0; }
 
-/* line 271, admin-theme.sass */
+/* line 272, admin-theme.sass */
 label.control-label {
   font-size: 13px;
   font-weight: normal;
   color: #666666; }
 
-/* line 276, admin-theme.sass */
+/* line 277, admin-theme.sass */
 label.control-label span.label-tooltip {
   text-decoration: none;
   font-size: 13px;
@@ -7799,11 +7802,11 @@ label.control-label span.label-tooltip {
   -o-border-radius: 3px;
   border-radius: 3px; }
 
-/* line 285, admin-theme.sass */
+/* line 286, admin-theme.sass */
 .tooltip {
   font-size: 12px; }
 
-/* line 288, admin-theme.sass */
+/* line 289, admin-theme.sass */
 label.required:before {
   content: "*";
   color: red;
@@ -7811,44 +7814,44 @@ label.required:before {
   position: relative;
   line-height: 12px; }
 
-/* line 295, admin-theme.sass */
+/* line 296, admin-theme.sass */
 select.input-tiny, input[type="text"].input-tiny, input[type="password"].input-tiny {
   width: 80px;
   float: left; }
 
-/* line 301, admin-theme.sass */
+/* line 302, admin-theme.sass */
 td.actions {
   min-width: 200px; }
 
-/* line 303, admin-theme.sass */
+/* line 304, admin-theme.sass */
 .dropdown-menu {
   text-align: left; }
 
-/* line 305, admin-theme.sass */
+/* line 306, admin-theme.sass */
 .btn-group-action {
   float: right; }
-/* line 307, admin-theme.sass */
+/* line 308, admin-theme.sass */
 .btn-group-action a {
   text-decoration: none; }
 
-/* line 310, admin-theme.sass */
+/* line 311, admin-theme.sass */
 .btn {
   text-transform: uppercase; }
-/* line 312, admin-theme.sass */
+/* line 313, admin-theme.sass */
 .btn .caret {
   border-top-color: #333333 !important; }
-/* line 315, admin-theme.sass */
+/* line 316, admin-theme.sass */
 .btn:hover .caret, .btn:focus .caret {
   border-top-color: white !important; }
-/* line 317, admin-theme.sass */
+/* line 318, admin-theme.sass */
 .btn.btn-default {
   -webkit-box-shadow: #e6e6e6 0 -2px 0 inset;
   box-shadow: #e6e6e6 0 -2px 0 inset; }
-/* line 320, admin-theme.sass */
+/* line 321, admin-theme.sass */
 .btn.btn-primary {
   -webkit-box-shadow: #c7e6c7 0 -2px 0 inset;
   box-shadow: #c7e6c7 0 -2px 0 inset; }
-/* line 323, admin-theme.sass */
+/* line 324, admin-theme.sass */
 .btn.btn-default[disabled] {
   border-color: #999999;
   color: #999999;
@@ -7856,22 +7859,22 @@ td.actions {
   -webkit-box-shadow: #cccccc 0 -2px 0 inset;
   box-shadow: #cccccc 0 -2px 0 inset; }
 
-/* line 329, admin-theme.sass */
+/* line 330, admin-theme.sass */
 hr {
   border-color: #dfdfdf;
   border-bottom: 1px solid white; }
 
-/* line 334, admin-theme.sass */
+/* line 335, admin-theme.sass */
 .table {
   border-collapse: separate;
   border-spacing: 0 2px 0 0;
   margin-bottom: 5px; }
-/* line 340, admin-theme.sass */
+/* line 341, admin-theme.sass */
 .table thead > tr > th {
   border: none;
   font-weight: normal;
   vertical-align: top; }
-/* line 344, admin-theme.sass */
+/* line 345, admin-theme.sass */
 .table thead > tr > th span.title_box {
   color: black;
   font-size: 1.1em;
@@ -7879,76 +7882,76 @@ hr {
   display: block;
   word-wrap: nowrap;
   white-space: nowrap; }
-/* line 351, admin-theme.sass */
+/* line 352, admin-theme.sass */
 .table thead > tr > th span.title_box.active {
   font-weight: bold; }
-/* line 353, admin-theme.sass */
+/* line 354, admin-theme.sass */
 .table thead > tr > th span.title_box a {
   text-decoration: none; }
-/* line 355, admin-theme.sass */
+/* line 356, admin-theme.sass */
 .table thead > tr > th span.title_box a.active {
   color: black; }
-/* line 357, admin-theme.sass */
+/* line 358, admin-theme.sass */
 .table input, .table select {
   margin: 0; }
-/* line 359, admin-theme.sass */
+/* line 360, admin-theme.sass */
 .table tbody > tr > td {
   border-top: none;
   background-color: white; }
-/* line 362, admin-theme.sass */
+/* line 363, admin-theme.sass */
 .table tbody > tr > td {
   padding: 3px 7px;
   vertical-align: middle;
   word-wrap: nowrap;
   font-size: 12px;
   border-bottom: solid 1px #eeeeee; }
-/* line 368, admin-theme.sass */
+/* line 369, admin-theme.sass */
 .table td.center, .table th.center {
   text-align: center; }
-/* line 370, admin-theme.sass */
+/* line 371, admin-theme.sass */
 .table td.pointer {
   cursor: pointer; }
-/* line 372, admin-theme.sass */
+/* line 373, admin-theme.sass */
 .table tr td:first-child, .table tr th:first-child {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-/* line 375, admin-theme.sass */
+/* line 376, admin-theme.sass */
 .table tr td:last-child, .table tr th:last-child {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px; }
 
-/* line 379, admin-theme.sass */
+/* line 380, admin-theme.sass */
 tr.filter {
   background-color: #dfeff8; }
-/* line 381, admin-theme.sass */
+/* line 382, admin-theme.sass */
 tr.filter input[type="text"].filter, tr.filter input[type="password"].filter, tr.filter select.filter {
   font-size: 12px;
   border-color: #a0d0eb; }
 
-/* line 385, admin-theme.sass */
+/* line 386, admin-theme.sass */
 .breadcrumb {
   background-color: white; }
 
-/* line 388, admin-theme.sass */
+/* line 389, admin-theme.sass */
 .badge, #header_notifs_icon_wrapper .notifs_badge, .badge.badge-success, .badge.badge-error {
   background-color: #8fc04d; }
-/* line 390, admin-theme.sass */
+/* line 391, admin-theme.sass */
 #header_notifs_icon_wrapper .badge-success.notifs_badge, .badge-success.badge {
   background-color: #5cb85c; }
-/* line 393, admin-theme.sass */
+/* line 394, admin-theme.sass */
 #header_notifs_icon_wrapper .badge-error.notifs_badge, .badge-error.badge {
   background-color: #d9534f; }
 
-/* line 397, admin-theme.sass */
+/* line 398, admin-theme.sass */
 .row-margin-bottom {
   margin-bottom: 15px; }
 
-/* line 400, admin-theme.sass */
+/* line 401, admin-theme.sass */
 .icon-big {
   font-size: 4em;
   color: #c5c5c5; }
 
-/* line 405, admin-theme.sass */
+/* line 406, admin-theme.sass */
 #module-list h3, #module-list #content .panel-heading, #content #module-list .panel-heading, #module-list #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header, #content #header_notifs_icon_wrapper .notifs_panel #module-list .notifs_panel_header, #module-list #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header, #header_notifs_icon_wrapper .notifs_panel #content #module-list .notifs_panel_header {
   position: relative;
   top: 0;
@@ -7959,7 +7962,7 @@ tr.filter input[type="text"].filter, tr.filter input[type="password"].filter, tr
   color: #515561;
   font-weight: 500; }
 
-/* line 415, admin-theme.sass */
+/* line 416, admin-theme.sass */
 #footer {
   z-index: 600;
   min-height: 60px;
@@ -7968,13 +7971,13 @@ tr.filter input[type="text"].filter, tr.filter input[type="password"].filter, tr
   padding: 15px 0 0 0;
   background-color: #242424;
   color: #888888; }
-/* line 423, admin-theme.sass */
+/* line 424, admin-theme.sass */
 #footer a {
   color: #cccccc; }
-/* line 426, admin-theme.sass */
+/* line 427, admin-theme.sass */
 #footer a.link-social:hover {
   text-decoration: none; }
-/* line 428, admin-theme.sass */
+/* line 429, admin-theme.sass */
 #footer a.link-social i {
   font-size: 2em;
   width: 30px;
@@ -7987,23 +7990,23 @@ tr.filter input[type="text"].filter, tr.filter input[type="password"].filter, tr
   -ms-border-radius: 30px;
   -o-border-radius: 30px;
   border-radius: 30px; }
-/* line 436, admin-theme.sass */
+/* line 437, admin-theme.sass */
 #footer .link-twitter i {
   color: white;
   background-color: #7cceef; }
-/* line 439, admin-theme.sass */
+/* line 440, admin-theme.sass */
 #footer .link-facebook i {
   color: white;
   background-color: #557dbb; }
-/* line 442, admin-theme.sass */
+/* line 443, admin-theme.sass */
 #footer .link-github i {
   color: black;
   background-color: white; }
-/* line 445, admin-theme.sass */
+/* line 446, admin-theme.sass */
 #footer .link-google i {
   color: white;
   background-color: #e6644e; }
-/* line 448, admin-theme.sass */
+/* line 449, admin-theme.sass */
 #footer #go-top {
   position: fixed;
   bottom: 10px;
@@ -8021,46 +8024,46 @@ tr.filter input[type="text"].filter, tr.filter input[type="password"].filter, tr
   cursor: pointer;
   font-size: 16px;
   background-color: rgba(0, 0, 0, 0.5); }
-/* line 465, admin-theme.sass */
+/* line 466, admin-theme.sass */
 #footer #go-top:hover {
   background-color: black; }
 
-/* line 468, admin-theme.sass */
+/* line 469, admin-theme.sass */
 #nobootstrap {
   float: left; }
 
-/* line 474, admin-theme.sass */
+/* line 475, admin-theme.sass */
 .fixed-width-xs {
   width: 40px !important; }
 
-/* line 476, admin-theme.sass */
+/* line 477, admin-theme.sass */
 .fixed-width-sm {
   width: 80px !important; }
 
-/* line 478, admin-theme.sass */
+/* line 479, admin-theme.sass */
 .fixed-width-md {
   width: 120px !important; }
 
-/* line 480, admin-theme.sass */
+/* line 481, admin-theme.sass */
 .fixed-width-lg {
   width: 160px !important; }
 
-/* line 482, admin-theme.sass */
+/* line 483, admin-theme.sass */
 .fixed-width-xl {
   width: 200px !important; }
 
-/* line 484, admin-theme.sass */
+/* line 485, admin-theme.sass */
 .fixed-width-xxl {
   width: 250px !important; }
 
-/* line 493, admin-theme.sass */
+/* line 494, admin-theme.sass */
 textarea {
   resize: none; }
 
-/* line 496, admin-theme.sass */
+/* line 497, admin-theme.sass */
 .box-stats {
   background-color: white; }
-/* line 498, admin-theme.sass */
+/* line 499, admin-theme.sass */
 .box-stats .boxchart-overlay {
   padding: 10px 10px 5px 10px;
   margin-right: 10px;
@@ -8071,115 +8074,115 @@ textarea {
   -ms-border-radius: 3px;
   -o-border-radius: 3px;
   border-radius: 3px; }
-/* line 504, admin-theme.sass */
+/* line 505, admin-theme.sass */
 .box-stats i {
-  float: left;
-  height: 64px;
-  width: 64px;
-  margin-right: 10px;
-  color: white;
-  font-size: 35px;
-  text-align: center;
-  line-height: 64px;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   -ms-border-radius: 3px;
   -o-border-radius: 3px;
-  border-radius: 3px; }
-/* line 514, admin-theme.sass */
+  border-radius: 3px;
+  float: left;
+  color: white;
+  font-size: 35px;
+  height: 64px;
+  width: 64px;
+  text-align: center;
+  line-height: 64px;
+  margin-right: 10px; }
+/* line 515, admin-theme.sass */
 .box-stats .title {
   color: #666666;
   display: block; }
-/* line 517, admin-theme.sass */
+/* line 518, admin-theme.sass */
 .box-stats .value {
   font-size: 22px; }
-/* line 519, admin-theme.sass */
+/* line 520, admin-theme.sass */
 .box-stats small {
   line-height: 0.3em;
   color: #aaaaaa;
   text-transform: uppercase; }
-/* line 523, admin-theme.sass */
+/* line 524, admin-theme.sass */
 .box-stats:hover {
   text-decoration: none; }
 
-/* line 526, admin-theme.sass */
+/* line 527, admin-theme.sass */
 .color1 i, .color1 .boxchart-overlay {
   background-color: #2ba8e3;
   -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 -3px 0 inset;
   box-shadow: rgba(0, 0, 0, 0.15) 0 -3px 0 inset; }
-/* line 529, admin-theme.sass */
+/* line 530, admin-theme.sass */
 .color1 .value {
   color: #2ba8e3; }
 
-/* line 532, admin-theme.sass */
+/* line 533, admin-theme.sass */
 .color2 i, .color2 .boxchart-overlay {
   background-color: #ff5450;
   -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 -3px 0 inset;
   box-shadow: rgba(0, 0, 0, 0.15) 0 -3px 0 inset; }
-/* line 535, admin-theme.sass */
+/* line 536, admin-theme.sass */
 .color2 .value {
   color: #ff5450; }
 
-/* line 538, admin-theme.sass */
+/* line 539, admin-theme.sass */
 .color3 i, .color3 .boxchart-overlay {
   background-color: #9e5ba1;
   -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 -3px 0 inset;
   box-shadow: rgba(0, 0, 0, 0.15) 0 -3px 0 inset; }
-/* line 541, admin-theme.sass */
+/* line 542, admin-theme.sass */
 .color3 .value {
   color: #9e5ba1; }
 
-/* line 544, admin-theme.sass */
+/* line 545, admin-theme.sass */
 .color4 i, .color4 .boxchart-overlay {
   background-color: #95cc6b;
   -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 -3px 0 inset;
   box-shadow: rgba(0, 0, 0, 0.15) 0 -3px 0 inset; }
-/* line 547, admin-theme.sass */
+/* line 548, admin-theme.sass */
 .color4 .value {
   color: #95cc6b; }
 
-/* line 551, admin-theme.sass */
+/* line 552, admin-theme.sass */
 .data_chart rect {
   fill: white; }
-/* line 553, admin-theme.sass */
+/* line 554, admin-theme.sass */
 .data_chart path {
   stroke: white;
   stroke-width: 2;
   fill: none; }
-/* line 557, admin-theme.sass */
+/* line 558, admin-theme.sass */
 .data_chart line {
   stroke: black; }
-/* line 559, admin-theme.sass */
+/* line 560, admin-theme.sass */
 .data_chart .area {
   fill: rgba(255, 255, 255, 0.3);
   stroke-width: 0; }
 
-/* line 563, admin-theme.sass */
+/* line 564, admin-theme.sass */
 .thumbnail {
   background-color: white;
   border-color: #cccccc !important; }
 
-/* line 567, admin-theme.sass */
+/* line 568, admin-theme.sass */
 tr.highlighted td {
   background-color: #1ba6e5 !important;
   color: white; }
 
-/* line 571, admin-theme.sass */
+/* line 574, admin-theme.sass */
 .hook_panel {
   -webkit-box-shadow: rgba(255, 255, 255, 0.9) 0 0 0 1px inset;
   box-shadow: rgba(255, 255, 255, 0.9) 0 0 0 1px inset;
   padding: 10px 10px 5px 10px;
   margin-bottom: 3px !important; }
 
-/* line 576, admin-theme.sass */
+/* line 579, admin-theme.sass */
 .module_name {
   font-size: 1.2em; }
 
-/* line 580, admin-theme.sass */
+/* line 583, admin-theme.sass */
 .hook_panel_header {
   margin: 0 -10px 0 -10px;
   padding: 0 10px 10px 10px; }
-/* line 583, admin-theme.sass */
+/* line 586, admin-theme.sass */
 .hook_panel_header .hook_name {
   font-weight: 400;
   font-size: 1.2em;
@@ -8192,15 +8195,15 @@ tr.highlighted td {
   border: solid 1px #cccccc;
   background-color: white;
   padding: 0 4px; }
-/* line 591, admin-theme.sass */
+/* line 594, admin-theme.sass */
 .hook_panel_header .hook_title {
   text-transform: uppercase;
   font-size: 1em; }
-/* line 594, admin-theme.sass */
+/* line 597, admin-theme.sass */
 .hook_panel_header .hook_description {
   padding: 3px 0 0 3px; }
 
-/* line 598, admin-theme.sass */
+/* line 601, admin-theme.sass */
 .module_list .module_list_item {
   display: table;
   width: 100%;
@@ -8215,7 +8218,7 @@ tr.highlighted td {
   -o-border-radius: 3px;
   border-radius: 3px; }
 
-/* line 606, admin-theme.sass */
+/* line 609, admin-theme.sass */
 .module_col_select {
   display: table-cell;
   width: 22px;
@@ -8224,13 +8227,13 @@ tr.highlighted td {
   text-align: center;
   border-right: 1px solid #dddddd; }
 
-/* line 613, admin-theme.sass */
+/* line 616, admin-theme.sass */
 .module_col_position {
   display: table-cell;
   width: 60px;
   vertical-align: middle;
   text-align: right; }
-/* line 618, admin-theme.sass */
+/* line 621, admin-theme.sass */
 .module_col_position .positions {
   font-family: "Ubuntu", sans-serif;
   font-weight: 200;
@@ -8248,41 +8251,41 @@ tr.highlighted td {
   border: solid 1px #cccccc;
   background-color: #eeeeee; }
 
-/* line 629, admin-theme.sass */
+/* line 632, admin-theme.sass */
 .module_col_icon {
   display: table-cell;
   width: 50px;
   text-align: center;
   vertical-align: middle; }
 
-/* line 635, admin-theme.sass */
+/* line 638, admin-theme.sass */
 .module_col_infos {
   display: table-cell;
   height: 50px;
   vertical-align: middle; }
 
-/* line 640, admin-theme.sass */
+/* line 643, admin-theme.sass */
 .module_col_actions {
   display: table-cell;
   width: 160px;
   padding: 0 10px;
   vertical-align: middle;
   text-align: right; }
-/* line 646, admin-theme.sass */
+/* line 649, admin-theme.sass */
 .module_col_actions .btn-group {
   text-align: left; }
 
-/* line 650, admin-theme.sass */
+/* line 653, admin-theme.sass */
 .tree {
   padding: 0 0 0 20px;
   list-style: none; }
-/* line 653, admin-theme.sass */
+/* line 656, admin-theme.sass */
 .tree input {
   margin-right: 4px; }
-/* line 655, admin-theme.sass */
+/* line 658, admin-theme.sass */
 .tree i {
   font-size: 1.3em; }
-/* line 657, admin-theme.sass */
+/* line 660, admin-theme.sass */
 .tree .tree-item-name, .tree .tree-folder-name {
   padding: 0 5px;
   -webkit-border-radius: 6px;
@@ -8291,17 +8294,17 @@ tr.highlighted td {
   -o-border-radius: 6px;
   border-radius: 6px;
   font-weight: normal; }
-/* line 661, admin-theme.sass */
+/* line 664, admin-theme.sass */
 .tree .tree-item-name:hover, .tree .tree-folder-name:hover {
   background-color: #eeeeee;
   cursor: pointer; }
-/* line 664, admin-theme.sass */
+/* line 667, admin-theme.sass */
 .tree .tree-selected {
   background-color: #a4dcf5; }
-/* line 666, admin-theme.sass */
+/* line 669, admin-theme.sass */
 .tree .tree-selected i.tree-dot {
   background-color: #1ba6e5; }
-/* line 668, admin-theme.sass */
+/* line 671, admin-theme.sass */
 .tree i.tree-dot {
   display: inline-block;
   position: relative;
@@ -8314,61 +8317,61 @@ tr.highlighted td {
   -ms-border-radius: 6px;
   -o-border-radius: 6px;
   border-radius: 6px; }
-/* line 676, admin-theme.sass */
+/* line 679, admin-theme.sass */
 .tree .tree-item-disable, .tree .tree-folder-name-disable {
   color: #cccccc; }
-/* line 678, admin-theme.sass */
+/* line 681, admin-theme.sass */
 .tree .tree-item-disable:hover, .tree .tree-folder-name-disable:hover {
   color: #cccccc;
   background-color: none; }
 
-/* line 682, admin-theme.sass */
+/* line 685, admin-theme.sass */
 .nav-tabs {
   border-bottom: none; }
-/* line 684, admin-theme.sass */
+/* line 687, admin-theme.sass */
 .nav-tabs li a {
   font-size: 1.1em;
   font-family: "Ubuntu", sans-serif;
   text-transform: uppercase;
   font-weight: 300; }
-/* line 690, admin-theme.sass */
+/* line 693, admin-theme.sass */
 .nav-tabs li.active a, .nav-tabs li.active a:hover {
   background-color: white; }
 
-/* line 693, admin-theme.sass */
+/* line 696, admin-theme.sass */
 .tree-actions {
   padding-bottom: 4px;
   display: inline-block; }
 
-/* line 698, admin-theme.sass */
+/* line 701, admin-theme.sass */
 .tt-query {
   border-bottom-right-radius: 3px !important;
   border-top-right-radius: 3px !important; }
 
-/* line 700, admin-theme.sass */
+/* line 703, admin-theme.sass */
 .tt-dropdown-menu {
   background-color: white;
   border: solid 1px #cccccc;
   font-size: 0.9em;
   text-transform: none; }
 
-/* line 705, admin-theme.sass */
+/* line 708, admin-theme.sass */
 .tt-suggestions {
   padding: 0 6px;
   -webkit-box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px;
   box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px; }
 
-/* line 708, admin-theme.sass */
+/* line 711, admin-theme.sass */
 .tt-suggestion p {
   border-bottom: solid 1px #cccccc;
   margin: 0 !important;
   padding: 0 !important; }
 
-/* line 712, admin-theme.sass */
+/* line 715, admin-theme.sass */
 .tt-suggestion:last-child p {
   border-bottom: none; }
 
-/* line 716, admin-theme.sass */
+/* line 719, admin-theme.sass */
 .tagify-container {
   background-color: white;
   padding: 2px 6px;
@@ -8382,10 +8385,10 @@ tr.highlighted td {
   border: solid 1px #cccccc;
   -webkit-box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset;
   box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset; }
-/* line 724, admin-theme.sass */
+/* line 727, admin-theme.sass */
 .tagify-container span {
   float: left; }
-/* line 726, admin-theme.sass */
+/* line 729, admin-theme.sass */
 .tagify-container > span {
   display: inline-block;
   padding: 3px 5px;
@@ -8394,26 +8397,26 @@ tr.highlighted td {
   border: 1px solid #1ba6e5;
   background-color: #60c1ed;
   color: white; }
-/* line 734, admin-theme.sass */
+/* line 737, admin-theme.sass */
 .tagify-container > span > a {
   padding-left: 5px;
   color: #1ba6e5;
   text-decoration: none;
   font-weight: bold; }
-/* line 739, admin-theme.sass */
+/* line 742, admin-theme.sass */
 .tagify-container > input {
   margin-top: 2px;
   border: 0 none;
   width: 100px;
   -webkit-box-shadow: none;
   box-shadow: none; }
-/* line 744, admin-theme.sass */
+/* line 747, admin-theme.sass */
 .tagify-container > input:focus {
   outline: 0;
   -webkit-box-shadow: none;
   box-shadow: none; }
 
-/* line 749, admin-theme.sass */
+/* line 752, admin-theme.sass */
 li.sortable-placeholder {
   border: 1px dashed #cccccc;
   background-color: #bbbbbb;
diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass
index 8acf4a033..ff3eb04f7 100755
--- a/admin-dev/themes/default/css/admin-theme.sass
+++ b/admin-dev/themes/default/css/admin-theme.sass
@@ -165,6 +165,8 @@ html, body
 		text-transform: uppercase
 		@media (max-width: $screen-tablet)
 			padding: 0 0 0 20px
+	a
+		color: white
 	.btn-toolbar
 		margin: 0
 		padding: 3px 0 0 0
diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
index 52ea0c848..bf1bc5c87 100644
--- a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
@@ -34,7 +34,7 @@
 					{if $shared_category}
 						<p class="alert alert-warning">{l s='If you delete this picture, it will be deleted in all of your shared shops!'}</p>
 					{/if}
-					<a class="btn btn-default" href="{$current}&{$identifier}={$form_id}&token={$token}&{if $shared_category}forcedeleteImage=1{else}deleteImage=1{/if}">
+					<a class="btn btn-default" href="{$current}&{$identifier}={$form_id}&token={$token}&{if $shared_category}forcedeleteImage=1{else}deleteImage=1{/if}" onclick="return confirm('{l s='If you delete this picture, it will be deleted in all of your shared shops!'}\n\n{l s='Do you want to continue?'}')">
 						<i class="icon-trash"></i> {l s='Delete'}
 					</a>
 				</div>
diff --git a/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
index 04515e020..9c397bd5e 100644
--- a/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
@@ -23,48 +23,43 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 			</table>
-
-			{if !$simple_header && $list_total > 20}
 			<div class="row">
 				<div class="col-lg-8">
-					{if $bulk_actions}
-					<div>
-						{if $bulk_actions|count > 1}
-							<div class="form-group">
-								<div class="col-lg-6">
-									<select id="select_submitBulk" name="select_submitBulk">
-										{foreach $bulk_actions as $key => $params}
-										<option value="{$key}">{$params.text}</option>
-										{/foreach}
-									</select>
-								</div>
-								<div class="col-lg-6">
-									<input type="submit" class="btn btn-default" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
-								</div>
+				{if $bulk_actions}
+					{if $bulk_actions|count > 1}
+						<div class="form-group bulk-actions">
+							<div class="col-lg-6">
+								<select id="select_submitBulk" name="select_submitBulk">
+									{foreach $bulk_actions as $key => $params}
+									<option value="{$key}">{$params.text}</option>
+									{/foreach}
+								</select>
 							</div>
-						{else}
-							{foreach $bulk_actions as $key => $params}
-							<div class="form-group">
-								<div class="col-lg-6">
-								{if $key == 'affectzone'}
-									<select id="zone_to_affect" name="zone_to_affect">
-										{foreach $zones as $z}
-											<option value="{$z['id_zone']}">{$z['name']}</option>
-										{/foreach}
-									</select>
-								{/if}
-								</div>
-								<div class="col-lg-6">
-									<input type="submit" class="btn btn-default" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
-								</div>
+							<div class="col-lg-6">
+								<input type="submit" class="btn btn-default" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
 							</div>
-							{/foreach}
-						{/if}
-					</div>
+						</div>
+					{else}
+						{foreach $bulk_actions as $key => $params}
+						<div class="form-group bulk-actions">
+							<div class="col-lg-6">
+							{if $key == 'affectzone'}
+								<select id="zone_to_affect" name="zone_to_affect">
+									{foreach $zones as $z}
+										<option value="{$z['id_zone']}">{$z['name']}</option>
+									{/foreach}
+								</select>
+							{/if}
+							</div>
+							<div class="col-lg-6">
+								<input type="submit" class="btn btn-default" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
+							</div>
+						</div>
+						{/foreach}
 					{/if}
+				{/if}
 				</div>
-
-
+				{if !$simple_header && $list_total > 20}
 				<div class="col-lg-4">
 					{* Choose number of results per page *}
 					<span class="pagination">
@@ -136,9 +131,8 @@
 						});
 					</script>
 				</div>
+				{/if}
 			</div>
-			{/if}
-
 		</td>
 	</tr>
 </table>
diff --git a/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
index 84f7fb5ca..9bd8862f9 100644
--- a/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
@@ -24,58 +24,116 @@
 *}
 
 			</table>
-			{if !$simple_header && $list_total > 20}
-				<div class="table-pagination pull-right">
-					<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}
-						{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}
-					</span>
-
-					<span>
-						&nbsp;|&nbsp;
-						<label >{l s='Display'}</label>
-						<select class="filter fixed-width-xs" 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>
-					<span> / {$list_total} {l s='result(s)'}</span>
-				</div>
-			{/if}
-			{if $bulk_actions}
-				{if $bulk_actions|count > 1}
-					<div class="col-lg-11">
-						<select id="select_submitBulk" name="select_submitBulk" >
-							{foreach $bulk_actions as $key => $params}
-								<option value="{$key}">{$params.text}</option>
-							{/foreach}
-						</select>
+			<div class="row">
+				<div class="col-lg-8">
+				{if $bulk_actions}
+					{if $bulk_actions|count > 1}
+					<div class="form-group bulk-actions">
+						<div class="col-lg-6">
+							<select id="select_submitBulk" name="select_submitBulk" >
+								{foreach $bulk_actions as $key => $params}
+									<option value="{$key}">{$params.text}</option>
+								{/foreach}
+							</select>
+						</div>
+						<div class="col-lg-6">
+							<input type="submit" class="btn btn-primary" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
+						</div>
 					</div>
-					<input type="submit" class="btn btn-primary" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
-				{else}
-					{foreach $bulk_actions as $key => $params}
-						{if $key == 'affectzone'}
-							<div class="col-lg-11">
+					{else}
+						{foreach $bulk_actions as $key => $params}
+						<div class="form-group bulk-actions">
+							<div class="col-lg-6">
+							{if $key == 'affectzone'}
 								<select id="zone_to_affect" name="zone_to_affect">
 									{foreach $zones as $z}
 										<option value="{$z['id_zone']}">{$z['name']}</option>
 									{/foreach}
-								</select>
+								</select>									
+							{/if}
 							</div>
-						{/if}
-						<input type="submit" class="btn btn-primary" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
-					{/foreach}
+							<div class="col-lg-6">
+								<input type="submit" class="btn btn-primary" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
+							</div>
+						</div>
+						{/foreach}
+					{/if}
 				{/if}
-			{/if}
+				</div>			
+				{if !$simple_header && $list_total > 20}
+				<div class="col-lg-4">
+					{* Choose number of results per page *}
+					<span class="pagination">
+						{l s='Display'}: 
+						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+							{$selected_pagination}
+							<i class="icon-caret-down"></i>
+						</button>
+						<ul class="dropdown-menu">
+						{foreach $pagination AS $value}
+							<li>
+								<a href="javascript:void(0);" class="pagination-items-page" data-items="{$value|intval}">{$value}</a>
+							</li>
+						{/foreach}
+						</ul>
+						/ {$list_total} {l s='result(s)'}
+						<input type="hidden" id="pagination-items-page" name="{$table}_pagination" value="{$selected_pagination|intval}" />
+					</span>
+					<script type="text/javascript">
+						$('.pagination-items-page').on('click',function(e){
+							e.preventDefault();
+							$('#pagination-items-page').val($(this).data("items")).closest("form").submit();
+						});
+					</script>
+					<ul class="pagination pull-right">
+						<li {if $page <= 1}class="disabled"{/if}>
+							<a href="javascript:void(0);" class="pagination-link" data-page="1">
+								<i class="icon-double-angle-left"></i>
+							</a>
+						</li>
+						<li {if $page <= 1}class="disabled"{/if}>
+							<a href="javascript:void(0);" class="pagination-link" data-page="{$page - 1}">
+								<i class="icon-angle-left"></i>
+							</a>
+						</li>
+						{assign p 0}
+						{while $p++ < $total_pages}
+							{if $p < $page-2}
+								<li class="disabled">
+									<a href="javascript:void(0);">&hellip;</a>
+								</li>
+								{assign p $page-3}
+							{else if $p > $page+2}
+								<li class="disabled">
+									<a href="javascript:void(0);">&hellip;</a>
+								</li>
+								{assign p $total_pages}
+							{else}
+								<li {if $p == $page}class="active"{/if}>
+									<a href="javascript:void(0);" class="pagination-link" data-page="{$p}">{$p}</a>
+								</li>
+							{/if}
+						{/while}
+						<li {if $page > $total_pages}class="disabled"{/if}>
+							<a href="javascript:void(0);" class="pagination-link" data-page="{$page + 1}">
+								<i class="icon-angle-right"></i>
+							</a>
+						</li>
+						<li {if $page > $total_pages}class="disabled"{/if}>
+							<a href="javascript:void(0);" class="pagination-link" data-page="{$total_pages}">
+								<i class="icon-double-angle-right"></i>
+							</a>
+						</li>
+					</ul>
+					<script type="text/javascript">
+						$('.pagination-link').on('click',function(e){
+							e.preventDefault();
+							$('#submitFilter'+'{$table}').val($(this).data("page")).closest("form").submit();
+						});
+					</script>
+				</div>
+				{/if}
+			</div>
 		</td>
 	</tr>
 </table>
diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
index 010c1913b..d0d8bd7eb 100644
--- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
@@ -24,9 +24,10 @@
 *}
 	</table>
 </div>
-
-	{if $bulk_actions}
-		<div class="btn-group">
+<div class="row">
+	<div class="col-lg-8">
+		{if $bulk_actions}
+		<div class="btn-group bulk-actions">
 			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 				{l s='Bulk actions'} <span class="caret"></span>
 			</button>
@@ -53,36 +54,82 @@
 			{/foreach}
 			</ul>
 		</div>
-	{/if}
-
+		{/if}
+	</div>
 	{if !$simple_header && $list_total > 20}
-	<div class="table-pagination pull-right">
-		<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}
-			{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}
+	<div class="col-lg-4">
+		{* Choose number of results per page *}
+		<span class="pagination">
+			{l s='Display'}: 
+			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+				{$selected_pagination}
+				<i class="icon-caret-down"></i>
+			</button>
+			<ul class="dropdown-menu">
+			{foreach $pagination AS $value}
+				<li>
+					<a href="javascript:void(0);" class="pagination-items-page" data-items="{$value|intval}">{$value}</a>
+				</li>
+			{/foreach}
+			</ul>
+			/ {$list_total} {l s='result(s)'}
+			<input type="hidden" id="pagination-items-page" name="{$table}_pagination" value="{$selected_pagination|intval}" />
 		</span>
-
-		<span>
-			&nbsp;|&nbsp;
-			<label >{l s='Display'}</label>
-			<select class="filter fixed-width-xs" 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>
-		<span> / {$list_total} {l s='result(s)'}</span>
+		<script type="text/javascript">
+			$('.pagination-items-page').on('click',function(e){
+				e.preventDefault();
+				$('#pagination-items-page').val($(this).data("items")).closest("form").submit();
+			});
+		</script>
+		<ul class="pagination pull-right">
+			<li {if $page <= 1}class="disabled"{/if}>
+				<a href="javascript:void(0);" class="pagination-link" data-page="1">
+					<i class="icon-double-angle-left"></i>
+				</a>
+			</li>
+			<li {if $page <= 1}class="disabled"{/if}>
+				<a href="javascript:void(0);" class="pagination-link" data-page="{$page - 1}">
+					<i class="icon-angle-left"></i>
+				</a>
+			</li>
+			{assign p 0}
+			{while $p++ < $total_pages}
+				{if $p < $page-2}
+					<li class="disabled">
+						<a href="javascript:void(0);">&hellip;</a>
+					</li>
+					{assign p $page-3}
+				{else if $p > $page+2}
+					<li class="disabled">
+						<a href="javascript:void(0);">&hellip;</a>
+					</li>
+					{assign p $total_pages}
+				{else}
+					<li {if $p == $page}class="active"{/if}>
+						<a href="javascript:void(0);" class="pagination-link" data-page="{$p}">{$p}</a>
+					</li>
+				{/if}
+			{/while}
+			<li {if $page > $total_pages}class="disabled"{/if}>
+				<a href="javascript:void(0);" class="pagination-link" data-page="{$page + 1}">
+					<i class="icon-angle-right"></i>
+				</a>
+			</li>
+			<li {if $page > $total_pages}class="disabled"{/if}>
+				<a href="javascript:void(0);" class="pagination-link" data-page="{$total_pages}">
+					<i class="icon-double-angle-right"></i>
+				</a>
+			</li>
+		</ul>
+		<script type="text/javascript">
+			$('.pagination-link').on('click',function(e){
+				e.preventDefault();
+				$('#submitFilter'+'{$table}').val($(this).data("page")).closest("form").submit();
+			});
+		</script>
 	</div>
 	{/if}
-
+</div>
 
 
 {if !$simple_header}
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index 138a7f9c9..dc9b61efb 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -367,7 +367,6 @@
 							name="{if isset($categoryData['submit']['name'])}{$categoryData['submit']['name']}{else}submitOptions{$table}{/if}"
 							class="btn btn-default {if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
 							>
-							<i class="{if isset($categoryData['submit']['icon'])}{$categoryData['submit']['icon']}{else}icon-save{/if}"></i>
 							{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s='Save'}{/if}
 						</button>
 					</div>
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 35f464df6..a7c460eb5 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1343,16 +1343,9 @@ class AdminControllerCore extends Controller
 		$template_dirs = $this->context->smarty->getTemplateDir();
 		
 		// Check if header/footer have been overriden
-		$header_tpl = 'header.tpl';
-		$footer_tpl = 'footer.tpl';
-		foreach ($template_dirs as $template_dir)
-		{
-			if (file_exists($template_dir.DIRECTORY_SEPARATOR.'header.tpl'))
-				$header_tpl = $template_dir.DIRECTORY_SEPARATOR.'header.tpl';
-			if (file_exists($template_dir.DIRECTORY_SEPARATOR.'footer.tpl'))
-				$footer_tpl = $template_dir.DIRECTORY_SEPARATOR.'footer.tpl';
-		}
-
+		$dir = $this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.trim($this->override_folder, '\\/').DIRECTORY_SEPARATOR;
+		$header_tpl = file_exists($dir.'header.tpl') ? $dir.'header.tpl' : 'header.tpl';
+		$footer_tpl = file_exists($dir.'footer.tpl') ? $dir.'footer.tpl' : 'footer.tpl';
 		$tpl_action = $this->tpl_folder.$this->display.'.tpl';
 
 		// Check if action template has been overriden
@@ -3035,7 +3028,7 @@ class AdminControllerCore extends Controller
 		{
 			if (file_exists($this->context->smarty->getTemplateDir(1).DIRECTORY_SEPARATOR.$this->override_folder.$tpl_name))
 				return $this->context->smarty->createTemplate($this->override_folder.$tpl_name, $this->context->smarty);
-			else if (file_exists($this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$tpl_name))
+			elseif (file_exists($this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$tpl_name))
 				return $this->context->smarty->createTemplate('controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$tpl_name, $this->context->smarty);
 		}