diff --git a/zin/wg/btn/v1.php b/zin/wg/btn/v1.php
index b109951914..57d782b1a4 100755
--- a/zin/wg/btn/v1.php
+++ b/zin/wg/btn/v1.php
@@ -46,7 +46,7 @@ class btn extends wg
         $trailingIcon  = $this->prop('trailingIcon');
         $square        = $this->prop('square');
         $isEmptyText   = empty($text);
-        $onlyCaret     = $isEmptyText && empty($icon) && empty($trailingIcon);
+        $onlyCaret     = $isEmptyText && !empty($caret) && empty($icon) && empty($trailingIcon);
 
         $classList = array
         (
diff --git a/zin/wg/nav/v1.php b/zin/wg/nav/v1.php
index fc80475202..398842fdf6 100755
--- a/zin/wg/nav/v1.php
+++ b/zin/wg/nav/v1.php
@@ -22,7 +22,7 @@ class nav extends wg
     protected function build()
     {
         $items = $this->prop('items');
-        return h::nav
+        return h::menu
         (
             setClass('nav'),
             set($this->props->skip(array_keys(static::getDefinedProps()))),
diff --git a/zin/wg/toolbar/v1.php b/zin/wg/toolbar/v1.php
index 1a75420f0f..4c9a0dc654 100644
--- a/zin/wg/toolbar/v1.php
+++ b/zin/wg/toolbar/v1.php
@@ -1,9 +1,11 @@
 <?php
 namespace zin;
 
+require_once dirname(__DIR__) . DS . 'btn' . DS . 'v1.php';
+
 class toolbar extends wg
 {
-    protected static $defineProps = 'items?:array';
+    protected static $defineProps = 'items?:array, btnClass?:string, btnProps?: array';
 
     public function onBuildItem($item)
     {
@@ -12,9 +14,11 @@ class toolbar extends wg
 
         if($type === 'divider') return div(setClass('toolbar-divider'));
 
-        return btn
+        list($btnClass, $btnProps) = $this->prop(array('btnClass', 'btnProps'));
+        return new btn
         (
-            setClass('toolbar-item'),
+            setClass('toolbar-item', $btnClass),
+            is_array($btnProps) ? set($btnProps) : NULL,
             inherit($item)
         );
     }