diff --git a/admin_menu.css b/admin_menu.css
index bf0dfb6..fd86dd7 100644
--- a/admin_menu.css
+++ b/admin_menu.css
@@ -58,7 +58,8 @@ body.admin-menu {
 #admin-menu .dropdown {
   position: static;
 }
-#admin-menu a {
+#admin-menu a,
+#admin-menu li > span {
   background: transparent none;
   border: none;
   color: #EEE;
@@ -66,7 +67,8 @@ body.admin-menu {
   text-align: left; /* LTR */
   text-decoration: none;
 }
-#admin-menu .dropdown a {
+#admin-menu .dropdown a,
+#admin-menu .dropdown li > span {
   border-right: 1px solid #323232; /* LTR */
   display: block;
   padding: 4px 8px;
diff --git a/admin_menu.inc b/admin_menu.inc
index a2244e5..6ee330d 100644
--- a/admin_menu.inc
+++ b/admin_menu.inc
@@ -514,10 +514,6 @@ function admin_menu_links_icon() {
       $links['icon']['devel'] = array(
         '#title' => t('Development'),
         '#weight' => 30,
-        '#href' => '#',
-        '#options' => array(
-          'external' => TRUE,
-        ),
       ) + $devel_links;
     }
   }
diff --git a/admin_menu.module b/admin_menu.module
index 301b4d0..3dbbbff 100644
--- a/admin_menu.module
+++ b/admin_menu.module
@@ -636,7 +636,7 @@ function theme_admin_menu_links($variables) {
         $elements[$path]['#options']['attributes']['class'][] = 'admin-menu-destination';
       }
 
-      $link .= l($elements[$path]['#title'], $elements[$path]['#href'], $elements[$path]['#options']);
+      $link = l($elements[$path]['#title'], $elements[$path]['#href'], $elements[$path]['#options']);
     }
     // Handle plain text items, but do not interfere with menu additions.
     elseif (!isset($elements[$path]['#type']) && isset($elements[$path]['#title'])) {
@@ -646,12 +646,11 @@ function theme_admin_menu_links($variables) {
       else {
         $title = check_plain($elements[$path]['#title']);
       }
-      if (!empty($elements[$path]['#options']['attributes'])) {
-        $link .= '<span' . drupal_attributes($elements[$path]['#options']['attributes']) . '>' . $title . '</span>';
-      }
-      else {
-        $link .= $title;
+      $attributes = '';
+      if (isset($elements[$path]['#options']['attributes'])) {
+        $attributes = drupal_attributes($elements[$path]['#options']['attributes']);
       }
+      $link = '<span' . $attributes . '>' . $title . '</span>';
     }
 
     $output .= '<li' . drupal_attributes($elements[$path]['#attributes']) . '>';