diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css
index d5f77577..b82e49e0 100644
--- a/Netdisco/share/public/css/netdisco.css
+++ b/Netdisco/share/public/css/netdisco.css
@@ -9,6 +9,7 @@ body {
 /* magnifying glass icon for search box */
 .nd_navbar-icon {
   vertical-align: sub;
+  margin-top: 4px;
   cursor: pointer;
 }
 
diff --git a/Netdisco/share/views/layouts/main.tt b/Netdisco/share/views/layouts/main.tt
index 51b77422..208ef22d 100644
--- a/Netdisco/share/views/layouts/main.tt
+++ b/Netdisco/share/views/layouts/main.tt
@@ -88,7 +88,8 @@
         <input placeholder="Find Anything" class="search-query span3"
           id="nq" name="q" type="text" autocomplete="off"/>
         <span style="font-size: 24px;">
-        <i id="navsearchgo" class="icon-search nd_navbar-icon"></i>
+          <i id="navsearchgo" class="icon-search nd_navbar-icon"
+            rel="tooltip" data-placement="bottom" data-offset="5" data-title="New Search" data-container="body"></i>
         </span>
       </form>
       [% IF user_has_role('admin') %]
diff --git a/Netdisco/share/views/sidebar/device/ports.tt b/Netdisco/share/views/sidebar/device/ports.tt
index 46022683..fb305029 100644
--- a/Netdisco/share/views/sidebar/device/ports.tt
+++ b/Netdisco/share/views/sidebar/device/ports.tt
@@ -124,4 +124,5 @@
                 </ul>
               </div>
             </div>
-            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">Update View</button>
+            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">
+              <i class="icon-search icon-large pull-left nd_navbar-icon"></i> Update View</button>
diff --git a/Netdisco/share/views/sidebar/search/device.tt b/Netdisco/share/views/sidebar/search/device.tt
index ae5aed96..12974662 100644
--- a/Netdisco/share/views/sidebar/search/device.tt
+++ b/Netdisco/share/views/sidebar/search/device.tt
@@ -77,4 +77,5 @@
                 <span class="nd_searchcheckbox uneditable-input">Match All Options</span>
               </label>
             </div>
-            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">Search Again</button>
+            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">
+              <i class="icon-search icon-large pull-left nd_navbar-icon"></i> Search Devices</button>
diff --git a/Netdisco/share/views/sidebar/search/node.tt b/Netdisco/share/views/sidebar/search/node.tt
index cce60746..0d53105d 100644
--- a/Netdisco/share/views/sidebar/search/node.tt
+++ b/Netdisco/share/views/sidebar/search/node.tt
@@ -46,4 +46,5 @@
                 [% END %]
               </select>
             </div>
-            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">Search Again</button>
+            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">
+              <i class="icon-search icon-large pull-left nd_navbar-icon"></i> Search Nodes</button>
diff --git a/Netdisco/share/views/sidebar/search/port.tt b/Netdisco/share/views/sidebar/search/port.tt
index 9ea2cabb..92ef81b4 100644
--- a/Netdisco/share/views/sidebar/search/port.tt
+++ b/Netdisco/share/views/sidebar/search/port.tt
@@ -10,4 +10,5 @@
                 <span class="nd_searchcheckbox uneditable-input">Partial Name</span>
               </label>
             </div>
-            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">Search Again</button>
+            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">
+              <i class="icon-search icon-large pull-left nd_navbar-icon"></i> Search Ports</button>