diff --git a/include/class.note.php b/include/class.note.php
index 55cee2c26486ca5a011450a3b34911aa7a82add1..4b0d36303335900a3c01f7f7c98889f41d05f2da 100644
--- a/include/class.note.php
+++ b/include/class.note.php
@@ -52,6 +52,19 @@ class QuickNote extends QuickNoteModel {
         return static::$types[$this->ext_id[0]];
     }
 
+    function getExtIconClass() {
+        switch ($this->ext_id[0]) {
+        case 'U':
+            return 'user';
+        case 'O':
+            return 'building';
+        }
+    }
+
+    function getIconTitle() {
+        return sprintf("%s Note", static::$types[$this->ext_id[0]]);
+    }
+
     static function forUser($user, $org=false) {
         if ($org)
             return static::objects()->filter(array('ext_id__in' =>
diff --git a/include/staff/templates/note.tmpl.php b/include/staff/templates/note.tmpl.php
index 2d8156128ef1b54c7839e105586c213a13b9ae0f..f14fbe69639122f8cf6a5d9b190be3b0b6e4aa00 100644
--- a/include/staff/templates/note.tmpl.php
+++ b/include/staff/templates/note.tmpl.php
@@ -1,14 +1,13 @@
 <div class="quicknote" data-id="<?php echo $note->id; ?>">
     <div class="header">
         <div class="header-left">
+            <i class="note-type icon-<?php echo $note->getExtIconClass(); ?>"i
+                title="<?php echo $note->getIconTitle(); ?>"></i>&nbsp;
             <?php echo $note->getFormattedTime(); ?>
         </div>
         <div class="header-right">
 <?php
             echo $note->getStaff()->getName();
-if ($ext_id && $note->ext_id != $ext_id) { ?>
-            <span class="label label-info"><?php echo $note->getExtType(); ?></span>
-<?php }
 if (isset($show_options) && $show_options) { ?>
             <div class="options">
                 <a href="#" class="action edit-note no-pjax" title="edit"><i class="icon-pencil"></i></a>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index cd6e093bb0ea01672b3113994debc5e2d7d06d3f..3d73c45cd2b5fbf3ec04d6dba2185b5104105589 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1666,8 +1666,8 @@ tr.disabled th {
 }
 .quicknote .header .options {
     display: inline-block;
-    padding-left: 5px;
-    margin-left: 10px;
+    padding-left: 10px;
+    margin-left: 5px;
     white-space: nowrap;
     border-left: 1px solid rgba(0,0,0,0.2);
 }
@@ -1732,6 +1732,13 @@ tr.disabled th {
     padding-right: 5px;
 }
 
+i.note-type {
+    color: #2a67ac;
+    opacity: 0.8;
+    border-right: 1px solid rgba(0, 0, 0, 0.2);
+    padding-right: 8px;
+}
+
 table.custom-info th {
     background: transparent;
     border: none;