diff --git a/core/themes/seven/style-rtl.css b/core/themes/seven/style-rtl.css
index 7070720..b57783c 100644
--- a/core/themes/seven/style-rtl.css
+++ b/core/themes/seven/style-rtl.css
@@ -81,21 +81,9 @@ ul.inline li {
   padding-left: 1em;
   padding-right: 0;
 }
-ul.admin-list li {
-  padding: 9px 30px 0 0;
-  margin-right: 0;
+.admin-list li a {
   background: url(images/list-item-rtl.png) no-repeat right 11px;
-}
-ul.admin-list li a {
-  margin-right: -30px;
-  margin-left: 0;
-  padding: 0 30px 4px 0;
-}
-ul.admin-list.compact li a {
-  margin-right: 0;
-}
-ul.admin-list li div.description a {
-  margin-right: 0;
+  padding: 9px 39px 9px 9px;
 }
 
 /**
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index f1e7321..2ddcb46 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -99,7 +99,6 @@ acronym {
   border-bottom: dotted 1px;
 }
 ul,
-.block ul,
 .item-list ul {
   list-style-type: disc;
   list-style-image: none;
@@ -331,50 +330,41 @@ ul.inline li {
 ul.inline li {
   display: inline;
 }
-ul.admin-list li {
+.admin-list {
+  margin: 0;
+  padding: 0;
+}
+.admin-list li {
   position: relative;
-  padding-left: 30px; /* LTR */
-  padding-top: 9px;
   border-top: 1px solid #ccc;
-  margin-left: 0; /* LTR */
-  margin-bottom: 10px;
-  background: url(images/list-item.png) no-repeat 0 11px; /* LTR */
+  margin: 0;
   list-style-type: none;
   list-style-image: none;
-}
-.admin-panel .item-list ul,
-ul.admin-list {
-  margin: 0;
   padding: 0;
 }
-.admin-panel .item-list ul,
-ul.admin-list.compact {
-  margin: 8px 0;
-}
-.admin-panel .item-list li,
-ul.admin-list.compact li {
+.admin-list.compact li {
   border: none;
-  background: none;
-  margin: 0 0 0.75em;
-  line-height: 1;
-  padding: 0;
 }
-ul.admin-list li:last-child {
-  border-bottom: none;
-}
-ul.admin-list li a {
-  margin-left: -30px; /* LTR */
-  padding: 0 0 4px 30px; /* LTR */
+.admin-list li a {
+  background: url(images/list-item.png) no-repeat 9px 11px; /* LTR */
+  display: block;
+  padding: 9px 9px 9px 39px; /* LTR */
   min-height: 0;
 }
-ul.admin-list.compact li a {
-  margin-left: 0; /* LTR */
-  padding: 0;
+.admin-list.compact li a {
+  background-image:  none;
+  padding: 2px 19px;
 }
-ul.admin-list li div.description a {
-  margin-left: 0; /* LTR */
-  padding: 0;
-  min-height: inherit;
+.admin-list li a:hover,
+.admin-list li a:focus,
+.admin-list li a:active {
+  text-decoration: none;
+  background-color: #fff;
+}
+.admin-list li a:hover .label,
+.admin-list li a:focus .label,
+.admin-list li a:active .label {
+  text-decoration: underline;
 }
 div.submitted {
   color: #898989;
diff --git a/core/themes/seven/template.php b/core/themes/seven/template.php
index a8643ab..65c7352 100644
--- a/core/themes/seven/template.php
+++ b/core/themes/seven/template.php
@@ -70,11 +70,14 @@ function seven_admin_block_content($variables) {
   if (!empty($content)) {
     $output = system_admin_compact_mode() ? '<ul class="admin-list compact">' : '<ul class="admin-list">';
     foreach ($content as $item) {
-      $output .= '<li class="leaf">';
-      $output .= l($item['title'], $item['href'], $item['localized_options']);
+      $output .= '<li>';
+      $content = '<span class="label">'.$item['title'].'</span>';
+      $options = $item['localized_options'];
+      $options['html'] = TRUE;
       if (isset($item['description']) && !system_admin_compact_mode()) {
-        $output .= '<div class="description">' . filter_xss_admin($item['description']) . '</div>';
+        $content .= '<div class="description">' . filter_xss_admin($item['description']) . '</div>';
       }
+      $output .= l($content, $item['href'], $options);
       $output .= '</li>';
     }
     $output .= '</ul>';