diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index b0c93b410..d40078e3d 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -581,7 +581,7 @@ body.no-select{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:no
 html,body{height:100%; }
 body{webkit-font-smoothing:antialiased;font-family:sans-serif;background:#f9f9f9}
 #layout-canvas{min-height:100%;height:100%}
-body{font-family:'Noto Sans',sans-serif}
+body{font-family:'Noto Sans',sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
 .control-tabs.primary-tabs > ul.nav-tabs,.control-tabs.primary-tabs > div > ul.nav-tabs,.control-tabs.primary-tabs > div > div > ul.nav-tabs{margin-left:-20px;margin-right:-20px}
 .control-tabs.primary-tabs.tabs-no-inset > ul.nav-tabs,.control-tabs.primary-tabs.tabs-no-inset > div > ul.nav-tabs,.control-tabs.primary-tabs.tabs-no-inset > div > div > ul.nav-tabs{margin-left:0;margin-right:0}
 .layout{display:table;table-layout:fixed;height:100%;width:100%}
@@ -710,7 +710,6 @@ nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-icon i,nav#layo
 nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-label{line-height:30px}
 nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:first-child{margin-left:-13px}
 nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:last-child{margin-right:0}
-nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li.active{background:#262626;border-radius:5px}
 nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li.active:first-child{margin-left:0}
 nav#layout-mainmenu.navbar-mode-tile{height:78px}
 nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-preview a{height:78px;line-height:78px}
@@ -723,7 +722,6 @@ nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li a .nav-label{display:blo
 nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li{padding:0 15px;margin:7px 0 0}
 nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:first-child{margin-left:-7px}
 nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;z-index:2}
-nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li.active{background:#262626;border-radius:5px}
 nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li.active:first-child{margin-left:0}
 nav#layout-mainmenu .menu-toggle{height:45px;line-height:45px;font-size:16px;display:none}
 nav#layout-mainmenu .menu-toggle .menu-toggle-icon{background:#333;display:inline-block;height:45px;line-height:45px;width:45px;text-align:center}
@@ -755,7 +753,6 @@ nav#layout-mainmenu.navbar .menu-toggle{display:inline-block;color:#ffffff !impo
 .mainmenu-collapsed > div ul.mainmenu-nav li{padding:0 15px;margin:7px 0 0}
 .mainmenu-collapsed > div ul.mainmenu-nav li:first-child{margin-left:-7px}
 .mainmenu-collapsed > div ul.mainmenu-nav li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;z-index:2}
-.mainmenu-collapsed > div ul.mainmenu-nav li.active{background:#262626;border-radius:5px}
 .mainmenu-collapsed > div ul.mainmenu-nav li.active:first-child{margin-left:0}
 .mainmenu-collapsed > div ul.mainmenu-nav li:first-child{margin-left:0}
 .mainmenu-collapsed > div ul{margin:0;padding:5px 0 15px 15px;overflow:hidden}
@@ -783,14 +780,13 @@ body.drag nav#layout-mainmenu.navbar ul.nav li:hover,body.drag .mainmenu-collaps
 body.drag nav#layout-mainmenu.navbar ul.nav li a:active .nav-label,body.drag .mainmenu-collapsed ul li a:active .nav-label,body.drag nav#layout-mainmenu.navbar ul.nav li a:focus .nav-label,body.drag .mainmenu-collapsed ul li a:focus .nav-label{text-shadow:none}
 #layout-sidenav{position:absolute;height:100%;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
 #layout-sidenav ul{position:relative;margin:0;padding:0;height:100%;overflow:hidden}
-#layout-sidenav ul,#layout-sidenav ul li:first-child a{-webkit-box-shadow:inset 0 6px 3px -3px rgba(0,0,0,0.1);box-shadow:inset 0 6px 3px -3px rgba(0,0,0,0.1)}
-#layout-sidenav ul:after{content:'';position:absolute;height:100%;top:0;right:0;width:10px;-webkit-box-shadow:inset -5px 0 3px rgba(0,0,0,0.1);box-shadow:inset -5px 0 3px rgba(0,0,0,0.1)}
 #layout-sidenav ul li{display:block;text-align:center;position:relative}
 #layout-sidenav ul li a{padding:20px 10px;display:block;font-size:13px;color:rgba(255,255,255,0.6);font-weight:normal;position:relative}
 #layout-sidenav ul li a:hover{text-decoration:none;background-color:transparent}
 #layout-sidenav ul li a:focus{background:transparent}
 #layout-sidenav ul li a i{color:rgba(255,255,255,0.6);display:block;margin-bottom:5px;font-size:28px}
 #layout-sidenav ul li a .nav-label,#layout-sidenav ul li a .nav-icon{text-shadow:0 -1px 0 rgba(0,0,0,0.6)}
+#layout-sidenav ul li:first-child a{padding-top:30px}
 #layout-sidenav ul li.active a,#layout-sidenav ul li a:hover{color:#ffffff}
 #layout-sidenav ul li.active a i,#layout-sidenav ul li a:hover i{color:#ffffff}
 #layout-sidenav ul li.active a .nav-label,#layout-sidenav ul li.active a .nav-icon{text-shadow:0 -1px 0 rgba(0,0,0,0.3)}
diff --git a/modules/backend/assets/less/layout/layout.less b/modules/backend/assets/less/layout/layout.less
index fb81955eb..bdd3135d4 100644
--- a/modules/backend/assets/less/layout/layout.less
+++ b/modules/backend/assets/less/layout/layout.less
@@ -51,6 +51,8 @@ body {
 
 body {
     font-family: 'Noto Sans', sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 
 //
diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less
index ddd725b7f..3d512824c 100644
--- a/modules/backend/assets/less/layout/mainmenu.less
+++ b/modules/backend/assets/less/layout/mainmenu.less
@@ -38,6 +38,11 @@ body.mainmenu-open {
     }
 }
 
+.mainmenu-item-link-active() {
+    // background: @color-mainmenu-active-bg;
+    // .border-radius(5px);
+}
+
 .mainmenu-set-height(@height) {
     height: @height;
 
@@ -317,8 +322,7 @@ nav#layout-mainmenu.navbar-mode-inline {
         }
 
         li.active {
-            background: @color-mainmenu-active-bg;
-            border-radius: 5px;
+            .mainmenu-item-link-active();
 
             &:first-child {
                 margin-left: 0;
@@ -397,8 +401,7 @@ nav#layout-mainmenu.navbar-mode-tile {
         }
 
         li.active {
-            background: @color-mainmenu-active-bg;
-            border-radius: 5px;
+            .mainmenu-item-link-active();
 
             a {
                 // font-weight: bold;
diff --git a/modules/backend/assets/less/layout/sidenav.less b/modules/backend/assets/less/layout/sidenav.less
index 7d5451b51..d1ddd6060 100644
--- a/modules/backend/assets/less/layout/sidenav.less
+++ b/modules/backend/assets/less/layout/sidenav.less
@@ -8,16 +8,6 @@
     width: 100%;
     .box-sizing(border-box);
 
-    .sidenav-shadow-element() {
-        content: '';
-        position: absolute;
-        height: 100%;
-        top: 0;
-        right: 0;
-        width: 10px;
-        .box-shadow(inset -5px 0 3px rgba(0,0,0,.1));
-    }
-
     ul {
         position: relative;
         margin: 0;
@@ -25,14 +15,6 @@
         height: 100%;
         overflow: hidden;
 
-        &, li:first-child a {
-            .box-shadow(inset 0 6px 3px -3px rgba(0,0,0,.1));
-        }
-
-        &:after {
-            .sidenav-shadow-element();
-        }
-
         li {
             display: block;
             text-align: center;
@@ -68,11 +50,9 @@
                 }
             }
 
-            // a:active, a:focus {
-            //     .nav-label {
-            //         text-shadow: 1px 1px 15px white, -1px -1px 15px white;
-            //     }
-            // }
+            &:first-child a {
+                padding-top: 30px;
+            }
 
             &.active a, a:hover {
                 color: @color-sidebarnav-active-text;
@@ -85,10 +65,6 @@
                 .nav-icon {
                     text-shadow: 0 -1px 0 rgba(0,0,0,.3);
                 }
-
-                .nav-label {
-                    // font-weight: bold;
-                }
             }
 
             span.counter {
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm
index a7a80d73c..f7b3e0b9d 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm
+++ b/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm
@@ -2,14 +2,14 @@
     <a
         href="javascript:;"
         id="showIgnoredColumnsButton"
-        class="btn btn-sm btn-default oc-icon-eye disabled"
+        class="btn btn-sm btn-secondary oc-icon-eye disabled"
         onclick="$.oc.importBehavior.showIgnoredColumns()">
         <?= e(trans('backend::lang.import_export.show_ignored_columns')) ?>
     </a>
     <a
         href="javascript:;"
         id="autoMatchColumnsButton"
-        class="btn btn-sm btn-default oc-icon-bullseye"
+        class="btn btn-sm btn-secondary oc-icon-bullseye"
         onclick="$.oc.importBehavior.autoMatchColumns()">
         <?= e(trans('backend::lang.import_export.auto_match_columns')) ?>
     </a>
diff --git a/modules/backend/formwidgets/fileupload/assets/css/fileupload.css b/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
index 1e6051110..06f5e38d7 100644
--- a/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
+++ b/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
@@ -1,800 +1,152 @@
-.field-fileupload .upload-object {
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  position: relative;
-  outline: none;
-  overflow: hidden;
-  display: inline-block;
-  vertical-align: top;
-}
-.field-fileupload .upload-object img {
-  width: 100%;
-  height: 100%;
-}
-.field-fileupload .upload-object .icon-container {
-  display: table;
-  opacity: .6;
-}
-.field-fileupload .upload-object .icon-container i {
-  color: #95a5a6;
-  display: inline-block;
-}
-.field-fileupload .upload-object .icon-container div {
-  display: table-cell;
-  text-align: center;
-  vertical-align: middle;
-}
-.field-fileupload .upload-object .icon-container.image > div.icon-wrapper {
-  display: none;
-}
-.field-fileupload .upload-object h4 {
-  font-size: 15px;
-  color: #2A3E51;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  line-height: 150%;
-  margin: 15px 0 5px 0;
-  padding-right: 0;
-  -webkit-transition: padding 0.1s;
-  transition: padding 0.1s;
-  position: relative;
-}
-.field-fileupload .upload-object h4 a {
-  position: absolute;
-  right: 0;
-  top: 0;
-  display: none;
-  font-weight: 400;
-}
-.field-fileupload .upload-object p.size {
-  font-size: 12px;
-  color: #95a5a6;
-}
-.field-fileupload .upload-object p.size strong {
-  font-weight: 400;
-}
-.field-fileupload .upload-object .meta .drag-handle {
-  position: absolute;
-  bottom: 0;
-  right: 0;
-  cursor: move;
-  display: block;
-}
-.field-fileupload .upload-object .info h4 a,
-.field-fileupload .upload-object .meta a.upload-remove-button,
-.field-fileupload .upload-object .meta a.drag-handle {
-  color: #2b3e50;
-  display: none;
-  font-size: 15px;
-  text-decoration: none;
-}
-.field-fileupload .upload-object .icon-container {
-  position: relative;
-}
-.field-fileupload .upload-object .icon-container:after {
-  background-image: url('../../../../../system/assets/ui/images/loader-transparent.svg');
-  position: absolute;
-  content: ' ';
-  width: 40px;
-  height: 40px;
-  left: 50%;
-  top: 50%;
-  margin-top: -20px;
-  margin-left: -20px;
-  display: block;
-  background-size: 40px 40px;
-  background-position: 50% 50%;
-  -webkit-animation: spin 1s linear infinite;
-  animation: spin 1s linear infinite;
-}
-.field-fileupload .upload-object.is-success .icon-container {
-  opacity: 1;
-}
-.field-fileupload .upload-object.is-success .icon-container:after {
-  opacity: 0;
-  -webkit-transition: opacity 0.3s ease;
-  transition: opacity 0.3s ease;
-}
-.field-fileupload .upload-object.is-error .icon-container:after {
-  content: "";
-  background: none;
-  font-family: FontAwesome;
-  font-weight: normal;
-  font-style: normal;
-  text-decoration: inherit;
-  -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
-  content: "\f071";
-  -webkit-animation: none;
-  animation: none;
-  font-size: 40px;
-  color: #ab2a1c;
-  margin-top: -20px;
-  margin-left: -20px;
-  text-shadow: 2px 2px 0 #fff;
-}
-.field-fileupload .upload-object.is-loading .icon-container {
-  opacity: .6;
-}
-.field-fileupload .upload-object.is-loading .icon-container:after {
-  opacity: 1;
-  -webkit-transition: opacity 0.3s ease;
-  transition: opacity 0.3s ease;
-}
-.field-fileupload .upload-object.is-success {
-  cursor: pointer;
-}
-.field-fileupload .upload-object.is-success .progress-bar {
-  opacity: 0;
-  -webkit-transition: opacity 0.3s ease;
-  transition: opacity 0.3s ease;
-}
-.field-fileupload .upload-object.is-success:hover h4 a,
-.field-fileupload .upload-object.is-success:hover .meta .upload-remove-button,
-.field-fileupload .upload-object.is-success:hover .meta .drag-handle {
-  display: block;
-}
-.field-fileupload .upload-object.is-error {
-  cursor: pointer;
-}
-.field-fileupload .upload-object.is-error .icon-container {
-  opacity: 1;
-}
-.field-fileupload .upload-object.is-error .icon-container > img,
-.field-fileupload .upload-object.is-error .icon-container > i {
-  opacity: .5;
-}
-.field-fileupload .upload-object.is-error .info h4 {
-  color: #ab2a1c;
-}
-.field-fileupload .upload-object.is-error .info h4 a {
-  display: none;
-}
-.field-fileupload .upload-object.is-error .meta {
-  display: none;
-}
-.field-fileupload.is-sortable {
-  position: relative;
-}
-.field-fileupload.is-sortable .upload-placeholder {
-  position: relative;
-  border: 1px dotted #e0e0e0 !important;
-}
-.field-fileupload.is-sortable .upload-object.dragged {
-  position: absolute;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-  z-index: 2000;
-}
-.field-fileupload.is-sortable .upload-object.dragged .uploader-toolbar {
-  display: none;
-}
-.field-fileupload.is-preview .upload-button,
-.field-fileupload.is-preview .upload-remove-button,
-.field-fileupload.is-preview .meta a.drag-handle {
-  display: none !important;
-}
-@media (max-width: 1024px) {
-  .field-fileupload .upload-object.is-success h4 a,
-  .field-fileupload .upload-object.is-success .meta .upload-remove-button,
-  .field-fileupload .upload-object.is-success .meta .drag-handle {
-    display: block !important;
-  }
-}
-.fileupload-config-form .fileupload-url-button {
-  padding-left: 0;
-}
-.fileupload-config-form .fileupload-url-button > i {
-  color: #666;
-}
-.fileupload-config-form .file-upload-modal-image-header {
-  background-color: #FEFEFE;
-  background-image: -webkit-linear-gradient(45deg, #cbcbcb 25%, transparent 25%, transparent 75%, #cbcbcb 75%, #cbcbcb), -webkit-linear-gradient(45deg, #cbcbcb 25%, transparent 25%, transparent 75%, #cbcbcb 75%, #cbcbcb);
-  background-image: -moz-linear-gradient(45deg, #cbcbcb 25%, transparent 25%, transparent 75%, #cbcbcb 75%, #cbcbcb), -moz-linear-gradient(45deg, #cbcbcb 25%, transparent 25%, transparent 75%, #cbcbcb 75%, #cbcbcb);
-  background-image: -o-linear-gradient(45deg, #cbcbcb 25%, transparent 25%, transparent 75%, #cbcbcb 75%, #cbcbcb), -o-linear-gradient(45deg, #cbcbcb 25%, transparent 25%, transparent 75%, #cbcbcb 75%, #cbcbcb);
-  background-image: -ms-linear-gradient(45deg, #cbcbcb 25%, transparent 25%, transparent 75%, #cbcbcb 75%, #cbcbcb), -ms-linear-gradient(45deg, #cbcbcb 25%, transparent 25%, transparent 75%, #cbcbcb 75%, #cbcbcb);
-  background-image: linear-gradient(45deg, #cbcbcb 25%, transparent 25%, transparent 75%, #cbcbcb 75%, #cbcbcb), linear-gradient(45deg, #cbcbcb 25%, transparent 25%, transparent 75%, #cbcbcb 75%, #cbcbcb);
-  -webkit-background-size: 20px 20px;
-  -moz-background-size: 20px 20px;
-  background-size: 20px 20px;
-  background-position: 0 0, 10px 10px;
-}
-.fileupload-config-form .file-upload-modal-image-header,
-.fileupload-config-form .file-upload-modal-image-header img {
-  border-top-right-radius: 2px;
-  border-top-left-radius: 2px;
-}
-.fileupload-config-form .file-upload-modal-image-header .close {
-  position: absolute;
-  top: 20px;
-  right: 20px;
-}
-.field-fileupload.style-image-multi .upload-button,
-.field-fileupload.style-image-multi .upload-object {
-  margin: 0 10px 10px 0;
-}
-.field-fileupload.style-image-multi .upload-button {
-  display: block;
-  border: 2px dashed #BDC3C7;
-  background-clip: content-box;
-  background-color: #F9F9F9;
-  position: relative;
-  outline: none;
-  float: left;
-  width: 76px;
-  height: 76px;
-}
-.field-fileupload.style-image-multi .upload-button .upload-button-icon {
-  position: absolute;
-  width: 22px;
-  height: 22px;
-  top: 50%;
-  left: 50%;
-  margin-top: -11px;
-  margin-left: -11px;
-}
-.field-fileupload.style-image-multi .upload-button .upload-button-icon:before {
-  text-align: center;
-  display: block;
-  font-size: 22px;
-  height: 22px;
-  width: 22px;
-  line-height: 22px;
-  color: #BDC3C7;
-}
-.field-fileupload.style-image-multi .upload-button .upload-button-icon.large-icon {
-  width: 34px;
-  height: 34px;
-  top: 50%;
-  left: 50%;
-  margin-top: -17px;
-  margin-left: -17px;
-}
-.field-fileupload.style-image-multi .upload-button .upload-button-icon.large-icon:before {
-  font-size: 34px;
-  height: 24px;
-  width: 24px;
-  line-height: 24px;
-}
-.field-fileupload.style-image-multi .upload-button:hover {
-  border: 2px dashed #1F99DC;
-}
-.field-fileupload.style-image-multi .upload-button:hover .upload-button-icon:before {
-  color: #1F99DC;
-}
-.field-fileupload.style-image-multi .upload-button:focus {
-  border: 2px dashed #1F99DC;
-}
-.field-fileupload.style-image-multi .upload-button:focus .upload-button-icon:before {
-  color: #1F99DC;
-}
-.field-fileupload.style-image-multi .upload-files-container {
-  margin-left: 90px;
-}
-.field-fileupload.style-image-multi .upload-object {
-  background: #fff;
-  border: 1px solid #ecf0f1;
-  width: 260px;
-}
-.field-fileupload.style-image-multi .upload-object .progress-bar {
-  display: block;
-  width: 100%;
-  overflow: hidden;
-  height: 5px;
-  background-color: #f5f5f5;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  position: absolute;
-  bottom: 10px;
-  left: 0;
-}
-.field-fileupload.style-image-multi .upload-object .progress-bar .upload-progress {
-  float: left;
-  width: 0%;
-  height: 100%;
-  line-height: 5px;
-  color: #ffffff;
-  background-color: #5fb6f5;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  -webkit-transition: width 0.6s ease;
-  transition: width 0.6s ease;
-}
-.field-fileupload.style-image-multi .upload-object .icon-container {
-  border-right: 1px solid #f6f8f9;
-  float: left;
-  display: inline-block;
-  overflow: hidden;
-  width: 75px;
-  height: 75px;
-}
-.field-fileupload.style-image-multi .upload-object .icon-container i {
-  font-size: 35px;
-}
-.field-fileupload.style-image-multi .upload-object .icon-container.image img {
-  border-bottom-left-radius: 3px;
-  border-top-left-radius: 3px;
-  width: auto;
-}
-.field-fileupload.style-image-multi .upload-object .info {
-  margin-left: 90px;
-}
-.field-fileupload.style-image-multi .upload-object .info h4 {
-  padding-right: 15px;
-}
-.field-fileupload.style-image-multi .upload-object .info h4 a {
-  right: 15px;
-}
-.field-fileupload.style-image-multi .upload-object .meta {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  margin: 0 15px 0 90px;
-}
-.field-fileupload.style-image-multi .upload-object .meta a.drag-handle {
-  bottom: 15px;
-}
-.field-fileupload.style-image-multi .upload-object.upload-placeholder {
-  height: 75px;
-  background-color: transparent;
-}
-.field-fileupload.style-image-multi .upload-object.upload-placeholder:after {
-  opacity: 0;
-}
-.field-fileupload.style-image-multi .upload-object:hover {
-  background: #4da7e8 !important;
-}
-.field-fileupload.style-image-multi .upload-object:hover i,
-.field-fileupload.style-image-multi .upload-object:hover p.size {
-  color: #ecf0f1;
-}
-.field-fileupload.style-image-multi .upload-object:hover h4 {
-  color: white;
-}
-.field-fileupload.style-image-multi .upload-object:hover .icon-container {
-  border-right-color: #4da7e8 !important;
-}
-.field-fileupload.style-image-multi .upload-object:hover h4 {
-  padding-right: 35px;
-}
-.field-fileupload.style-image-multi.is-preview .upload-files-container {
-  margin-left: 0;
-}
-@media (max-width: 1280px) {
-  .field-fileupload.style-image-multi .upload-object {
-    width: 230px;
-  }
-}
-@media (max-width: 1024px) {
-  .field-fileupload.style-image-multi .upload-button {
-    width: 100%;
-  }
-  .field-fileupload.style-image-multi .upload-files-container {
-    margin-left: 0;
-  }
-  .field-fileupload.style-image-multi .upload-object {
-    margin-right: 0;
-    display: block;
-    width: auto;
-  }
-}
-.field-fileupload.style-image-single.is-populated .upload-button {
-  display: none;
-}
-.field-fileupload.style-image-single .upload-button {
-  display: block;
-  border: 2px dashed #BDC3C7;
-  background-clip: content-box;
-  background-color: #F9F9F9;
-  position: relative;
-  outline: none;
-  min-height: 100px;
-  min-width: 100px;
-}
-.field-fileupload.style-image-single .upload-button .upload-button-icon {
-  position: absolute;
-  width: 22px;
-  height: 22px;
-  top: 50%;
-  left: 50%;
-  margin-top: -11px;
-  margin-left: -11px;
-}
-.field-fileupload.style-image-single .upload-button .upload-button-icon:before {
-  text-align: center;
-  display: block;
-  font-size: 22px;
-  height: 22px;
-  width: 22px;
-  line-height: 22px;
-  color: #BDC3C7;
-}
-.field-fileupload.style-image-single .upload-button .upload-button-icon.large-icon {
-  width: 34px;
-  height: 34px;
-  top: 50%;
-  left: 50%;
-  margin-top: -17px;
-  margin-left: -17px;
-}
-.field-fileupload.style-image-single .upload-button .upload-button-icon.large-icon:before {
-  font-size: 34px;
-  height: 24px;
-  width: 24px;
-  line-height: 24px;
-}
-.field-fileupload.style-image-single .upload-button:hover {
-  border: 2px dashed #1F99DC;
-}
-.field-fileupload.style-image-single .upload-button:hover .upload-button-icon:before {
-  color: #1F99DC;
-}
-.field-fileupload.style-image-single .upload-button:focus {
-  border: 2px dashed #1F99DC;
-}
-.field-fileupload.style-image-single .upload-button:focus .upload-button-icon:before {
-  color: #1F99DC;
-}
-.field-fileupload.style-image-single .upload-object {
-  padding-bottom: 66px;
-}
-.field-fileupload.style-image-single .upload-object .icon-container {
-  border: 1px solid #f6f8f9;
-  background: rgba(255, 255, 255, 0.5);
-}
-.field-fileupload.style-image-single .upload-object .icon-container.image img {
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  display: block;
-  max-width: 100%;
-  height: auto;
-  min-height: 100px;
-  min-width: 100px;
-}
-.field-fileupload.style-image-single .upload-object .progress-bar {
-  display: block;
-  width: 100%;
-  overflow: hidden;
-  height: 5px;
-  background-color: #f5f5f5;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  position: absolute;
-  bottom: 10px;
-  left: 0;
-}
-.field-fileupload.style-image-single .upload-object .progress-bar .upload-progress {
-  float: left;
-  width: 0%;
-  height: 100%;
-  line-height: 5px;
-  color: #ffffff;
-  background-color: #5fb6f5;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  -webkit-transition: width 0.6s ease;
-  transition: width 0.6s ease;
-}
-.field-fileupload.style-image-single .upload-object .info {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  height: 66px;
-}
-.field-fileupload.style-image-single .upload-object .meta {
-  position: absolute;
-  bottom: 65px;
-  left: 0;
-  right: 0;
-  margin: 0 15px;
-}
-.field-fileupload.style-image-single .upload-object:hover h4 {
-  padding-right: 20px;
-}
-@media (max-width: 1024px) {
-  .field-fileupload.style-image-single .upload-object h4 {
-    padding-right: 20px !important;
-  }
-}
-.field-fileupload.style-file-multi .upload-button {
-  margin-bottom: 10px;
-}
-.field-fileupload.style-file-multi .upload-files-container {
-  border: 1px solid #eeeeee;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  border-bottom: none;
-  display: none;
-}
-.field-fileupload.style-file-multi.is-populated .upload-files-container {
-  display: block;
-}
-.field-fileupload.style-file-multi .upload-object {
-  display: block;
-  width: 100%;
-  border-bottom: 1px solid #eeeeee;
-  padding-left: 10px;
-}
-.field-fileupload.style-file-multi .upload-object:nth-child(even) {
-  background-color: #f5f5f5;
-}
-.field-fileupload.style-file-multi .upload-object .icon-container {
-  position: absolute;
-  top: 0;
-  left: 10px;
-  width: 15px;
-  padding: 11px 7px;
-}
-.field-fileupload.style-file-multi .upload-object .icon-container i {
-  line-height: 150%;
-  font-size: 15px;
-}
-.field-fileupload.style-file-multi .upload-object .icon-container img {
-  display: none;
-}
-.field-fileupload.style-file-multi .upload-object .info {
-  margin-left: 35px;
-  margin-right: 15%;
-}
-.field-fileupload.style-file-multi .upload-object .info h4,
-.field-fileupload.style-file-multi .upload-object .info p {
-  margin: 0;
-  padding: 11px 0;
-  font-size: 12px;
-  font-weight: normal;
-  line-height: 150%;
-  color: #666666;
-}
-.field-fileupload.style-file-multi .upload-object .info h4 {
-  padding-right: 15px;
-}
-.field-fileupload.style-file-multi .upload-object .info h4 a {
-  padding: 10px 0;
-  right: 15px;
-}
-.field-fileupload.style-file-multi .upload-object .info p.size {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 15%;
-  display: none;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.field-fileupload.style-file-multi .upload-object .progress-bar {
-  display: block;
-  width: 100%;
-  overflow: hidden;
-  height: 5px;
-  background-color: #f5f5f5;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  position: absolute;
-  top: 18px;
-  left: 0;
-}
-.field-fileupload.style-file-multi .upload-object .progress-bar .upload-progress {
-  float: left;
-  width: 0%;
-  height: 100%;
-  line-height: 5px;
-  color: #ffffff;
-  background-color: #5fb6f5;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  -webkit-transition: width 0.6s ease;
-  transition: width 0.6s ease;
-}
-.field-fileupload.style-file-multi .upload-object .meta {
-  position: absolute;
-  top: 0;
-  right: 0;
-  margin-right: 15px;
-  width: 15%;
-}
-.field-fileupload.style-file-multi .upload-object .meta a.drag-handle {
-  top: -2px;
-  bottom: auto;
-  line-height: 150%;
-  padding: 10px 0;
-}
-.field-fileupload.style-file-multi .upload-object .icon-container:after {
-  width: 20px;
-  height: 20px;
-  margin-top: -10px;
-  margin-left: -10px;
-  background-size: 20px 20px;
-}
-.field-fileupload.style-file-multi .upload-object.is-error .icon-container:after {
-  font-size: 20px;
-}
-.field-fileupload.style-file-multi .upload-object.is-success .info p.size {
-  display: block;
-}
-.field-fileupload.style-file-multi .upload-object.upload-placeholder {
-  height: 35px;
-  background-color: transparent;
-}
-.field-fileupload.style-file-multi .upload-object.upload-placeholder:after {
-  opacity: 0;
-}
-.field-fileupload.style-file-multi .upload-object:hover {
-  background: #4da7e8 !important;
-}
-.field-fileupload.style-file-multi .upload-object:hover i,
-.field-fileupload.style-file-multi .upload-object:hover p.size {
-  color: #ecf0f1;
-}
-.field-fileupload.style-file-multi .upload-object:hover h4 {
-  color: white;
-}
-.field-fileupload.style-file-multi .upload-object:hover .icon-container {
-  border-right-color: #4da7e8 !important;
-}
-.field-fileupload.style-file-multi .upload-object:hover h4 {
-  padding-right: 35px;
-}
-@media (max-width: 1199px) {
-  .field-fileupload.style-file-multi .info {
-    margin-right: 20% !important;
-  }
-  .field-fileupload.style-file-multi .info p.size {
-    width: 20% !important;
-  }
-  .field-fileupload.style-file-multi .meta {
-    width: 20% !important;
-  }
-}
-@media (max-width: 991px) {
-  .field-fileupload.style-file-multi .upload-object h4 {
-    padding-right: 35px !important;
-  }
-  .field-fileupload.style-file-multi .info {
-    margin-right: 25% !important;
-  }
-  .field-fileupload.style-file-multi .info p.size {
-    width: 25% !important;
-    padding-right: 35px !important;
-  }
-  .field-fileupload.style-file-multi .meta {
-    width: 25% !important;
-  }
-}
-.field-fileupload.style-file-single {
-  background-color: #ffffff;
-  border: 1px solid #bdc3c7;
-  overflow: hidden;
-  position: relative;
-  padding-right: 30px;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 0.5px 1px #bdc3c7, 0 1.5px 0 #fff;
-  box-shadow: inset 0 0.5px 1px #bdc3c7, 0 1.5px 0 #fff;
-}
-.field-fileupload.style-file-single .upload-button {
-  position: absolute;
-  top: 50%;
-  margin-top: -44px;
-  height: 88px;
-  background: transparent;
-  right: -2px;
-  color: #595959;
-}
-.field-fileupload.style-file-single .upload-button i {
-  font-size: 14px;
-}
-.field-fileupload.style-file-single .upload-button:hover {
-  color: #333333;
-}
-.field-fileupload.style-file-single .upload-empty-message {
-  padding: 8px 0 8px 11px;
-  font-size: 14px;
-}
-.field-fileupload.style-file-single.is-populated .upload-empty-message {
-  display: none;
-}
-.field-fileupload.style-file-single .upload-object {
-  display: block;
-  width: 100%;
-  padding: 7px 0 9px 0;
-}
-.field-fileupload.style-file-single .upload-object .icon-container {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 15px;
-  padding: 0 5px;
-  margin: 8px 0 0 7px;
-  text-align: center;
-}
-.field-fileupload.style-file-single .upload-object .icon-container i {
-  line-height: 150%;
-  font-size: 15px;
-}
-.field-fileupload.style-file-single .upload-object .icon-container img {
-  display: none;
-}
-.field-fileupload.style-file-single .upload-object .info {
-  margin-left: 34px;
-  margin-right: 15%;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.field-fileupload.style-file-single .upload-object .info h4,
-.field-fileupload.style-file-single .upload-object .info p {
-  display: inline;
-  margin: 0;
-  padding: 0;
-  font-size: 13px;
-  line-height: 150%;
-  color: #666666;
-}
-.field-fileupload.style-file-single .upload-object .info p.size {
-  font-weight: normal;
-}
-.field-fileupload.style-file-single .upload-object .info p.size:before {
-  content: " - ";
-}
-.field-fileupload.style-file-single .upload-object .progress-bar {
-  display: block;
-  width: 100%;
-  overflow: hidden;
-  height: 5px;
-  background-color: #f5f5f5;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  position: absolute;
-  top: 50%;
-  margin-top: -2px;
-  right: 5px;
-}
-.field-fileupload.style-file-single .upload-object .progress-bar .upload-progress {
-  float: left;
-  width: 0%;
-  height: 100%;
-  line-height: 5px;
-  color: #ffffff;
-  background-color: #5fb6f5;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  -webkit-transition: width 0.6s ease;
-  transition: width 0.6s ease;
-}
-.field-fileupload.style-file-single .upload-object .meta {
-  position: absolute;
-  top: 50%;
-  margin-top: -44px;
-  height: 88px;
-  right: 0;
-  width: 15%;
-}
-.field-fileupload.style-file-single .upload-object .meta .upload-remove-button {
-  position: absolute;
-  top: 50%;
-  right: 0;
-  height: 20px;
-  margin-top: -10px;
-  margin-right: 10px;
-  z-index: 100;
-}
-.field-fileupload.style-file-single .upload-object .icon-container:after {
-  width: 20px;
-  height: 20px;
-  margin-top: -10px;
-  margin-left: -10px;
-  background-size: 20px 20px;
-}
-.field-fileupload.style-file-single .upload-object.is-error .icon-container:after {
-  font-size: 20px;
-}
+.field-fileupload .upload-object{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;position:relative;outline:none;overflow:hidden;display:inline-block;vertical-align:top}
+.field-fileupload .upload-object img{width:100%;height:100%}
+.field-fileupload .upload-object .icon-container{display:table;opacity:.6}
+.field-fileupload .upload-object .icon-container i{color:#95a5a6;display:inline-block}
+.field-fileupload .upload-object .icon-container div{display:table-cell;text-align:center;vertical-align:middle}
+.field-fileupload .upload-object .icon-container.image > div.icon-wrapper{display:none}
+.field-fileupload .upload-object h4{font-size:15px;color:#2A3E51;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:150%;margin:15px 0 5px 0;padding-right:0;-webkit-transition:padding 0.1s;transition:padding 0.1s;position:relative}
+.field-fileupload .upload-object h4 a{position:absolute;right:0;top:0;display:none;font-weight:400}
+.field-fileupload .upload-object p.size{font-size:12px;color:#95a5a6}
+.field-fileupload .upload-object p.size strong{font-weight:400}
+.field-fileupload .upload-object .meta .drag-handle{position:absolute;bottom:0;right:0;cursor:move;display:block}
+.field-fileupload .upload-object .info h4 a,.field-fileupload .upload-object .meta a.upload-remove-button,.field-fileupload .upload-object .meta a.drag-handle{color:#2b3e50;display:none;font-size:15px;text-decoration:none}
+.field-fileupload .upload-object .icon-container{position:relative}
+.field-fileupload .upload-object .icon-container:after{background-image:url('../../../../../system/assets/ui/images/loader-transparent.svg');position:absolute;content:' ';width:40px;height:40px;left:50%;top:50%;margin-top:-20px;margin-left:-20px;display:block;background-size:40px 40px;background-position:50% 50%;-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}
+.field-fileupload .upload-object.is-success .icon-container{opacity:1}
+.field-fileupload .upload-object.is-success .icon-container:after{opacity:0;-webkit-transition:opacity 0.3s ease;transition:opacity 0.3s ease}
+.field-fileupload .upload-object.is-error .icon-container:after{content:"";background:none;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f071";-webkit-animation:none;animation:none;font-size:40px;color:#ab2a1c;margin-top:-20px;margin-left:-20px;text-shadow:2px 2px 0 #fff}
+.field-fileupload .upload-object.is-loading .icon-container{opacity:.6}
+.field-fileupload .upload-object.is-loading .icon-container:after{opacity:1;-webkit-transition:opacity 0.3s ease;transition:opacity 0.3s ease}
+.field-fileupload .upload-object.is-success{cursor:pointer}
+.field-fileupload .upload-object.is-success .progress-bar{opacity:0;-webkit-transition:opacity 0.3s ease;transition:opacity 0.3s ease}
+.field-fileupload .upload-object.is-success:hover h4 a,.field-fileupload .upload-object.is-success:hover .meta .upload-remove-button,.field-fileupload .upload-object.is-success:hover .meta .drag-handle{display:block}
+.field-fileupload .upload-object.is-error{cursor:pointer}
+.field-fileupload .upload-object.is-error .icon-container{opacity:1}
+.field-fileupload .upload-object.is-error .icon-container > img,.field-fileupload .upload-object.is-error .icon-container > i{opacity:.5}
+.field-fileupload .upload-object.is-error .info h4{color:#ab2a1c}
+.field-fileupload .upload-object.is-error .info h4 a{display:none}
+.field-fileupload .upload-object.is-error .meta{display:none}
+.field-fileupload.is-sortable{position:relative}
+.field-fileupload.is-sortable .upload-placeholder{position:relative;border:1px dotted #e0e0e0 !important}
+.field-fileupload.is-sortable .upload-object.dragged{position:absolute;opacity:0.5;filter:alpha(opacity=50);z-index:2000}
+.field-fileupload.is-sortable .upload-object.dragged .uploader-toolbar{display:none}
+.field-fileupload.is-preview .upload-button,.field-fileupload.is-preview .upload-remove-button,.field-fileupload.is-preview .meta a.drag-handle{display:none !important}
+@media (max-width:1024px){.field-fileupload .upload-object.is-success h4 a,.field-fileupload .upload-object.is-success .meta .upload-remove-button,.field-fileupload .upload-object.is-success .meta .drag-handle{display:block !important}
+}
+.fileupload-config-form .fileupload-url-button{padding-left:0}
+.fileupload-config-form .fileupload-url-button > i{color:#666}
+.fileupload-config-form .file-upload-modal-image-header{background-color:#FEFEFE;background-image:-webkit-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb),-webkit-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb);background-image:-moz-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb),-moz-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb);background-image:-o-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb),-o-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb);background-image:-ms-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb),-ms-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb);background-image:linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb),linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb);-webkit-background-size:20px 20px;-moz-background-size:20px 20px;background-size:20px 20px;background-position:0 0,10px 10px}
+.fileupload-config-form .file-upload-modal-image-header,.fileupload-config-form .file-upload-modal-image-header img{border-top-right-radius:2px;border-top-left-radius:2px}
+.fileupload-config-form .file-upload-modal-image-header .close{position:absolute;top:20px;right:20px}
+.field-fileupload.style-image-multi .upload-button,.field-fileupload.style-image-multi .upload-object{margin:0 10px 10px 0}
+.field-fileupload.style-image-multi .upload-button{display:block;border:2px dashed #BDC3C7;background-clip:content-box;background-color:#F9F9F9;position:relative;outline:none;float:left;width:76px;height:76px}
+.field-fileupload.style-image-multi .upload-button .upload-button-icon{position:absolute;width:22px;height:22px;top:50%;left:50%;margin-top:-11px;margin-left:-11px}
+.field-fileupload.style-image-multi .upload-button .upload-button-icon:before{text-align:center;display:block;font-size:22px;height:22px;width:22px;line-height:22px;color:#BDC3C7}
+.field-fileupload.style-image-multi .upload-button .upload-button-icon.large-icon{width:34px;height:34px;top:50%;left:50%;margin-top:-17px;margin-left:-17px}
+.field-fileupload.style-image-multi .upload-button .upload-button-icon.large-icon:before{font-size:34px;height:24px;width:24px;line-height:24px}
+.field-fileupload.style-image-multi .upload-button:hover{border:2px dashed #1F99DC}
+.field-fileupload.style-image-multi .upload-button:hover .upload-button-icon:before{color:#1F99DC}
+.field-fileupload.style-image-multi .upload-button:focus{border:2px dashed #1F99DC}
+.field-fileupload.style-image-multi .upload-button:focus .upload-button-icon:before{color:#1F99DC}
+.field-fileupload.style-image-multi .upload-files-container{margin-left:90px}
+.field-fileupload.style-image-multi .upload-object{background:#fff;border:1px solid #ecf0f1;width:260px}
+.field-fileupload.style-image-multi .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:3px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;bottom:10px;left:0}
+.field-fileupload.style-image-multi .upload-object .progress-bar .upload-progress{float:left;width:0%;height:100%;line-height:5px;color:#ffffff;background-color:#5fb6f5;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}
+.field-fileupload.style-image-multi .upload-object .icon-container{border-right:1px solid #f6f8f9;float:left;display:inline-block;overflow:hidden;width:75px;height:75px}
+.field-fileupload.style-image-multi .upload-object .icon-container i{font-size:35px}
+.field-fileupload.style-image-multi .upload-object .icon-container.image img{border-bottom-left-radius:3px;border-top-left-radius:3px;width:auto}
+.field-fileupload.style-image-multi .upload-object .info{margin-left:90px}
+.field-fileupload.style-image-multi .upload-object .info h4{padding-right:15px}
+.field-fileupload.style-image-multi .upload-object .info h4 a{right:15px}
+.field-fileupload.style-image-multi .upload-object .meta{position:absolute;bottom:0;left:0;right:0;margin:0 15px 0 90px}
+.field-fileupload.style-image-multi .upload-object .meta a.drag-handle{bottom:15px}
+.field-fileupload.style-image-multi .upload-object.upload-placeholder{height:75px;background-color:transparent}
+.field-fileupload.style-image-multi .upload-object.upload-placeholder:after{opacity:0}
+.field-fileupload.style-image-multi .upload-object:hover{background:#4da7e8 !important}
+.field-fileupload.style-image-multi .upload-object:hover i,.field-fileupload.style-image-multi .upload-object:hover p.size{color:#ecf0f1}
+.field-fileupload.style-image-multi .upload-object:hover h4{color:white}
+.field-fileupload.style-image-multi .upload-object:hover .icon-container{border-right-color:#4da7e8 !important}
+.field-fileupload.style-image-multi .upload-object:hover h4{padding-right:35px}
+.field-fileupload.style-image-multi.is-preview .upload-files-container{margin-left:0}
+@media (max-width:1280px){.field-fileupload.style-image-multi .upload-object{width:230px}
+}
+@media (max-width:1024px){.field-fileupload.style-image-multi .upload-button{width:100%}
+.field-fileupload.style-image-multi .upload-files-container{margin-left:0}
+.field-fileupload.style-image-multi .upload-object{margin-right:0;display:block;width:auto}
+}
+.field-fileupload.style-image-single.is-populated .upload-button{display:none}
+.field-fileupload.style-image-single .upload-button{display:block;border:2px dashed #BDC3C7;background-clip:content-box;background-color:#F9F9F9;position:relative;outline:none;min-height:100px;min-width:100px}
+.field-fileupload.style-image-single .upload-button .upload-button-icon{position:absolute;width:22px;height:22px;top:50%;left:50%;margin-top:-11px;margin-left:-11px}
+.field-fileupload.style-image-single .upload-button .upload-button-icon:before{text-align:center;display:block;font-size:22px;height:22px;width:22px;line-height:22px;color:#BDC3C7}
+.field-fileupload.style-image-single .upload-button .upload-button-icon.large-icon{width:34px;height:34px;top:50%;left:50%;margin-top:-17px;margin-left:-17px}
+.field-fileupload.style-image-single .upload-button .upload-button-icon.large-icon:before{font-size:34px;height:24px;width:24px;line-height:24px}
+.field-fileupload.style-image-single .upload-button:hover{border:2px dashed #1F99DC}
+.field-fileupload.style-image-single .upload-button:hover .upload-button-icon:before{color:#1F99DC}
+.field-fileupload.style-image-single .upload-button:focus{border:2px dashed #1F99DC}
+.field-fileupload.style-image-single .upload-button:focus .upload-button-icon:before{color:#1F99DC}
+.field-fileupload.style-image-single .upload-object{padding-bottom:66px}
+.field-fileupload.style-image-single .upload-object .icon-container{border:1px solid #f6f8f9;background:rgba(255,255,255,0.5)}
+.field-fileupload.style-image-single .upload-object .icon-container.image img{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;display:block;max-width:100%;height:auto;min-height:100px;min-width:100px}
+.field-fileupload.style-image-single .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:3px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;bottom:10px;left:0}
+.field-fileupload.style-image-single .upload-object .progress-bar .upload-progress{float:left;width:0%;height:100%;line-height:5px;color:#ffffff;background-color:#5fb6f5;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}
+.field-fileupload.style-image-single .upload-object .info{position:absolute;left:0;right:0;bottom:0;height:66px}
+.field-fileupload.style-image-single .upload-object .meta{position:absolute;bottom:65px;left:0;right:0;margin:0 15px}
+.field-fileupload.style-image-single .upload-object:hover h4{padding-right:20px}
+@media (max-width:1024px){.field-fileupload.style-image-single .upload-object h4{padding-right:20px !important}
+}
+.field-fileupload.style-file-multi .upload-button{margin-bottom:10px}
+.field-fileupload.style-file-multi .upload-files-container{border:1px solid #eeeeee;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;border-bottom:none;display:none}
+.field-fileupload.style-file-multi.is-populated .upload-files-container{display:block}
+.field-fileupload.style-file-multi .upload-object{display:block;width:100%;border-bottom:1px solid #eeeeee;padding-left:10px}
+.field-fileupload.style-file-multi .upload-object:nth-child(even){background-color:#f5f5f5}
+.field-fileupload.style-file-multi .upload-object .icon-container{position:absolute;top:0;left:10px;width:15px;padding:11px 7px}
+.field-fileupload.style-file-multi .upload-object .icon-container i{line-height:150%;font-size:15px}
+.field-fileupload.style-file-multi .upload-object .icon-container img{display:none}
+.field-fileupload.style-file-multi .upload-object .info{margin-left:35px;margin-right:15%}
+.field-fileupload.style-file-multi .upload-object .info h4,.field-fileupload.style-file-multi .upload-object .info p{margin:0;padding:11px 0;font-size:12px;font-weight:normal;line-height:150%;color:#666666}
+.field-fileupload.style-file-multi .upload-object .info h4{padding-right:15px}
+.field-fileupload.style-file-multi .upload-object .info h4 a{padding:10px 0;right:15px}
+.field-fileupload.style-file-multi .upload-object .info p.size{position:absolute;top:0;right:0;width:15%;display:none;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.field-fileupload.style-file-multi .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:3px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;top:18px;left:0}
+.field-fileupload.style-file-multi .upload-object .progress-bar .upload-progress{float:left;width:0%;height:100%;line-height:5px;color:#ffffff;background-color:#5fb6f5;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}
+.field-fileupload.style-file-multi .upload-object .meta{position:absolute;top:0;right:0;margin-right:15px;width:15%}
+.field-fileupload.style-file-multi .upload-object .meta a.drag-handle{top:-2px;bottom:auto;line-height:150%;padding:10px 0}
+.field-fileupload.style-file-multi .upload-object .icon-container:after{width:20px;height:20px;margin-top:-10px;margin-left:-10px;background-size:20px 20px}
+.field-fileupload.style-file-multi .upload-object.is-error .icon-container:after{font-size:20px}
+.field-fileupload.style-file-multi .upload-object.is-success .info p.size{display:block}
+.field-fileupload.style-file-multi .upload-object.upload-placeholder{height:35px;background-color:transparent}
+.field-fileupload.style-file-multi .upload-object.upload-placeholder:after{opacity:0}
+.field-fileupload.style-file-multi .upload-object:hover{background:#4da7e8 !important}
+.field-fileupload.style-file-multi .upload-object:hover i,.field-fileupload.style-file-multi .upload-object:hover p.size{color:#ecf0f1}
+.field-fileupload.style-file-multi .upload-object:hover h4{color:white}
+.field-fileupload.style-file-multi .upload-object:hover .icon-container{border-right-color:#4da7e8 !important}
+.field-fileupload.style-file-multi .upload-object:hover h4{padding-right:35px}
+@media (max-width:1199px){.field-fileupload.style-file-multi .info{margin-right:20% !important}
+.field-fileupload.style-file-multi .info p.size{width:20% !important}
+.field-fileupload.style-file-multi .meta{width:20% !important}
+}
+@media (max-width:991px){.field-fileupload.style-file-multi .upload-object h4{padding-right:35px !important}
+.field-fileupload.style-file-multi .info{margin-right:25% !important}
+.field-fileupload.style-file-multi .info p.size{width:25% !important;padding-right:35px !important}
+.field-fileupload.style-file-multi .meta{width:25% !important}
+}
+.field-fileupload.style-file-single{background-color:#ffffff;border:1px solid #bdc3c7;overflow:hidden;position:relative;padding-right:30px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff;box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff}
+.field-fileupload.style-file-single .upload-button{position:absolute;top:50%;margin-top:-44px;height:88px;background:transparent;right:-2px;color:#595959}
+.field-fileupload.style-file-single .upload-button i{font-size:14px}
+.field-fileupload.style-file-single .upload-button:hover{color:#333333}
+.field-fileupload.style-file-single .upload-empty-message{padding:8px 0 8px 11px;font-size:14px}
+.field-fileupload.style-file-single.is-populated .upload-empty-message{display:none}
+.field-fileupload.style-file-single .upload-object{display:block;width:100%;padding:7px 0 9px 0}
+.field-fileupload.style-file-single .upload-object .icon-container{position:absolute;top:0;left:0;width:15px;padding:0 5px;margin:8px 0 0 7px;text-align:center}
+.field-fileupload.style-file-single .upload-object .icon-container i{line-height:150%;font-size:15px}
+.field-fileupload.style-file-single .upload-object .icon-container img{display:none}
+.field-fileupload.style-file-single .upload-object .info{margin-left:34px;margin-right:15%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.field-fileupload.style-file-single .upload-object .info h4,.field-fileupload.style-file-single .upload-object .info p{display:inline;margin:0;padding:0;font-size:13px;line-height:150%;color:#666666}
+.field-fileupload.style-file-single .upload-object .info p.size{font-weight:normal}
+.field-fileupload.style-file-single .upload-object .info p.size:before{content:" - "}
+.field-fileupload.style-file-single .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:3px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;top:50%;margin-top:-2px;right:5px}
+.field-fileupload.style-file-single .upload-object .progress-bar .upload-progress{float:left;width:0%;height:100%;line-height:5px;color:#ffffff;background-color:#5fb6f5;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}
+.field-fileupload.style-file-single .upload-object .meta{position:absolute;top:50%;margin-top:-44px;height:88px;right:0;width:15%}
+.field-fileupload.style-file-single .upload-object .meta .upload-remove-button{position:absolute;top:50%;right:0;height:20px;margin-top:-10px;margin-right:10px;z-index:100}
+.field-fileupload.style-file-single .upload-object .icon-container:after{width:20px;height:20px;margin-top:-10px;margin-left:-10px;background-size:20px 20px}
+.field-fileupload.style-file-single .upload-object.is-error .icon-container:after{font-size:20px}
\ No newline at end of file
diff --git a/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less b/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less
index c783a15d3..cdeff2161 100644
--- a/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less
+++ b/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less
@@ -9,7 +9,7 @@
     position: relative;
     padding-right: 30px;
     border-radius: 3px;
-    .box-shadow(~"inset 0 0.5px 1px @{input-border}, 0 1.5px 0 #fff");
+    .box-shadow(~"inset 0 1px 0 @{input-border}, 0 1px 0 #fff");
 
     .upload-button {
         .uploader-vertical-align();
diff --git a/modules/backend/layouts/_sidenav.htm b/modules/backend/layouts/_sidenav.htm
index 076dea104..1e1b60a84 100644
--- a/modules/backend/layouts/_sidenav.htm
+++ b/modules/backend/layouts/_sidenav.htm
@@ -12,12 +12,12 @@
                 <nav
                     id="layout-sidenav"
                     class="layout-sidenav bg-s"
-                    data-active-class="active bg-p"
+                    data-active-class="active"
                     data-control="sidenav">
                     <ul class="nav">
                         <?php foreach ($sideMenuItems as $sideItemCode => $item): ?>
                             <li
-                                class="<?= BackendMenu::isSideMenuItemActive($item) ? 'active bg-p' : null ?>"
+                                class="<?= BackendMenu::isSideMenuItemActive($item) ? 'active' : null ?>"
                                 <?= HTML::attributes($item->attributes) ?>
                             >
                                 <a href="<?= $item->url ?>">
diff --git a/modules/cms/formwidgets/mediafinder/assets/css/mediafinder.css b/modules/cms/formwidgets/mediafinder/assets/css/mediafinder.css
index 501ed1121..3f78d4631 100644
--- a/modules/cms/formwidgets/mediafinder/assets/css/mediafinder.css
+++ b/modules/cms/formwidgets/mediafinder/assets/css/mediafinder.css
@@ -138,8 +138,8 @@
   position: relative;
   padding-right: 30px;
   border-radius: 3px;
-  -webkit-box-shadow: inset 0 0.5px 1px #bdc3c7, 0 1.5px 0 #fff;
-  box-shadow: inset 0 0.5px 1px #bdc3c7, 0 1.5px 0 #fff;
+  -webkit-box-shadow: inset 0 1px 0 #bdc3c7, 0 1px 0 #fff;
+  box-shadow: inset 0 1px 0 #bdc3c7, 0 1px 0 #fff;
 }
 .field-mediafinder.style-file-single .find-button {
   position: absolute;
diff --git a/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less b/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less
index a26684979..b2d005f7b 100644
--- a/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less
+++ b/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less
@@ -6,7 +6,7 @@
     position: relative;
     padding-right: 30px;
     border-radius: 3px;
-    .box-shadow(~"inset 0 0.5px 1px @{input-border}, 0 1.5px 0 #fff");
+    .box-shadow(~"inset 0 1px 0 @{input-border}, 0 1px 0 #fff");
 
     .find-button {
         .finder-vertical-align();
diff --git a/modules/system/assets/ui/less/breadcrumb.less b/modules/system/assets/ui/less/breadcrumb.less
index 7f1811800..7ede1f39b 100644
--- a/modules/system/assets/ui/less/breadcrumb.less
+++ b/modules/system/assets/ui/less/breadcrumb.less
@@ -18,6 +18,7 @@
 .control-breadcrumb {
     margin: -(@padding-standard) -(@padding-standard) @padding-standard -(@padding-standard);
     background-color: @color-breadcrumb-background;
+    .box-shadow(inset 0 -2px 0 rgba(0,0,0,.05));
 
     ul {
         padding: 0;
@@ -39,6 +40,7 @@
             display: inline-block;
             color: @color-breadcrumb-text;
             text-decoration: none;
+            text-shadow: 0 1px 0 rgba(0,0,0,.2);
             &:hover { color: @color-breadcrumb-text; }
         }
 
@@ -70,6 +72,7 @@
         &:last-child {
             background-color: transparent;
             color: @color-breadcrumb-active-text;
+            text-shadow: 0 1px 0 rgba(255,255,255,.7);
 
             &:after {
                 display: none;
diff --git a/modules/system/assets/ui/less/button.less b/modules/system/assets/ui/less/button.less
index e7d07be9f..b0d79e573 100644
--- a/modules/system/assets/ui/less/button.less
+++ b/modules/system/assets/ui/less/button.less
@@ -21,7 +21,7 @@
     text-align: left;
     outline: none !important;
     text-shadow: 0 -1px 0 rgba(0,0,0,.4);
-    .box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.25), inset 0 1px 0 rgba(255,255,255,.35)");
+    .box-shadow(~"inset 0 -2px 0 rgba(0,0,0,.15)");
 
     &[class^="oc-icon-"],
     &[class*=" oc-icon-"] {
@@ -51,8 +51,8 @@
 }
 
 .btn-link {
-    .box-shadow(none);
-    text-shadow: none;
+    .box-shadow(none) !important;
+    text-shadow: none !important;
 }
 
 .btn-group {
diff --git a/modules/system/assets/ui/less/checkbox.less b/modules/system/assets/ui/less/checkbox.less
index 607ef90fa..40ede8e06 100644
--- a/modules/system/assets/ui/less/checkbox.less
+++ b/modules/system/assets/ui/less/checkbox.less
@@ -14,7 +14,7 @@
 @color-checkbox-checked:                        #1F99DC;
 
 @color-checkbox-icon:                           #FFFFFF;
-@color-checkbox-border:                         #DCE1E3;
+@color-checkbox-border:                         @input-border;
 
 @color-checkbox-switch-bg:                      #f6f6f6;
 @color-checkbox-switch-on:                      #76A544;
@@ -68,15 +68,17 @@
             margin-right: 15px;
             position: absolute;
             left: -3px;
-            top: -1px;
+            top: 0;
             background-color: #FFFFFF;
-            border: 2px solid @color-checkbox-border;
+            border: 1px solid @color-checkbox-border;
+            .box-shadow(~"inset 0 1px 0 @{input-border}, 0 1px 0 #fff");
         }
         &:hover:before {
             border-color: darken(@color-checkbox-border, 10%);
         }
         &:active:before {
             border-color: darken(@color-checkbox-border, 20%);
+            border-width: 2px;
         }
     }
 
@@ -96,7 +98,7 @@
             display: inline-block;
             position: absolute;
             left: 0;
-            top: 2px;
+            top: 3px;
             .border-radius(17px);
         }
     }
@@ -128,6 +130,7 @@
         font-size: 12px;
         line-height: 17px;
         border-width: 2px;
+        .box-shadow(none);
     }
 
     &:focus {
diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less
index b6689f5bd..9ad84a73b 100644
--- a/modules/system/assets/ui/less/form.less
+++ b/modules/system/assets/ui/less/form.less
@@ -48,7 +48,7 @@
     position: relative;
     -webkit-appearance: none;
     border: 1px solid @input-border;
-    .box-shadow(~"inset 0 0.5px 1px @{input-border}, 0 1.5px 0 #fff");
+    .box-shadow(~"inset 0 1px 0 @{input-border}, 0 1px 0 #fff");
 
     &:focus {
         border: 1px solid @color-form-field-border-focus;
@@ -309,7 +309,7 @@
     border: 1px solid @color-form-field-border;
     overflow: hidden;
     position: relative;
-    .box-shadow(~"inset 0 0.5px 1px @{input-border}, 0 1.5px 0 #fff");
+    .box-shadow(~"inset 0 1px 0 @{input-border}, 0 1px 0 #fff");
     .border-radius(@input-border-radius);
 
     .form-control {
diff --git a/modules/system/assets/ui/less/list.less b/modules/system/assets/ui/less/list.less
index f0497b866..b67c5f4c3 100644
--- a/modules/system/assets/ui/less/list.less
+++ b/modules/system/assets/ui/less/list.less
@@ -94,8 +94,7 @@ table.table.data {
         td, th {
             padding: 12px 15px;
             color: @color-list-text;
-            border-color: white;
-            border-bottom: 1px solid @color-list-grid;
+            border-top: 2px solid white;
 
             a:not(.btn) {
                 color: @color-list-text;
@@ -153,7 +152,6 @@ table.table.data {
         }
         tr:not(.no-data):hover td, tr:not(.no-data).selected td, {
            background: @color-list-hover-bg !important;
-           .box-shadow(~"inset 0 3px 3px -3px rgba(0,0,0,.25)");
            text-shadow: 0 -1px 0 rgba(0,0,0,.3);
            color: white;
 
@@ -162,7 +160,6 @@ table.table.data {
             }
         }
         tr:not(.no-data):active td {
-           .box-shadow(~"inset 0 3px 3px -3px rgba(0,0,0,.5)");
            background: mix(black, @color-list-hover-bg, 10%) !important;
            color: white;
         }
diff --git a/modules/system/assets/ui/less/popup.less b/modules/system/assets/ui/less/popup.less
index e977ec081..3a91847ee 100644
--- a/modules/system/assets/ui/less/popup.less
+++ b/modules/system/assets/ui/less/popup.less
@@ -50,11 +50,10 @@
 }
 
 .modal-header {
-    //#gradient > .vertical(@start-color: mix(white, @color-popup-header-bg, 10%); @end-color: mix(black, @color-popup-header-bg, 10%));
     background: @color-popup-header-bg;
     color: @color-popup-header-text;
     text-shadow: 0 -1px 0 rgba(0,0,0,.6);
-    .box-shadow(~"inset 0 -2px 0 rgba(0,0,0,.1), inset 0 2px 0 rgba(255,255,255,.2)");
+    .box-shadow(inset 0 -2px 0 rgba(0,0,0,.1));
     .border-top-radius(5px);
 
     border: none;
diff --git a/modules/system/assets/ui/less/select.mixins.less b/modules/system/assets/ui/less/select.mixins.less
index 0918c6cee..f3c702b2a 100644
--- a/modules/system/assets/ui/less/select.mixins.less
+++ b/modules/system/assets/ui/less/select.mixins.less
@@ -8,7 +8,7 @@
     border-radius: @input-border-radius;
     color: @input-color;
     font-size: @input-font-size;
-    .box-shadow(~"inset 0 0.5px 1px @{input-border}, 0 1.5px 0 #fff");
+    .box-shadow(~"inset 0 1px 0 @{input-border}, 0 1px 0 #fff");
 }
 
 .validation-state-focus(@color) {
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index 822244592..56d8451c2 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -593,13 +593,13 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"
 .btn-group-justified > .btn,.btn-group-justified > .btn-group{float:none;display:table-cell;width:1%}
 .btn-group-justified > .btn-group .btn{width:100%}
 [data-toggle="buttons"] > .btn > input[type="radio"],[data-toggle="buttons"] > .btn > input[type="checkbox"]{display:none}
-.btn{font-size:13px;border:none;text-align:left;outline:none !important;text-shadow:0 -1px 0 rgba(0,0,0,0.4);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25),inset 0 1px 0 rgba(255,255,255,.35);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25),inset 0 1px 0 rgba(255,255,255,.35)}
+.btn{font-size:13px;border:none;text-align:left;outline:none !important;text-shadow:0 -1px 0 rgba(0,0,0,0.4);-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,.15);box-shadow:inset 0 -2px 0 rgba(0,0,0,.15)}
 .btn[class^="oc-icon-"]:before,.btn[class*=" oc-icon-"]:before{font-size:14px;line-height:14px;position:relative}
 .btn[disabled]{color:rgba(255,255,255,0.6)}
 .btn.active,.btn:active{-webkit-box-shadow:inset 0 2px 0 rgba(0,0,0,0.3);box-shadow:inset 0 2px 0 rgba(0,0,0,0.3)}
 .btn-secondary{text-shadow:0 1px 0 rgba(255,255,255,0.8)}
 .btn-secondary[disabled]{color:rgba(0,0,0,0.6)}
-.btn-link{-webkit-box-shadow:none;box-shadow:none;text-shadow:none}
+.btn-link{-webkit-box-shadow:none !important;box-shadow:none !important;text-shadow:none !important}
 .btn-group .btn{border-right:1px solid rgba(0,0,0,0.09);margin-left:0 !important}
 .btn-group .btn:last-child,.btn-group .btn.last{border-right:none}
 .btn-group .btn.last{border-bottom-right-radius:3px !important;border-top-right-radius:3px !important}
@@ -1337,17 +1337,17 @@ body.popover-open .control-popover > div:before,body.popover-open .control-popov
 body.popover-open .control-popover div.popover-fixed-height{height:100%;min-height:100%}
 body.popover-open .control-popover .popover-head:before{display:none}
 }
-.control-breadcrumb{margin:-20px -20px 20px -20px;background-color:#d3d9da}
+.control-breadcrumb{margin:-20px -20px 20px -20px;background-color:#d3d9da;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.05);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.05)}
 .control-breadcrumb ul{padding:0;margin:0;font-size:0}
 .control-breadcrumb li{font-size:15px;list-style:none;margin:0;padding:12px 10px 13px 30px;display:inline-block;position:relative;color:#ffffff;background-color:#9da4a5}
-.control-breadcrumb li a{display:inline-block;color:#ffffff;text-decoration:none}
+.control-breadcrumb li a{display:inline-block;color:#ffffff;text-decoration:none;text-shadow:0 1px 0 rgba(0,0,0,0.2)}
 .control-breadcrumb li a:hover{color:#ffffff}
 .control-breadcrumb li:before,.control-breadcrumb li:after{top:0;right:-15px;position:absolute;z-index:10}
 .control-breadcrumb li:after{content:'';display:block;width:0;height:0;border-top:23px solid transparent;border-bottom:23px solid transparent;border-left:15px solid #9da4a5}
 .control-breadcrumb li:before{right:-16px;z-index:9;content:'';display:block;width:0;height:0;border-top:23px solid transparent;border-bottom:23px solid transparent;border-left:15px solid #d3d9da}
 .control-breadcrumb li:first-child{padding-left:20px}
 .control-breadcrumb li:last-child:after{content:''}
-.control-breadcrumb li:last-child{background-color:transparent;color:#2a3e51}
+.control-breadcrumb li:last-child{background-color:transparent;color:#2a3e51;text-shadow:0 1px 0 rgba(255,255,255,0.7)}
 .control-breadcrumb li:last-child:after{display:none}
 body.breadcrumb-flush .control-breadcrumb,.control-breadcrumb.breadcrumb-flush{margin-bottom:0}
 body.slim-container .control-breadcrumb{margin-left:0;margin-right:0}
@@ -2208,10 +2208,10 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .select2-container .loading-indicator > span{background-image:url('images/loader-transparent.svg');left:auto;right:10px;top:19px;background-size:17px 17px}
 .select2-container.in-progress .select2-selection .select2-selection__arrow b{display:none !important}
 .select2-container--default{display:block; }
-.select2-container--default .select2-selection{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#385487;font-size:14px;-webkit-box-shadow:inset 0 0.5px 1px #bdc3c7,0 1.5px 0 #fff;box-shadow:inset 0 0.5px 1px #bdc3c7,0 1.5px 0 #fff;outline:0}
+.select2-container--default .select2-selection{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#385487;font-size:14px;-webkit-box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff;box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff;outline:0}
 .select2-container--default .select2-search--dropdown{position:relative}
 .select2-container--default .select2-search--dropdown:after{position:absolute;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f002";right:13px;top:9px;color:#95a5a6}
-.select2-container--default .select2-search--dropdown .select2-search__field{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#385487;font-size:14px;-webkit-box-shadow:inset 0 0.5px 1px #bdc3c7,0 1.5px 0 #fff;box-shadow:inset 0 0.5px 1px #bdc3c7,0 1.5px 0 #fff}
+.select2-container--default .select2-search--dropdown .select2-search__field{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#385487;font-size:14px;-webkit-box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff;box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff}
 .select2-container--default .select2-search__field{outline:0}
 .select2-container--default .select2-search__field::-webkit-input-placeholder{color:#cccccc}
 .select2-container--default .select2-search__field:-moz-placeholder{color:#cccccc}
@@ -2308,16 +2308,16 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .custom-checkbox,.custom-radio{padding-left:23px;margin-top:0}
 .custom-checkbox input[type=radio],.custom-radio input[type=radio],.custom-checkbox input[type=checkbox],.custom-radio input[type=checkbox]{display:none}
 .custom-checkbox label,.custom-radio label{display:inline-block;cursor:pointer;position:relative;padding-left:25px;margin-right:15px;margin-left:-20px;font-size:13px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
-.custom-checkbox label:before,.custom-radio label:before{content:"";display:inline-block;text-align:center;color:#ffffff;width:18px;height:18px;margin-right:15px;position:absolute;left:-3px;top:-1px;background-color:#FFFFFF;border:2px solid #dce1e3}
-.custom-checkbox label:hover:before,.custom-radio label:hover:before{border-color:#c0c9cc}
-.custom-checkbox label:active:before,.custom-radio label:active:before{border-color:#a3b0b6}
+.custom-checkbox label:before,.custom-radio label:before{content:"";display:inline-block;text-align:center;color:#ffffff;width:18px;height:18px;margin-right:15px;position:absolute;left:-3px;top:0;background-color:#FFFFFF;border:1px solid #bdc3c7;-webkit-box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff;box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff}
+.custom-checkbox label:hover:before,.custom-radio label:hover:before{border-color:#a1aab0}
+.custom-checkbox label:active:before,.custom-radio label:active:before{border-color:#869198;border-width:2px}
 .custom-checkbox input[type=radio]:checked + label:before,.custom-radio input[type=radio]:checked + label:before{border-color:#1f99dc;line-height:17px;border-width:2px}
-.custom-checkbox input[type=radio]:checked + label:after,.custom-radio input[type=radio]:checked + label:after{content:'';width:12px;height:12px;background-color:#1f99dc;display:inline-block;position:absolute;left:0;top:2px;-webkit-border-radius:17px;-moz-border-radius:17px;border-radius:17px}
+.custom-checkbox input[type=radio]:checked + label:after,.custom-radio input[type=radio]:checked + label:after{content:'';width:12px;height:12px;background-color:#1f99dc;display:inline-block;position:absolute;left:0;top:3px;-webkit-border-radius:17px;-moz-border-radius:17px;border-radius:17px}
 .custom-checkbox input[type=radio][data-radio-color=green]:checked + label:before,.custom-radio input[type=radio][data-radio-color=green]:checked + label:before{border-color:#76a544}
 .custom-checkbox input[type=radio][data-radio-color=green]:checked + label:after,.custom-radio input[type=radio][data-radio-color=green]:checked + label:after{background-color:#76a544}
 .custom-checkbox input[type=radio][data-radio-color=red]:checked + label:before,.custom-radio input[type=radio][data-radio-color=red]:checked + label:before{border-color:#bb2424}
 .custom-checkbox input[type=radio][data-radio-color=red]:checked + label:after,.custom-radio input[type=radio][data-radio-color=red]:checked + label:after{background-color:#bb2424}
-.custom-checkbox input[type=checkbox]:checked + label:before,.custom-radio input[type=checkbox]:checked + label:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f00c";border-color:#1f99dc;background-color:#1f99dc;font-size:12px;line-height:17px;border-width:2px}
+.custom-checkbox input[type=checkbox]:checked + label:before,.custom-radio input[type=checkbox]:checked + label:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f00c";border-color:#1f99dc;background-color:#1f99dc;font-size:12px;line-height:17px;border-width:2px;-webkit-box-shadow:none;box-shadow:none}
 .custom-checkbox:focus,.custom-radio:focus{outline:none}
 .custom-checkbox:focus label:before,.custom-radio:focus label:before{border-color:#3498db}
 .custom-checkbox p.help-block,.custom-radio p.help-block{padding-left:6px;margin-bottom:17px}
@@ -2347,7 +2347,7 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .form-elements:after,.form-tabless-fields:after{clear:both}
 .form-elements:before,.form-tabless-fields:before,.form-elements:after,.form-tabless-fields:after{content:" ";display:table}
 .form-elements:after,.form-tabless-fields:after{clear:both}
-.form-control{position:relative;-webkit-appearance:none;border:1px solid #bdc3c7;-webkit-box-shadow:inset 0 0.5px 1px #bdc3c7,0 1.5px 0 #fff;box-shadow:inset 0 0.5px 1px #bdc3c7,0 1.5px 0 #fff}
+.form-control{position:relative;-webkit-appearance:none;border:1px solid #bdc3c7;-webkit-box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff;box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff}
 .form-control:focus{border:1px solid #bdc3c7}
 .form-control.icon{background-repeat:no-repeat;background-position:right -2px;padding-right:30px !important;background-image:url('images/bitmap-icons.png')}
 .form-control.icon.plus{background-position:right -124px}
@@ -2403,7 +2403,7 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .field-checkboxlist-scrollable{background:white;border:1px solid #e2e2e2;padding-left:15px;height:300px}
 .field-checkboxlist-scrollable .checkbox{margin-top:15px;margin-bottom:5px}
 .field-checkboxlist-scrollable .checkbox ~ .checkbox{margin-top:0}
-.field-recordfinder{background-color:#ffffff;border:1px solid #bdc3c7;overflow:hidden;position:relative;-webkit-box-shadow:inset 0 0.5px 1px #bdc3c7,0 1.5px 0 #fff;box-shadow:inset 0 0.5px 1px #bdc3c7,0 1.5px 0 #fff;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
+.field-recordfinder{background-color:#ffffff;border:1px solid #bdc3c7;overflow:hidden;position:relative;-webkit-box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff;box-shadow:inset 0 1px 0 #bdc3c7,0 1px 0 #fff;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
 .field-recordfinder .form-control{background:transparent;border-color:transparent;height:auto;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;padding:7px 30px 7px 11px;-webkit-box-shadow:none;box-shadow:none}
 .field-recordfinder .btn{background:transparent;position:absolute;right:-2px;top:50%;margin-top:-43px;height:88px;color:#595959;text-shadow:none}
 .field-recordfinder .btn i{font-size:14px}
@@ -2492,7 +2492,7 @@ table.table.data thead tr th:first-child{padding-left:10px}
 table.table.data thead tr th:last-child a{padding-right:25px}
 table.table.data thead .list-checkbox .custom-checkbox{top:-20px}
 table.table.data tbody tr:nth-child(even) td,table.table.data tbody tr:nth-child(even) th{background-color:#ecf0f1}
-table.table.data tbody td,table.table.data tbody th{padding:12px 15px;color:#666666;border-color:white;border-bottom:1px solid #e4e7e8}
+table.table.data tbody td,table.table.data tbody th{padding:12px 15px;color:#666666;border-top:2px solid white}
 table.table.data tbody td a:not(.btn),table.table.data tbody th a:not(.btn){color:#666666}
 table.table.data tbody td a:not(.btn):hover,table.table.data tbody th a:not(.btn):hover{text-decoration:none}
 table.table.data tbody td div.progress,table.table.data tbody th div.progress{position:relative;overflow:visible;height:auto;margin-bottom:0;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}
@@ -2503,9 +2503,9 @@ table.table.data tbody tr:last-child th,table.table.data tbody tr:last-child td{
 table.table.data tbody tr td:first-child{border-left:3px solid transparent;padding-left:22px}
 table.table.data tbody tr.active td{color:#000000}
 table.table.data tbody tr.active td:first-child{border-left:3px solid #ff9933}
-table.table.data tbody tr:not(.no-data):hover td,table.table.data tbody tr:not(.no-data).selected td{background:#4da7e8 !important;-webkit-box-shadow:inset 0 3px 3px -3px rgba(0,0,0,.25);box-shadow:inset 0 3px 3px -3px rgba(0,0,0,.25);text-shadow:0 -1px 0 rgba(0,0,0,0.3);color:white}
+table.table.data tbody tr:not(.no-data):hover td,table.table.data tbody tr:not(.no-data).selected td{background:#4da7e8 !important;text-shadow:0 -1px 0 rgba(0,0,0,0.3);color:white}
 table.table.data tbody tr:not(.no-data):hover td a:not(.btn),table.table.data tbody tr:not(.no-data).selected td a:not(.btn),table.table.data tbody tr:not(.no-data):hover td span,table.table.data tbody tr:not(.no-data).selected td span,table.table.data tbody tr:not(.no-data):hover td i[class^="icon-"],table.table.data tbody tr:not(.no-data).selected td i[class^="icon-"]{color:white}
-table.table.data tbody tr:not(.no-data):active td{-webkit-box-shadow:inset 0 3px 3px -3px rgba(0,0,0,.5);box-shadow:inset 0 3px 3px -3px rgba(0,0,0,.5);background:#4596d1 !important;color:white}
+table.table.data tbody tr:not(.no-data):active td{background:#4596d1 !important;color:white}
 table.table.data tbody tr.hidden td,table.table.data tbody tr.hidden th,table.table.data tbody tr.hidden td a,table.table.data tbody tr.hidden th a{display:none}
 table.table.data tbody tr.strike td,table.table.data tbody tr.strike th,table.table.data tbody tr.strike td a,table.table.data tbody tr.strike th a{text-decoration:line-through}
 table.table.data tbody tr.frozen td,table.table.data tbody tr.frozen th,table.table.data tbody tr.frozen td a,table.table.data tbody tr.frozen th a{color:#337ab7}
@@ -2766,7 +2766,7 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white
 }
 .modal-content{-webkit-box-shadow:none;box-shadow:none;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;background:#f9f9f9}
 .modal-content .close{color:#fff}
-.modal-header{background:#bf5d07;color:#ecf0f1;text-shadow:0 -1px 0 rgba(0,0,0,0.6);-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,.1),inset 0 2px 0 rgba(255,255,255,.2);box-shadow:inset 0 -2px 0 rgba(0,0,0,.1),inset 0 2px 0 rgba(255,255,255,.2);border-top-right-radius:5px;border-top-left-radius:5px;border:none}
+.modal-header{background:#bf5d07;color:#ecf0f1;text-shadow:0 -1px 0 rgba(0,0,0,0.6);-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.1);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.1);border-top-right-radius:5px;border-top-left-radius:5px;border:none}
 .modal-header h4{font-weight:600;font-size:16px}
 .modal-footer{background:transparent;border:none;margin-top:0;padding:0 20px 20px 20px}
 .modal-body{padding-bottom:0}