diff --git a/include/staff/templates/note.tmpl.php b/include/staff/templates/note.tmpl.php
index c0605028b6fbf29db7a7d9ee49a19d60722138bd..2d8156128ef1b54c7839e105586c213a13b9ae0f 100644
--- a/include/staff/templates/note.tmpl.php
+++ b/include/staff/templates/note.tmpl.php
@@ -11,7 +11,7 @@ if ($ext_id && $note->ext_id != $ext_id) { ?>
 <?php }
 if (isset($show_options) && $show_options) { ?>
             <div class="options">
-                <a href="#" class="action edit-note no-pjax" title="edit"><i class="icon-edit"></i></a>
+                <a href="#" class="action edit-note no-pjax" title="edit"><i class="icon-pencil"></i></a>
                 <a href="#" class="action save-note no-pjax" style="display:none" title="save"><i class="icon-save"></i></a>
                 <a href="#" class="action cancel-edit no-pjax" style="display:none" title="undo"><i class="icon-undo"></i></a>
                 <a href="#" class="action delete no-pjax" title="delete"><i class="icon-trash"></i></a>
diff --git a/include/staff/templates/user.tmpl.php b/include/staff/templates/user.tmpl.php
index 0f2a930d5e032ff58d8290f08ddcdd85d1025160..9cfb8554c1a2e58a846fab3cb9e654385af93355 100644
--- a/include/staff/templates/user.tmpl.php
+++ b/include/staff/templates/user.tmpl.php
@@ -45,8 +45,8 @@ if ($info['error']) {
 
 <div class="tab_content" id="info-tab">
 <div class="floating-options">
-    <a href="#" id="edituser" class="action" title="edit"><i class="icon-edit"></i></a>
-    <a href="users.php?id=<?php echo $user->getId(); ?>" title="manage"
+    <a href="#" id="edituser" class="action" title="Edit"><i class="icon-edit"></i></a>
+    <a href="users.php?id=<?php echo $user->getId(); ?>" title="Manage User"
         class="action no-pjax"><i class="icon-share"></i></a>
 </div>
     <table class="custom-info">
@@ -67,7 +67,7 @@ if ($info['error']) {
 
 <div class="tab_content" id="organization-tab" style="display:none">
 <div class="floating-options">
-    <a href="orgs.php?id=<?php echo $org->getId(); ?>" title="manage"
+    <a href="orgs.php?id=<?php echo $org->getId(); ?>" title="Manage Organization"
         class="action no-pjax"><i class="icon-share"></i></a>
 </div>
     <table class="custom-info" width="100%">
diff --git a/scp/css/scp.css b/scp/css/scp.css
index b34aacd8187444bae8ed6aabd4d009b2838123a5..cd6e093bb0ea01672b3113994debc5e2d7d06d3f 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1676,17 +1676,28 @@ tr.disabled th {
 }
 .quicknote a.action,
 .floating-options a.action {
-    padding: 2px 4px;
-    margin: 1px;
+    box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box;
+    display: inline-block;
+    width: 15px;
+    text-align: center;
+    padding: 2px 2px;
     color: black !important;
+    background-color: #eee;
+    background-color: rgba(0, 0, 0, 0.05);
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ddd;
+    border-color: rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
 }
 .quicknote a.action:hover,
 .floating-options a.action:hover {
     text-decoration: none;
-    border: 1px solid #ff9100;
+    border-color: #ff9100;
+    background-color: rgba(255, 145, 0, 0.05);
     border-radius: 3px;
-    color: #ff9100 !important;
-    margin: 0;
 }
 #new-note {
     margin-top: 10px;
@@ -1717,7 +1728,7 @@ tr.disabled th {
     display: inline-block;
     position: absolute;
     right: 0;
-    top: 10px;
+    top: 5px;
     padding-right: 5px;
 }