diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 89d58d5b1..1e4e56ebf 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1314,15 +1314,15 @@ sub getToolbar {
     $toolbar .= $self->session->icon->shortcut('func=createShortcut',$self->get("url"))
         if ($userUiLevel >= $uiLevels->{"shortcut"} && !$self->isa('WebGUI::Asset::Shortcut'));
 
-    $self->session->style->setLink($self->session->url->extras('contextMenu/contextMenu.css'), {rel=>"stylesheet",type=>"text/css"});
+    $self->session->style->setLink($self->session->url->extras('assetToolbar/assetToolbar.css'), {rel=>"stylesheet",type=>"text/css"});
     $self->session->style->setLink($self->session->url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>"stylesheet",type=>"text/css"});
     $self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>"text/javascript"});
     $self->session->style->setScript($self->session->url->extras('yui/build/container/container_core-min.js'), {type=>"text/javascript"});
     $self->session->style->setScript($self->session->url->extras('yui/build/menu/menu-min.js'), {type=>"text/javascript"});
-    $self->session->style->setScript($self->session->url->extras('contextMenu/contextMenu.js'), {type=>"text/javascript"});
+    $self->session->style->setScript($self->session->url->extras('assetToolbar/assetToolbar.js'), {type=>"text/javascript"});
     my $output
-        = '<div class="yui-skin-sam">'
-        . '<img src="' . $self->getIcon(1) . '" title="' . $self->getName . '" alt="' . $self->getName . '" style="vertical-align: middle" />'
+        = '<div class="yui-skin-sam wg-toolbar">'
+        . '<img src="' . $self->getIcon(1) . '" title="' . $self->getName . '" alt="' . $self->getName . '" class="wg-toolbar-icon" />'
         . '<div class="yuimenu wg-contextmenu">'
         . '<div class="bd">'
         . '<ul class="first-of-type">';
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 2e3544ae1..d44474c80 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -311,15 +311,15 @@ sub getToolbar {
             $toolbar = $self->session->icon->edit('func=edit'.$returnUrl,$self->get("url"))
                 if ($userUiLevel >= $uiLevels->{"edit"});
         }
-        $self->session->style->setLink($self->session->url->extras('contextMenu/contextMenu.css'), {rel=>"stylesheet",type=>"text/css"});
+        $self->session->style->setLink($self->session->url->extras('assetToolbar/assetToolbar.css'), {rel=>"stylesheet",type=>"text/css"});
         $self->session->style->setLink($self->session->url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>"stylesheet",type=>"text/css"});
         $self->session->style->setScript($self->session->url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'), {type=>"text/javascript"});
         $self->session->style->setScript($self->session->url->extras('yui/build/container/container_core-min.js'), {type=>"text/javascript"});
         $self->session->style->setScript($self->session->url->extras('yui/build/menu/menu-min.js'), {type=>"text/javascript"});
-        $self->session->style->setScript($self->session->url->extras('contextMenu/contextMenu.js'), {type=>"text/javascript"});
+        $self->session->style->setScript($self->session->url->extras('assetToolbar/assetToolbar.js'), {type=>"text/javascript"});
         my $i18n = WebGUI::International->new($self->session, "Asset");
-        return '<div class="yui-skin-sam">'
-            . '<img src="' . $self->getIcon(1) . '" title="' . $self->getName . '" alt="' . $self->getName . '" style="vertical-align: middle" />'
+        return '<div class="yui-skin-sam wg-toolbar">'
+            . '<img src="' . $self->getIcon(1) . '" title="' . $self->getName . '" alt="' . $self->getName . '" class="wg-toolbar-icon" />'
             . '<div class="yuimenu wg-contextmenu">'
             . '<div class="bd">'
             . '<ul class="first-of-type">'
diff --git a/www/extras/contextMenu/contextMenu.css b/www/extras/assetToolbar/assetToolbar.css
similarity index 55%
rename from www/extras/contextMenu/contextMenu.css
rename to www/extras/assetToolbar/assetToolbar.css
index 43ad6b08d..ce09e5cb4 100644
--- a/www/extras/contextMenu/contextMenu.css
+++ b/www/extras/assetToolbar/assetToolbar.css
@@ -1,3 +1,8 @@
+.wg-toolbar-icon {
+    vertical-align: middle;
+    cursor: pointer;
+}
+
 .wg-contextmenu {
     position: absolute;
     visibility: hidden;
@@ -7,3 +12,8 @@
 .wg-contextmenu .yuimenuitemlabel {
     font-size: 10px
 }
+
+.wg-contextmenu.yuimenu .yuimenuitemlabel {
+    padding: 0 8px;
+}
+
diff --git a/www/extras/contextMenu/contextMenu.js b/www/extras/assetToolbar/assetToolbar.js
similarity index 87%
rename from www/extras/contextMenu/contextMenu.js
rename to www/extras/assetToolbar/assetToolbar.js
index 821eb9c58..b3cbba2a5 100755
--- a/www/extras/contextMenu/contextMenu.js
+++ b/www/extras/assetToolbar/assetToolbar.js
@@ -5,7 +5,8 @@ function initWGContextMenus() {
         if (menu.initialized) {
             continue;
         }
-        var ctx = menu.previousSibling;
+        menu.initialized = true;
+        var ctx = YAHOO.util.Dom.getPreviousSibling(menu);
         var myMenu = new YAHOO.widget.Menu(menu, {
             context             : [ctx, "tl", "bl"]
         });