diff --git a/admin_menu-rtl.css b/admin_menu-rtl.css
index 9414dcf..f119b5c 100644
--- a/admin_menu-rtl.css
+++ b/admin_menu-rtl.css
@@ -5,7 +5,7 @@
 #admin-menu .dropdown .admin-menu-users a {
   background-position: 10% center;
   padding-left: 22px;
-  padding-right: 0;
+  padding-right: 10px;
 }
 #admin-menu .dropdown .admin-menu-action,
 #admin-menu .dropdown .admin-menu-search {
@@ -20,14 +20,21 @@
 #admin-menu a {
   text-align: right;
 }
-#admin-menu .dropdown a {
-  border-left: 1px solid #323232;
-  border-right: 0;
-}
 #admin-menu .dropdown .admin-menu-tab a {
   border-left: 1px solid #52565E;
   border-right: 0;
 }
+#admin-menu .dropdown li:hover ul ul,
+#admin-menu .dropdown li:hover ul ul ul,
+#admin-menu .dropdown li:hover ul ul ul ul,
+#admin-menu .dropdown li:hover ul ul ul ul ul,
+#admin-menu .dropdown li.hover ul ul,
+#admin-menu .dropdown li.hover ul ul ul,
+#admin-menu .dropdown li.hover ul ul ul ul,
+#admin-menu .dropdown li.hover ul ul ul ul ul {
+  left: auto;
+  right: -999em;
+}
 #admin-menu .dropdown li li a {
   border-left: 0;
 }
@@ -52,6 +59,18 @@
 }
 
 /* Lists nested under hovered list items */
+#admin-menu .dropdown li:hover ul,
+#admin-menu .dropdown li li:hover ul,
+#admin-menu .dropdown li li li:hover ul,
+#admin-menu .dropdown li li li li:hover ul,
+#admin-menu .dropdown li li li li li:hover ul,
+#admin-menu .dropdown li.hover ul,
+#admin-menu .dropdown li li.hover ul,
+#admin-menu .dropdown li li li.hover ul,
+#admin-menu .dropdown li li li li.hover ul,
+#admin-menu .dropdown li li li li li.hover ul {
+  right: auto;
+}
 #admin-menu .dropdown li.admin-menu-action:hover ul {
   left: 0 !important;
   right: auto;
@@ -62,3 +81,11 @@
   background-image: url(images/arrow-rtl.png);
   background-position: 5px 6px;
 }
+
+/* Search form */
+#admin-menu .admin-menu-search input {
+  padding: 2px 4px 2px 22px;
+}
+#admin-menu .dropdown .admin-menu-search-results {
+  right: auto !important;
+}
diff --git a/admin_menu.inc b/admin_menu.inc
index e212970..39e5900 100644
--- a/admin_menu.inc
+++ b/admin_menu.inc
@@ -24,6 +24,9 @@ function admin_menu_tree($menu_name) {
     // Convert named placeholders to anonymous placeholders, since the menu
     // system stores paths using anonymous placeholders.
     $replacements = array_fill_keys(array_keys($data['arguments'][0]), '%');
+    if (is_array($data['parent'])) {
+      continue;
+    }
     $data['parent'] = strtr($data['parent'], $replacements);
     $new_map[strtr($path, $replacements)] = $data;
   }
diff --git a/admin_menu.js b/admin_menu.js
index 2e28b55..375cf9e 100644
--- a/admin_menu.js
+++ b/admin_menu.js
@@ -226,15 +226,15 @@ Drupal.admin.behaviors.hover = function (context, settings, $adminMenu) {
       clearTimeout(this.sfTimer);
       // Display child lists.
       $('> ul', this)
-        .css({left: 'auto', display: 'block'})
+        .addClass('hover')
         // Immediately hide nephew lists.
-        .parent().siblings('li').children('ul').css({left: '-999em', display: 'none'});
+        .parent().siblings('li').children('ul').removeClass('hover');
     },
     function () {
       // Start the timer.
       var uls = $('> ul', this);
       this.sfTimer = setTimeout(function () {
-        uls.css({left: '-999em', display: 'none'});
+        uls.removeClass('hover');
       }, 400);
     }
   );
diff --git a/admin_menu_toolbar/admin_menu_toolbar-rtl.css b/admin_menu_toolbar/admin_menu_toolbar-rtl.css
new file mode 100644
index 0000000..7095564
--- /dev/null
+++ b/admin_menu_toolbar/admin_menu_toolbar-rtl.css
@@ -0,0 +1,44 @@
+/* Remove border from all lists and actions */
+#admin-menu .dropdown .admin-menu-action a {
+  border-right: 0;
+}
+
+/**
+ * Administration menu.
+ */
+#admin-menu > div > .dropdown > li > a {
+  border-left: 0;
+  margin-bottom: 4px;
+  padding: 2px 10px 3px;
+}
+#admin-menu .dropdown .admin-menu-tab a {
+  border-left: 0;
+}
+#admin-menu .dropdown li li.expandable ul {
+  margin: -22px 160px 0 0;
+}
+
+/**\
+ * Shortcuts toggle.
+ */
+#admin-menu .shortcut-toggle {
+  float: left;
+  margin: 0 1.3em 0 0;
+}
+
+/**
+ * Shortcuts widget.
+ */
+#admin-menu .shortcut-toolbar {
+  /* Align with icon; @see shortcut.css */
+  padding-right: 5px;
+}
+
+/* @see toolbar.css */
+#admin-menu .shortcut-toolbar li {
+  float: right;
+}
+
+div#toolbar a#edit-shortcuts {
+  top: 30px !important;
+}