diff --git a/kallithea/public/css/contextbar.css b/kallithea/public/css/contextbar.css
--- a/kallithea/public/css/contextbar.css
+++ b/kallithea/public/css/contextbar.css
@@ -2,69 +2,48 @@
  * Stylesheets for the context bar
  */
 
-i.icon-archive { background-image: url("../images/icons/database_edit.png"); }
-i.icon-arrow-right { background-image: url('../images/icons/arrow_right.png');}
-i.icon-ban-circle { background-image: url("../images/icons/cancel.png"); }
-i.icon-bar-chart { background-image: url("../images/icons/chart_bar.png"); }
-i.icon-book { background-image: url("../images/icons/book.png"); }
-i.icon-bookmark { background-image: url("../images/icons/tag_green.png"); }
-i.icon-code-fork { background-image: url("../images/icons/arrow_branch.png"); }
-i.icon-code-merge { background-image: url("../images/icons/arrow_merge.png"); } /* unused! */
-i.icon-cog { background-image: url("../images/icons/cog_edit.png"); }
-i.icon-cog { background-image: url("../images/icons/cog.png"); }
-i.icon-cogs { background-image: url("../images/icons/table_gear.png"); }
 i.icon-ellipsis-horizontal:after { content: ' ...';}
-i.icon-eye-open { background-image: url("../images/icons/eye.png"); }
-i.icon-file-2 { background-image: url("../images/icons/note.png"); }
-i.icon-file-alt { background-image: url("../images/icons/note_add.png"); }
-i.icon-file { background-image: url("../images/icons/file.png"); }
-i.icon-file-text { background-image: url("../images/icons/clipboard_16.png"); }
-i.icon-file-txt { background-image: url("../images/icons/note_error.png"); }
-i.icon-folder-close { background-image: url("../images/icons/database_link.png"); }
 i.icon-git { background-image: url('../images/icons/giticon.png');}
-i.icon-group { background-image: url("../images/icons/group_edit.png"); }
-i.icon-heart { background-image: url("../images/icons/heart_delete.png"); }
-i.icon-heart-empty { background-image: url("../images/icons/heart.png"); }
 i.icon-hg { background-image: url('../images/icons/hgicon.png');}
-i.icon-key { background-image: url("../images/icons/server_key.png"); }
-i.icon-lock { background-image: url('../images/icons/lock.png');}
-i.icon-lock-alt { background-image: url('../images/icons/private_repo.png');}
-i.icon-loop { background-image: url('../images/icons/arrow_inout.png');}
-i.icon-loop-2 { background-image: url('../images/icons/arrow_inout.png');}
-i.icon-private { background-image: url('../images/icons/private_repo.png');}
-i.icon-public { background-image: url('../images/icons/public_repo.png');}
-i.icon-random { background-image: url("../images/icons/arrow_switch.png"); }
-i.icon-refresh { background-image: url('../images/icons/arrow_refresh.png');}
-i.icon-search { background-image: url("../images/icons/search_16.png"); }
-i.icon-tag { background-image: url("../images/icons/tag_blue.png"); }
-i.icon-time { background-image: url("../images/icons/time.png"); }
-i.icon-list-alt { background-image: url("../images/icons/time.png"); }
-i.icon-unlock { background-image: url('../images/icons/lock_open.png');}
-i.icon-unlock-alt { background-image: url('../images/icons/public_repo.png');}
-i.icon-user { background-image: url("../images/icons/user_edit.png"); }
-i.icon-wrench { background-image: url("../images/icons/wrench.png"); }
-i.icon-rss-sign { background-image: url('../images/icons/rss_16.png');}
-i.icon-plus-sign { background-image: url('../images/icons/add.png');}
-i.icon-chevron-left:after { content: "\00AB";}
-i.icon-chevron-right:after { content: "\00BB";}
-i.icon-copy { background-image: url('../images/icons/note_add.png');}
-i.icon-pencil { background-image: url('../images/icons/application_form_edit.png');}
-i.icon-remove { background-image: url('../images/icons/delete.png');}
-i.icon-remove-sign { background-image: url('../images/icons/delete.png');}
-i.icon-plus { background-image: url('../images/icons/plus_16.png');}
-i.icon-resize-vertical { background-image: url('../images/icons/text_align_left.png');}
-i.icon-ok-sign { background-image: url('../images/icons/tick.png');}
-i.icon-minus-sign { background-image: url('../images/icons/delete.png');}
 i.icon-disabled { background-image: url('../images/icons/shading.png');} /* todo: use instead of minus sign */
 
 i[class^='icon-'] {
     background-repeat: no-repeat;
     background-position: center;
     display: inline-block;
-    width: 16px;
-    height: 16px;
+    min-width: 16px;
+    min-height: 16px;
     margin: -2px 0 -4px 0;
     /* background-color: red; /* for debugging */
+
+}
+
+/* css classes for diff file status ... it'd be nice if css had a way to
+   inherit from another class but alas, we must make sure this content is the
+   same from the icon font file */
+
+.icon-diff-M:before {
+    font-family: 'kallithea';
+    content: '\e805';
+    color: #d0b44c;
+}
+
+.icon-diff-D:before {
+    font-family: 'kallithea';
+    content: '\e807';
+    color: #bd2c00;
+}
+
+.icon-diff-A:before {
+    font-family: 'kallithea';
+    content: '\e806';
+    color: #6cc644;
+}
+
+.icon-diff-R:before {
+    font-family: 'kallithea';
+    content: '\e81f';
+    color: #677a85;
 }
 
 #content #context-bar {