diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less
index ef1ae59..02ae281 100755
--- a/css/plugins/do_tasks.less
+++ b/css/plugins/do_tasks.less
@@ -31,33 +31,43 @@ ul.page-attributes {
             &.user-task {
                 position: relative;
 
-                a {
-                    overflow: visible;
-                    white-space: normal; // Is this still needed?
-                    text-indent: 0;
+                button {
+                    border-radius: @ini_default_border_radius;
+                    border: 1px solid @wikiicons-border;
+                    padding: .14rem 0 0 0;
+                    min-width: 2rem;
+                    min-height: 28px;
+                    background: @ini_background none;
 
                     &::before {
                         content: ''; // remove when fontello is removed from usertools
                     }
+
+                    &:hover,
+                    &:focus,
+                    &:active {
+                        background: @ini_nav_menu_hover_color none;
+                        border: none;
+
+                        svg path {
+                            fill: @ini_background;
+                        }
+                    }
                 }
 
                 svg {
                     width: 20px;
                     margin-top: 2px;
 
+                    path {
+                        fill: @ini_nav_menu_hover_color;
+                    }
+
                     @media @screen_max-md {
                         margin-top: 4px;
                     }
                 }
 
-                &:hover {
-                    :not(.noopentasks) {
-                        svg path {
-                            fill: @ini_background;
-                        }
-                    }
-                }
-
                 .noopentasks {
                     span {
                         background-color: @ini_background_site;
diff --git a/css/plugins/starred.less b/css/plugins/starred.less
index fcc8c4d..a43c04d 100644
--- a/css/plugins/starred.less
+++ b/css/plugins/starred.less
@@ -17,6 +17,7 @@
         }
 
         a:hover,
+        a:focus,
         a:active {
             .starred svg {
                 fill: @ini_nav_menu_hover_bg;
diff --git a/tpl.php b/tpl.php
index b5a432f..23f284b 100644
--- a/tpl.php
+++ b/tpl.php
@@ -83,7 +83,7 @@ class tpl {
                       $args['rel'] = 'nofollow';
                   }
 
-      $args['href'] = $link;
+      $args['href'] = $link ?: '#';
 
       $svg = inlineSVG($svg);
       if(!$svg) $svg = inlineSVG(__DIR__ . '/images/tools/' . self::$icons['default']);