diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index d5163875f..7771b3931 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -210,7 +210,7 @@
 .control-filelist ul li > div.controls a.control:hover{opacity:1;filter:alpha(opacity=100)}
 .control-filelist ul li:hover > div.controls,.control-filelist ul li:hover > a.control{display:block !important}
 .control-filelist ul li:hover > div.controls > a.control,.control-filelist ul li:hover > a.control > a.control{display:block !important}
-.control-filelist ul li .checkbox{position:absolute;top:-5px;right:-5px}
+.control-filelist ul li .checkbox{position:absolute;top:-5px;right:0}
 .control-filelist ul li .checkbox label{margin-right:0}
 .control-filelist ul li .checkbox label:before{border-color:#cccccc}
 .control-filelist.single-line ul li a span.title{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}
@@ -682,9 +682,9 @@ nav#layout-mainmenu .toolbar-item:before{left:-12px}
 nav#layout-mainmenu .toolbar-item:after{right:-12px}
 nav#layout-mainmenu .toolbar-item.scroll-active-before:before{color:#ffffff}
 nav#layout-mainmenu .toolbar-item.scroll-active-after:after{color:#ffffff}
-nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview{margin:0 0 0 11px}
+nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview{margin:0 0 0 21px}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview i{font-size:20px}
-nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview a{position:relative;padding:0 15px;top:-1px}
+nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview a{position:relative;padding:0 10px;top:-1px}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account{margin-right:0}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account > a{padding:0 15px 0 10px;font-size:14px;position:relative;z-index:590}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account img.account-avatar{width:45px}
@@ -939,14 +939,14 @@ body.outer .layout > .layout-row > .layout-cell .outer-form-container .horizonta
 .fancy-layout .form-tabless-fields .tab-collapse-icon:hover{text-decoration:none;opacity:1;filter:alpha(opacity=100)}
 .fancy-layout .form-tabless-fields .tab-collapse-icon.primary{color:#475354;bottom:-25px;z-index:100;-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}
 .fancy-layout .form-tabless-fields .tab-collapse-icon.primary i{position:relative;display:block}
-.fancy-layout .form-tabless-fields .tab-collapse-icon.tabless{top:11px}
+.fancy-layout .form-tabless-fields .tab-collapse-icon.tabless{top:14px}
 .fancy-layout .form-tabless-fields.collapsed{padding:5px 23px 0 10px}
 .fancy-layout .form-tabless-fields.collapsed .tab-collapse-icon.tabless{-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}
 .fancy-layout .form-tabless-fields.collapsed .form-group:not(.collapse-visible){display:none}
 .fancy-layout .form-tabless-fields.collapsed .form-buttons{margin-left:10px;padding-bottom:0}
 .fancy-layout .form-tabless-fields .loading-indicator-container .loading-indicator{background-color:#e67e22;padding:0 0 0 30px;color:rgba(255,255,255,0.5);margin-top:1px;height:90%;font-size:12px;line-height:100%}
 .fancy-layout .form-tabless-fields .loading-indicator-container .loading-indicator > span{left:-10px;top:18px}
-.fancy-layout .form-buttons{-webkit-transition:all 0.5s;transition:all 0.5s;padding-top:11px;padding-bottom:5px}
+.fancy-layout .form-buttons{-webkit-transition:all 0.5s;transition:all 0.5s;padding-top:14px;padding-bottom:5px}
 .fancy-layout .form-buttons .btn{padding:0;margin-right:5px;margin-top:-6px;margin-right:30px;background-color:transparent;color:#ffffff;font-weight:normal;-webkit-box-shadow:none;box-shadow:none;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.3s ease;transition:all 0.3s ease}
 .fancy-layout .form-buttons .btn:hover{opacity:1;filter:alpha(opacity=100)}
 .fancy-layout .form-buttons .btn:last-child{margin-right:0}
diff --git a/modules/backend/assets/less/controls/filelist.less b/modules/backend/assets/less/controls/filelist.less
index fd7b8fa42..92dfbd463 100644
--- a/modules/backend/assets/less/controls/filelist.less
+++ b/modules/backend/assets/less/controls/filelist.less
@@ -209,7 +209,7 @@
             .checkbox {
                 position: absolute;
                 top: -5px;
-                right: -5px;
+                right: 0;
 
                 label {
                     margin-right: 0;
diff --git a/modules/backend/assets/less/layout/fancylayout.less b/modules/backend/assets/less/layout/fancylayout.less
index 2030a023a..5c65c9df5 100644
--- a/modules/backend/assets/less/layout/fancylayout.less
+++ b/modules/backend/assets/less/layout/fancylayout.less
@@ -509,7 +509,7 @@
         .tab-collapse-icon {
             .tab-collapse-icon();
             &.tabless {
-                top: 11px;
+                top: 14px;
             }
         }
 
@@ -551,7 +551,7 @@
 
     .form-buttons {
         .transition(all 0.5s);
-        padding-top: 11px;
+        padding-top: 14px;
         padding-bottom: 5px;
 
         .btn {
diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less
index 38f4c1b90..9f16f3ad9 100644
--- a/modules/backend/assets/less/layout/mainmenu.less
+++ b/modules/backend/assets/less/layout/mainmenu.less
@@ -147,7 +147,7 @@ nav#layout-mainmenu {
 
     ul.mainmenu-toolbar {
         li.mainmenu-preview {
-            margin: 0 0 0 11px;
+            margin: 0 0 0 21px;
 
             i {
                 font-size: 20px;
@@ -155,7 +155,7 @@ nav#layout-mainmenu {
 
             a {
                 position: relative;
-                padding: 0 15px;
+                padding: 0 10px;
                 top: -1px;
             }
         }
diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm
index 347698ad5..54657e731 100644
--- a/modules/backend/layouts/_mainmenu.htm
+++ b/modules/backend/layouts/_mainmenu.htm
@@ -40,12 +40,12 @@
     </div>
     <div class="toolbar-item" data-calculate-width>
         <ul class="mainmenu-toolbar">
-            <li class="mainmenu-preview icon-only with-tooltip">
+            <li class="mainmenu-preview with-tooltip">
                 <a
                     href="<?= URL::to('/') ?>"
                     target="_blank"
                     title="<?= e(trans('backend::lang.tooltips.preview_website')) ?>">
-                    <i class="icon-eye"></i>
+                    <i class="icon-crosshairs"></i>
                 </a>
             </li>
             <li class="mainmenu-account highlight">
diff --git a/modules/system/assets/ui/js/inspector.editor.dropdown.js b/modules/system/assets/ui/js/inspector.editor.dropdown.js
index 09cdb29b0..5b08397d4 100644
--- a/modules/system/assets/ui/js/inspector.editor.dropdown.js
+++ b/modules/system/assets/ui/js/inspector.editor.dropdown.js
@@ -218,7 +218,9 @@
     }
 
     DropdownEditor.prototype.onExternalPropertyEditorHidden = function() {
-        this.loadDynamicOptions(false)
+        if (this.dynamicOptions) {
+            this.loadDynamicOptions(false)
+        }
     }
 
     //
diff --git a/modules/system/assets/ui/js/inspector.externalparametereditor.js b/modules/system/assets/ui/js/inspector.externalparametereditor.js
index bf4e4dfde..669e32f05 100644
--- a/modules/system/assets/ui/js/inspector.externalparametereditor.js
+++ b/modules/system/assets/ui/js/inspector.externalparametereditor.js
@@ -209,23 +209,23 @@
     ExternalParameterEditor.prototype.toggleEditorVisibility = function(show) {
         var container = this.getContainer(),
             children = container.children,
-            height = 19 
-
-        // Fixed value instead of trying to get the container cell height.
-        // If the editor is contained in initially hidden editor (collapsed group),
-        // the container cell will be unknown.
+            height = 0
 
         if (!show) {
-            /*
             height = this.containerCell.getAttribute('data-inspector-cell-height')
 
             if (!height) {
                 height = $(this.containerCell).height()
                 this.containerCell.setAttribute('data-inspector-cell-height', height)
             }
-            */
         }
 
+        // Fixed value instead of trying to get the container cell height.
+        // If the editor is contained in initially hidden editor (collapsed group),
+        // the container cell will be unknown.
+
+        height = Math.max(height, 19)
+
         for (var i = 0, len = children.length; i < len; i++) {
             var element = children[i]
 
diff --git a/modules/system/assets/ui/less/button.less b/modules/system/assets/ui/less/button.less
index eb076408c..8e4bbbbbd 100644
--- a/modules/system/assets/ui/less/button.less
+++ b/modules/system/assets/ui/less/button.less
@@ -43,6 +43,10 @@
     }
 }
 
+.btn-link {
+    .box-shadow(none);
+}
+
 .btn-group {
     .btn {
         border-right: 1px solid rgba(0,0,0,0.09);
diff --git a/modules/system/assets/ui/less/inspector.less b/modules/system/assets/ui/less/inspector.less
index 52b6a35be..4118a0798 100644
--- a/modules/system/assets/ui/less/inspector.less
+++ b/modules/system/assets/ui/less/inspector.less
@@ -656,7 +656,7 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete {
         .select2-search {
             min-height: 26px;
             position: relative;
-            border-bottom: 1px solid #b2b9be; 
+            border-bottom: 1px solid #b2b9be;
 
             &:after {
                 position: absolute;
@@ -669,8 +669,9 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete {
             input.select2-search__field {
                 min-height: 26px;
                 background: transparent !important;
-                padding-left: 12px;
-                padding-right: 12px;
+                font-size: @input-font-size - 1;
+                padding-left: 4px;
+                padding-right: 20px;
                 border: none;
             }
         }
diff --git a/modules/system/assets/ui/less/popover.less b/modules/system/assets/ui/less/popover.less
index cfbd8037d..0695964c3 100644
--- a/modules/system/assets/ui/less/popover.less
+++ b/modules/system/assets/ui/less/popover.less
@@ -141,7 +141,7 @@ div.control-popover {
         }
 
         h3 {
-            font-size: 16px;
+            font-size: @font-size-base;
             font-weight: bold;
             margin-top: 0;
             margin-bottom: 0;
@@ -150,7 +150,7 @@ div.control-popover {
         }
 
         p {
-            font-size: 14px;
+            font-size: @font-size-base - 2;
             font-weight: normal;
             margin: 5px 0 0 0;
 
diff --git a/modules/system/assets/ui/less/select.less b/modules/system/assets/ui/less/select.less
index 36e78cc22..258ec5f7a 100644
--- a/modules/system/assets/ui/less/select.less
+++ b/modules/system/assets/ui/less/select.less
@@ -45,13 +45,12 @@
 
     .select2-search--dropdown {
         position: relative;
-        padding: 9px;
 
         &:after {
             position: absolute;
             .icon(@search);
-            right: 19px;
-            top: 15px;
+            right: 10px;
+            top: 7px;
             color: #95a5a6;
         }
 
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index 26a7a03fc..1851af85d 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -4238,7 +4238,7 @@ this.inspector.setPropertyValue(this.propertyDefinition.property,this.normalizeV
 DropdownEditor.prototype.onInspectorPropertyChanged=function(property,value){if(!this.propertyDefinition.depends||this.propertyDefinition.depends.indexOf(property)===-1){return}
 var dependencyValues=this.getDependencyValues()
 if(this.prevDependencyValues===undefined||this.prevDependencyValues!=dependencyValues){this.loadDynamicOptions()}}
-DropdownEditor.prototype.onExternalPropertyEditorHidden=function(){this.loadDynamicOptions(false)}
+DropdownEditor.prototype.onExternalPropertyEditorHidden=function(){if(this.dynamicOptions){this.loadDynamicOptions(false)}}
 DropdownEditor.prototype.updateDisplayedValue=function(value){var select=this.getSelect()
 select.value=value}
 DropdownEditor.prototype.getUndefinedValue=function(){if(this.propertyDefinition.default!==undefined){return this.propertyDefinition.default}
@@ -5440,8 +5440,11 @@ link.setAttribute('data-original-title',this.tooltipText)
 this.getInput().setAttribute('tabindex','-1')
 this.toggleEditorVisibility(true)
 setTimeout(this.proxy(this.hideEditor),200)}
-ExternalParameterEditor.prototype.toggleEditorVisibility=function(show){var container=this.getContainer(),children=container.children,height=19
-if(!show){}
+ExternalParameterEditor.prototype.toggleEditorVisibility=function(show){var container=this.getContainer(),children=container.children,height=0
+if(!show){height=this.containerCell.getAttribute('data-inspector-cell-height')
+if(!height){height=$(this.containerCell).height()
+this.containerCell.setAttribute('data-inspector-cell-height',height)}}
+height=Math.max(height,19)
 for(var i=0,len=children.length;i<len;i++){var element=children[i]
 if($.oc.foundation.element.hasClass(element,'external-editor')){continue}
 if(show){$.oc.foundation.element.removeClass(element,'hide')}
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index b2f981b21..731d967da 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -591,6 +591,7 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"
 .btn[class^="oc-icon-"]:before,.btn[class*=" oc-icon-"]:before{font-size:14px;line-height:14px;position:relative}
 .btn[disabled]{background-color:#dbdbdb;color:#aaaaaa}
 .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-link{-webkit-box-shadow:none;box-shadow:none}
 .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}
@@ -1300,8 +1301,8 @@ div.control-popover div.popover-body.form-container{padding-bottom:0}
 div.control-popover div.popover-footer{padding:0 20px 20px 20px}
 div.control-popover .popover-head{background:#d35400;padding:14px 16px;position:relative;color:#ffffff;border-top-right-radius:2px;border-top-left-radius:2px}
 div.control-popover .popover-head:before{z-index:602;position:absolute}
-div.control-popover .popover-head h3{font-size:16px;font-weight:bold;margin-top:0;margin-bottom:0;padding-right:15px;line-height:130%}
-div.control-popover .popover-head p{font-size:14px;font-weight:normal;margin:5px 0 0 0}
+div.control-popover .popover-head h3{font-size:14px;font-weight:bold;margin-top:0;margin-bottom:0;padding-right:15px;line-height:130%}
+div.control-popover .popover-head p{font-size:12px;font-weight:normal;margin:5px 0 0 0}
 div.control-popover .popover-head p:empty{display:none}
 div.control-popover .popover-head .close{float:none;position:absolute;right:11px;top:12px;color:#ffffff;outline:none;opacity:0.4;filter:alpha(opacity=40)}
 div.control-popover .popover-head .close:hover{opacity:1;filter:alpha(opacity=100)}
@@ -2199,8 +2200,8 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .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:2px solid #bdc3c7;border-radius:3px;color:#555555;font-size:14px;outline:0}
-.select2-container--default .select2-search--dropdown{position:relative;padding:9px}
-.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:19px;top:15px;color:#95a5a6}
+.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:10px;top:7px;color:#95a5a6}
 .select2-container--default .select2-search--dropdown .select2-search__field{background-color:#ffffff;border:2px solid #bdc3c7;border-radius:3px;color:#555555;font-size:14px}
 .select2-container--default .select2-search__field{outline:0}
 .select2-container--default .select2-search__field::-webkit-input-placeholder{color:#cccccc}
@@ -2682,7 +2683,7 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white
 .select2-dropdown.ocInspectorDropdown > .select2-results li > i,.select2-dropdown.ocInspectorDropdown > .select2-results li > img{margin-left:6px}
 .select2-dropdown.ocInspectorDropdown .select2-search{min-height:26px;position:relative;border-bottom:1px solid #b2b9be}
 .select2-dropdown.ocInspectorDropdown .select2-search: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:10px;top:10px;color:#95a5a6}
-.select2-dropdown.ocInspectorDropdown .select2-search input.select2-search__field{min-height:26px;background:transparent !important;padding-left:12px;padding-right:12px;border:none}
+.select2-dropdown.ocInspectorDropdown .select2-search input.select2-search__field{min-height:26px;background:transparent !important;font-size:13px;padding-left:4px;padding-right:20px;border:none}
 .control-pagination{font-size:0}
 .control-pagination .page-iteration{margin-right:4px;font-size:14px;color:#98a7a8}
 .control-pagination .page-next,.control-pagination .page-back{display:inline-block;padding:10px 15px}