diff --git a/r2/r2/controllers/toolbar.py b/r2/r2/controllers/toolbar.py
index b452a9d2a..a78dbd5db 100644
--- a/r2/r2/controllers/toolbar.py
+++ b/r2/r2/controllers/toolbar.py
@@ -68,7 +68,7 @@ def force_html():
     c.content_type = 'text/html; charset=UTF-8'
 
 def auto_expand_panel(link):
-    if not link.num_comments:
+    if not link.num_comments or link.is_self:
         return False
     else:
         return c.user.pref_frame_commentspanel
diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index 535976118..e64bc1074 100644
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -1488,7 +1488,7 @@ textarea.gray { color: gray; }
 .toolbar a, .toolbar .clickable {
     cursor: pointer;
     color: #336699;
-    text-decoration: none !important;
+    text-decoration: none;
 }
 
 .toolbar .clickable:active, .pushed-button {
@@ -1515,6 +1515,10 @@ textarea.gray { color: gray; }
     padding-left: 20px;
     color: black;
     font-style: italic;
+    cursor: pointer;
+}
+.toolbar .title:hover {
+    text-decoration: underline;
 }
 .toolbar .controls {
     float: right;
diff --git a/r2/r2/templates/frametoolbar.html b/r2/r2/templates/frametoolbar.html
index 61fc3fa8c..ef90eaae3 100644
--- a/r2/r2/templates/frametoolbar.html
+++ b/r2/r2/templates/frametoolbar.html
@@ -90,8 +90,8 @@
     <a href="${thing.url}" target="_top">
       <img src="${static('kill.png')}"
            height="11" width="11"
-           alt="${_('turn off the toolbar')}"
-           title="${_('turn off the toolbar')}" />
+           alt="${_('visit this link without the toolbar')}"
+           title="${_('visit this link without the toolbar')}" />
     </a>
   </div>
 
diff --git a/r2/r2/templates/linkinfobar.html b/r2/r2/templates/linkinfobar.html
index f8ca8184e..abd96cc72 100644
--- a/r2/r2/templates/linkinfobar.html
+++ b/r2/r2/templates/linkinfobar.html
@@ -23,8 +23,10 @@
 
 <div class="raisedbox linkinfo ${thing_css_class(thing.a)}">
   <table class="details">
-    <tr><th>${_("toolbar link")}</th>
-      <td><a href="${thing.a.tblink}">${thing.a.tblink}</a></td></tr>
+    %if not thing.a.is_self:
+      <tr><th>${_("toolbar link")}</th>
+        <td><a href="${thing.a.tblink}">${thing.a.tblink}</a></td></tr>
+    %endif
     <tr><th>${_("submitted on")}</th>
       <td>${thing.a._date.strftime(thing.datefmt)}</td></tr>
     <tr><th>${ungettext('point', 'points', 5)}</th>