diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js
index 25ff8e64ca..5295ccdb98 100644
--- a/src/sunstone/public/app/sunstone.js
+++ b/src/sunstone/public/app/sunstone.js
@@ -284,7 +284,7 @@ define(function(require) {
break;
case "refresh":
buttonContext = $("#" + customId + "refresh_buttons", buttonsRow);
- icon = button.icon ? button.icon : '';
+ icon = button.icon ? button.icon : '';
text = button.text ? icon + ' ' + button.text : icon;
strClass.push("white_button", "refresh", "button", "secondary");
buttonCode = '';
diff --git a/src/sunstone/public/app/sunstone/buttons.hbs b/src/sunstone/public/app/sunstone/buttons.hbs
index 44864da68c..31f0510d12 100644
--- a/src/sunstone/public/app/sunstone/buttons.hbs
+++ b/src/sunstone/public/app/sunstone/buttons.hbs
@@ -14,8 +14,8 @@
{{! limitations under the License. }}
{{! -------------------------------------------------------------------------- }}
-
-
+
+
{{#unless customContext}}
-
+
@@ -60,6 +60,8 @@
+
+
diff --git a/src/sunstone/public/app/sunstone/tab.hbs b/src/sunstone/public/app/sunstone/tab.hbs
index 2f76a8b539..2964a1fc77 100644
--- a/src/sunstone/public/app/sunstone/tab.hbs
+++ b/src/sunstone/public/app/sunstone/tab.hbs
@@ -34,12 +34,14 @@
{{#if buttons}}
-
- {{#if dataTable.searchInputHTML}}
- {{{dataTable.searchInputHTML}}}
- {{/if}}
-
+
+
+ {{#if dataTable.searchInputHTML}}
+ {{{dataTable.searchInputHTML}}}
+ {{/if}}
+
+
{{/if}}
diff --git a/src/sunstone/public/scss/_settings.scss b/src/sunstone/public/scss/_settings.scss
index bd7c59458d..3038fb6da4 100644
--- a/src/sunstone/public/scss/_settings.scss
+++ b/src/sunstone/public/scss/_settings.scss
@@ -247,7 +247,7 @@ $breadcrumbs-item-slash: true;
// ----------
//$button-padding: 0.85em 1em;
-$button-padding: 0.6em 1em;
+$button-padding: 0.6em 0.7em;
$button-margin: 0 0 $global-margin 0;
$button-fill: solid;
$button-background: $primary-color;
@@ -530,7 +530,7 @@ $tab-background: $white;
$tab-background-active: $white;
$tab-item-font-size: rem-calc(15);
$tab-item-background-hover: $light-gray;
-$tab-item-padding: 1rem 1.5rem;
+$tab-item-padding: 1.5rem;
$tab-expand-max: 6;
$tab-content-background: $white;
$tab-content-border: $white;
diff --git a/src/sunstone/public/scss/app.scss b/src/sunstone/public/scss/app.scss
index 2f716ddf12..a6a33c204b 100644
--- a/src/sunstone/public/scss/app.scss
+++ b/src/sunstone/public/scss/app.scss
@@ -90,4 +90,9 @@ textarea {
.graph {
height: rem-calc(100px);
+}
+
+.dropdown-pane {
+ width: auto;
+ max-width: 300px;
}
\ No newline at end of file