2 files changed, 18 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index 76bba4e72e..138322eca7 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -14,14 +14,11 @@
            left="0"
            top="20"
            side="top">
-    <button width="0"
-            auto_resize="true"
+    <button auto_resize="true"
             label="Button 1"/>
-    <button width="0"
-            auto_resize="true"
+    <button auto_resize="true"
             label="Button with long label"/>
-    <button width="0"
-            auto_resize="true"
+    <button auto_resize="true"
             label="Button with longest label of all"/>
   </toolbar>
   <toolbar name="test_toolbar_vertical"
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
new file mode 100644
index 0000000000..a7f73c0c7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toolbar background_image = "Rounded_Rect">
+  <button_icon_and_text
+    follows="none"
+    height="30"
+    chrome="true"
+    auto_resize="true"
+    />
+  <button_icon
+  follows="none"
+  height="30"
+  chrome="true"
+  auto_resize="true"
+    />
+</toolbar>