diff --git a/res/app/components/stf/common-ui/badge-icon/badge-icon-directive.js b/res/app/components/stf/common-ui/badge-icon/badge-icon-directive.js
new file mode 100644
index 00000000..e6015746
--- /dev/null
+++ b/res/app/components/stf/common-ui/badge-icon/badge-icon-directive.js
@@ -0,0 +1,13 @@
+module.exports = function badgeIconDirective() {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: {
+
+    },
+    template: require('./badge-icon.jade'),
+    link: function (scope, element, attrs) {
+
+    }
+  }
+}
diff --git a/res/app/components/stf/common-ui/badge-icon/badge-icon-spec.js b/res/app/components/stf/common-ui/badge-icon/badge-icon-spec.js
new file mode 100644
index 00000000..87336470
--- /dev/null
+++ b/res/app/components/stf/common-ui/badge-icon/badge-icon-spec.js
@@ -0,0 +1,23 @@
+describe('badgeIcon', function () {
+
+  beforeEach(module('stf.badge-icon'));
+
+  var scope, compile;
+
+  beforeEach(inject(function ($rootScope, $compile) {
+    scope = $rootScope.$new();
+    compile = $compile;
+  }));
+
+  it('should ...', function () {
+
+    /* 
+     To test your directive, you need to create some html that would use your directive,
+     send that through compile() then compare the results.
+
+     var element = compile('<div badge-icon name="name">hi</div>')(scope);
+     expect(element.text()).toBe('hello, world');
+     */
+
+  });
+});
\ No newline at end of file
diff --git a/res/app/components/stf/common-ui/badge-icon/badge-icon.css b/res/app/components/stf/common-ui/badge-icon/badge-icon.css
new file mode 100644
index 00000000..8b367014
--- /dev/null
+++ b/res/app/components/stf/common-ui/badge-icon/badge-icon.css
@@ -0,0 +1,7 @@
+.stf-badge-icon {
+
+}
+
+.stf-badge-icon .stf-badge-icon-warning {
+  color: #fec42d;
+}
diff --git a/res/app/components/stf/common-ui/badge-icon/badge-icon.jade b/res/app/components/stf/common-ui/badge-icon/badge-icon.jade
new file mode 100644
index 00000000..bcf59e7e
--- /dev/null
+++ b/res/app/components/stf/common-ui/badge-icon/badge-icon.jade
@@ -0,0 +1,3 @@
+div.stf-badge-icon
+  //i.fa.fa-warning.stf-badge-icon-warning(popover='I appeared on mouse enter!', popover-placement='bottom', popover-trigger='mouseenter')
+  i.fa.fa-warning.stf-badge-icon-warning(tooltip-placement='bottom', tooltip='An error has ocurred')
diff --git a/res/app/components/stf/common-ui/badge-icon/index.js b/res/app/components/stf/common-ui/badge-icon/index.js
new file mode 100644
index 00000000..506df4ec
--- /dev/null
+++ b/res/app/components/stf/common-ui/badge-icon/index.js
@@ -0,0 +1,6 @@
+require('./badge-icon.css')
+
+module.exports = angular.module('stf.badge-icon', [
+
+])
+  .directive('badgeIcon', require('./badge-icon-directive'))
diff --git a/res/app/components/stf/common-ui/index.js b/res/app/components/stf/common-ui/index.js
index ffd378f1..ccf0c560 100644
--- a/res/app/components/stf/common-ui/index.js
+++ b/res/app/components/stf/common-ui/index.js
@@ -11,5 +11,6 @@ module.exports = angular.module('stf/common-ui', [
   require('./modals').name,
   require('./include-cached').name,
   require('./text-focus-select').name,
-  require('./counter').name
+  require('./counter').name,
+  require('./badge-icon').name
 ])
diff --git a/res/app/menu/menu.jade b/res/app/menu/menu.jade
index 7d494613..7e1b551a 100644
--- a/res/app/menu/menu.jade
+++ b/res/app/menu/menu.jade
@@ -21,6 +21,11 @@
         a(ng-click='openChat()').pointer
           i.fa.fa-comment.fa-fw
           | {{ "Chat" | translate }}
+
+      //li
+        a
+          badge-icon(type='warning', message='There was an error')
+
       li(ng-if='!$root.basicMode')
         a(ng-href='/#!/help')
           i.fa.fa-question-circle.fa-fw