diff --git a/skins/elastic/styles/widgets/common.less b/skins/elastic/styles/widgets/common.less
index bc1ef5e49..2afbdca3d 100644
--- a/skins/elastic/styles/widgets/common.less
+++ b/skins/elastic/styles/widgets/common.less
@@ -112,6 +112,7 @@ p.image-attachment {
 
     @media screen and (max-width: @screen-width-xs) {
         float: none;
+        margin: .5rem 0 .5rem 0;
     }
 
     .image-link {
diff --git a/skins/elastic/styles/widgets/jqueryui.less b/skins/elastic/styles/widgets/jqueryui.less
index 410397549..7dec0b3c2 100644
--- a/skins/elastic/styles/widgets/jqueryui.less
+++ b/skins/elastic/styles/widgets/jqueryui.less
@@ -173,8 +173,8 @@
                 button {
                     margin: 0 !important;
                     border: 0 !important;
-                    box-shadow: none;
                     height: @layout-header-height;
+                    box-shadow: none;
 
                     &:before {
                         display: block !important;
@@ -183,11 +183,11 @@
                         margin: 0;
                     }
 
-                    &.btn-primary {
-                        color: @color-btn-primary-background;
-                        background: transparent;
+                    &:active {
+                        box-shadow: none;
                     }
 
+                    &.btn-primary,
                     &.btn-secondary {
                         color: @color-toolbar-button;
                         background: transparent;
@@ -197,6 +197,11 @@
                         color: @color-btn-danger-background;
                         background: transparent;
                     }
+
+                    &.disabled,
+                    &:disabled {
+                        opacity: .5;
+                    }
                 }
             }
         }