diff --git a/basis/ui/gadgets/toolbar/toolbar.factor b/basis/ui/gadgets/toolbar/toolbar.factor
index 5245b07a3a..d4d41b65fa 100644
--- a/basis/ui/gadgets/toolbar/toolbar.factor
+++ b/basis/ui/gadgets/toolbar/toolbar.factor
@@ -29,12 +29,13 @@ PRIVATE>
     gesture gesture>tooltip >>tooltip ; inline
 
 : <toolbar> ( target -- toolbar )
-    <shelf>
-        1 >>fill
+    horizontal <track>
+        0 >>fill
+        1/2 >>align
         { 5 5 } >>gap
         swap
         [ [ "toolbar" ] dip class-of get-command-at commands>> ]
-        [ '[ [ _ ] 2dip <toolbar-button> add-gadget ] ]
+        [ '[ [ _ ] 2dip <toolbar-button> f track-add ] ]
         bi assoc-each ;
 
 : format-toolbar ( toolbar -- toolbar )
diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index ac98b09607..fd66420dd6 100644
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -75,16 +75,10 @@ M: browser-gadget set-history-value
         white-interior ;
 
 : add-spacer ( track -- track )
-    <pile> { 10 0 } <border> f track-add ;
+    <pile> 1/4 track-add ;
 
 : <browser-toolbar> ( browser -- toolbar )
-    horizontal <track>
-        0 >>fill
-        1/2 >>align
-        { 5 5 } >>gap
-        over <toolbar> f track-add
-        add-spacer
-        swap search-field>> "Search" label-on-left 1 track-add ;
+    [ <toolbar> add-spacer ] [ search-field>> "Search" label-on-left 1 track-add ] bi ;
 
 : add-browser-toolbar ( track -- track )
     dup <browser-toolbar> format-toolbar f track-add ;
diff --git a/basis/ui/tools/error-list/error-list.factor b/basis/ui/tools/error-list/error-list.factor
index dfb00c9564..be6ca5585e 100644
--- a/basis/ui/tools/error-list/error-list.factor
+++ b/basis/ui/tools/error-list/error-list.factor
@@ -149,7 +149,7 @@ error-display "toolbar" f {
 } define-command-map
 
 : <error-list-toolbar> ( error-list -- toolbar )
-    [ <toolbar> ] [ error-toggle>> "Show errors:" label-on-left add-gadget ] bi
+    [ <toolbar> ] [ error-toggle>> "Show errors:" label-on-left f track-add ] bi
     format-toolbar ;
 
 : <error-model> ( visible-errors model -- model' )
@@ -173,7 +173,7 @@ error-display "toolbar" f {
         "Errors" errors-color <labeled> 1/4 track-add
         error-list error-display>>
         "Details" details-color <labeled> 1/2 track-add
-        1 track-add ;
+    1 track-add ;
 
 M: error-list-gadget focusable-child*
     source-file-table>> ;