diff --git a/rhodecode/public/css/buttons.less b/rhodecode/public/css/buttons.less
--- a/rhodecode/public/css/buttons.less
+++ b/rhodecode/public/css/buttons.less
@@ -53,7 +53,7 @@ input[type="button"] {
         .border ( @border-thickness, @grey4 );
     }
 
-    .icon-remove-sign {
+    .icon-remove {
         display: none;
     }
 
diff --git a/rhodecode/public/css/ipython.less b/rhodecode/public/css/ipython.less
--- a/rhodecode/public/css/ipython.less
+++ b/rhodecode/public/css/ipython.less
@@ -536,7 +536,7 @@ th {
 .glyphicon-minus-sign:before {
   content: "\e082";
 }
-.glyphicon-remove-sign:before {
+.glyphicon-remove:before {
   content: "\e083";
 }
 .glyphicon-ok-sign:before {
diff --git a/rhodecode/templates/admin/repos/repo_add_base.mako b/rhodecode/templates/admin/repos/repo_add_base.mako
--- a/rhodecode/templates/admin/repos/repo_add_base.mako
+++ b/rhodecode/templates/admin/repos/repo_add_base.mako
@@ -11,7 +11,7 @@
             <div class="input">
                 ${h.text('repo_name', class_="medium")}
                 <div class="info-block">
-                    <a id="remote_clone_toggle" href="#"><i class="icon-download-alt"></i> ${_('Import Existing Repository ?')}</a>
+                    <a id="remote_clone_toggle" href="#">${_('Import Existing Repository ?')}</a>
                 </div>
                 %if not c.rhodecode_user.is_admin:
                     ${h.hidden('user_created',True)}
diff --git a/rhodecode/templates/admin/repos/repo_edit_advanced.mako b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
--- a/rhodecode/templates/admin/repos/repo_edit_advanced.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
@@ -161,7 +161,7 @@
         <div class="field">
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to archive this repository: %s') % c.repo_name}');">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 ${_('Archive this repository')}
             </button>
         </div>
@@ -217,7 +217,7 @@
         <div class="field">
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to delete this repository: %s') % c.repo_name}');">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 ${_('Delete this repository')}
             </button>
         </div>
diff --git a/rhodecode/templates/admin/repos/repo_edit_settings.mako b/rhodecode/templates/admin/repos/repo_edit_settings.mako
--- a/rhodecode/templates/admin/repos/repo_edit_settings.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_settings.mako
@@ -57,7 +57,7 @@
                     % if not c.form['repo_clone_uri'].error:
                     <div id="clone_uri_hidden" class='text-as-placeholder'>
                         <span id="clone_uri_hidden_value">${c.rhodecode_db_repo.clone_uri_hidden}</span>
-                        <span class="link" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
+                        <span class="link" id="edit_clone_uri">${_('edit')}</span>
                     </div>
                     % endif
 
@@ -99,7 +99,7 @@
                     % if not c.form['repo_push_uri'].error:
                     <div id="push_uri_hidden" class='text-as-placeholder'>
                         <span id="push_uri_hidden_value">${c.rhodecode_db_repo.push_uri_hidden}</span>
-                        <span class="link" id="edit_push_uri"><i class="icon-edit"></i>${_('edit')}</span>
+                        <span class="link" id="edit_push_uri">${_('edit')}</span>
                     </div>
                     % endif
 
diff --git a/rhodecode/templates/admin/settings/settings_exceptions.mako b/rhodecode/templates/admin/settings/settings_exceptions.mako
--- a/rhodecode/templates/admin/settings/settings_exceptions.mako
+++ b/rhodecode/templates/admin/settings/settings_exceptions.mako
@@ -27,7 +27,7 @@
         <div class="field">
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to delete this exception')}');">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 ${_('Delete This Exception')}
             </button>
         </div>
diff --git a/rhodecode/templates/admin/settings/settings_exceptions_browse.mako b/rhodecode/templates/admin/settings/settings_exceptions_browse.mako
--- a/rhodecode/templates/admin/settings/settings_exceptions_browse.mako
+++ b/rhodecode/templates/admin/settings/settings_exceptions_browse.mako
@@ -17,7 +17,7 @@
         <div class="field">
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to delete all exceptions')}');">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 % if c.type_filter:
                     ${_('Delete All `{}`').format(c.type_filter)}
                 % else:
diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako b/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako
--- a/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako
+++ b/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako
@@ -77,7 +77,7 @@
             ${h.hidden('force', 1)}
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to delete user group `%(ugroup)s` with all permission assignments') % {'ugroup': c.user_group.users_group_name}}');">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 ${_('Delete This User Group')}
             </button>
         ${h.end_form()}
diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako b/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako
--- a/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako
+++ b/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako
@@ -86,7 +86,7 @@
                               </td>
                               <td class="">
                                 <div class="usergroup_member_remove action_button" onclick="removeUserGroupMember(${user.user_id}, true)" style="visibility: visible;">
-                                    <i class="icon-remove-sign"></i>
+                                    <i class="icon-remove"></i>
                                 </div>
                               </td>
                             </tr>
@@ -155,7 +155,7 @@
                           '</td>'+
                           '<td class="td-author-new-entry">'+
                             '<div class="usergroup_member_remove action_button" onclick="removeUserGroupMember({5}, true)" style="visibility: visible;">'+
-                                '<i class="icon-remove-sign"></i>'+
+                                '<i class="icon-remove"></i>'+
                             '</div>'+
                           '</td>'+
                         '</tr>').format(gravatar, userLink, username,
diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako
--- a/rhodecode/templates/codeblocks/diffs.mako
+++ b/rhodecode/templates/codeblocks/diffs.mako
@@ -556,7 +556,7 @@ def get_comments_for(diff_type, comments
             %if line_old_comments:
                 <% has_outdated = any([x.outdated for x in line_old_comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
                     <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif
@@ -599,7 +599,7 @@ def get_comments_for(diff_type, comments
             %if line_new_comments:
                 <% has_outdated = any([x.outdated for x in line_new_comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
                     <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif
@@ -655,7 +655,7 @@ def get_comments_for(diff_type, comments
             % if comments:
                 <% has_outdated = any([x.outdated for x in comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
                     <i title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif
diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako
--- a/rhodecode/templates/data_table/_dt_elements.mako
+++ b/rhodecode/templates/data_table/_dt_elements.mako
@@ -165,7 +165,8 @@
   <div>
     <div class="grid_edit">
       <a href="${h.route_path('edit_repo',repo_name=repo_name)}" title="${_('Edit')}">
-        <i class="icon-pencil"></i>Edit</a>
+        Edit
+      </a>
     </div>
     <div class="grid_delete">
       ${h.secure_form(h.route_path('edit_repo_advanced_delete', repo_name=repo_name), request=request)}
@@ -252,7 +253,8 @@
 <%def name="user_actions(user_id, username)">
  <div class="grid_edit">
    <a href="${h.route_path('user_edit',user_id=user_id)}" title="${_('Edit')}">
-     <i class="icon-pencil"></i>${_('Edit')}</a>
+     ${_('Edit')}
+   </a>
  </div>
  <div class="grid_delete">
   ${h.secure_form(h.route_path('user_delete', user_id=user_id), request=request)}
diff --git a/rhodecode/templates/debug_style/code-block.html b/rhodecode/templates/debug_style/code-block.html
--- a/rhodecode/templates/debug_style/code-block.html
+++ b/rhodecode/templates/debug_style/code-block.html
@@ -470,7 +470,7 @@
                   <a class="btn btn-mini" href="/example/annotate/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">annotation</a>
                 <a class="btn btn-mini" href="/example/raw/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">raw</a>
                 <a class="btn btn-mini" href="/example/rawfile/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">
-                    <i class="icon-archive"></i> download
+                    download
                 </a>
 
                   <a class="btn btn-mini disabled tooltip" href="#" title="Editing files allowed only when on branch head commit">edit</a>
@@ -648,7 +648,7 @@ File Edit
                         <a class="btn btn-mini" href="/example/files/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">source</a>
                       <a class="btn btn-mini" href="/example/raw/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">raw</a>
                       <a class="btn btn-mini" href="/example/rawfile/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">
-                          <i class="icon-archive"></i> download
+                          download
                       </a>
                 </div>
             </div>
diff --git a/rhodecode/templates/debug_style/collapsable-content.html b/rhodecode/templates/debug_style/collapsable-content.html
--- a/rhodecode/templates/debug_style/collapsable-content.html
+++ b/rhodecode/templates/debug_style/collapsable-content.html
@@ -150,7 +150,7 @@
                 </div>
                   <input id="reviewer_70_input" type="hidden" value="70" name="review_members">
                   <div class="reviewer_member_remove action_button" onclick="removeReviewMember(70, true)" style="visibility: hidden;">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                   </div>
               </li>
               <li id="reviewer_33" class="collapsable-content" data-toggle="reviewers">
diff --git a/rhodecode/templates/debug_style/form-elements-small.html b/rhodecode/templates/debug_style/form-elements-small.html
--- a/rhodecode/templates/debug_style/form-elements-small.html
+++ b/rhodecode/templates/debug_style/form-elements-small.html
@@ -250,7 +250,7 @@
                 <div class='input'>
                   <input id="05_example_input" type="text" readonly="readonly" placeholder="Example input">
                   <span class="btn action_button btn-x">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                     delete
                   </span>
                   <span class="help-block">
diff --git a/rhodecode/templates/debug_style/form-elements.html b/rhodecode/templates/debug_style/form-elements.html
--- a/rhodecode/templates/debug_style/form-elements.html
+++ b/rhodecode/templates/debug_style/form-elements.html
@@ -42,7 +42,7 @@
                 <div class='input'>
                   <div class='text-as-placeholder'>
                     http://something.example.com
-                    <span class="link" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
+                    <span class="link" id="edit_clone_uri">${_('edit')}</span>
                   </div>
                   <p class='help-block'>Help text in a paragraph.</p>
                 </div>
@@ -339,7 +339,7 @@
                 <div class='input'>
                   <input id="05_example_input" type="text" readonly="readonly" placeholder="Example input">
                   <span class="btn btn-x">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                     delete
                   </span>
                   <button class='btn btn-primary'>Action</button>
diff --git a/rhodecode/templates/debug_style/tables-wide.html b/rhodecode/templates/debug_style/tables-wide.html
--- a/rhodecode/templates/debug_style/tables-wide.html
+++ b/rhodecode/templates/debug_style/tables-wide.html
@@ -47,7 +47,6 @@
           <td>
              <div class="grid_edit">
                <a class="edit_issuetracker_entry" uid="4980baa2985b361e6e91b932f4a897d5" title="edit" href="#">
-                 <i class="icon-pencil"></i>
                    <input type="submit" value="edit" class="btn btn-link">
                </a>
              </div>
@@ -59,7 +58,7 @@
 
 <div style="display: none;"><input type="hidden" value="05adf5bfb9be3766186f25db19b545134c6b0077" name="csrf_token" id="csrf_token"></div>
                     <input type="hidden" value="4980baa2985b361e6e91b932f4a897d5" name="del_uid" id="del_uid">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                     <input type="submit" value="delete" onclick="return confirm('Confirm to remove this pattern: kjlakjlkjlkj;lkjl;kjl;kjl;kjl;kj;lkj');" id="remove_user_3" class="btn btn-link btn-danger">
                 </form>
              </div>
@@ -74,7 +73,6 @@
           <td>
              <div class="grid_edit">
                <a class="edit_issuetracker_entry" uid="98ac51a4ab43bb36a4feceed15ac5b21" title="edit" href="#">
-                 <i class="icon-pencil"></i>
                    <input type="submit" value="edit" class="btn btn-link">
                </a>
              </div>
@@ -86,7 +84,7 @@
 
 <div style="display: none;"><input type="hidden" value="05adf5bfb9be3766186f25db19b545134c6b0077" name="csrf_token" id="csrf_token"></div>
                     <input type="hidden" value="98ac51a4ab43bb36a4feceed15ac5b21" name="del_uid" id="del_uid">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                     <input type="submit" value="delete" onclick="return confirm('Confirm to remove this pattern: kajls;kdjfal;skdjflaskdjflksjdlfksjdlfksjdlfkjsldkfjslkdjflskdjflkdsjf');" id="remove_user_3" class="btn btn-link btn-danger">
                 </form>
              </div>
@@ -101,7 +99,6 @@
           <td>
              <div class="grid_edit">
                <a class="edit_issuetracker_entry" uid="098f6bcd4621d373cade4e832627b4f6" title="edit" href="#">
-                 <i class="icon-pencil"></i>
                    <input type="submit" value="edit" class="btn btn-link">
                </a>
              </div>
@@ -113,7 +110,7 @@
 
 <div style="display: none;"><input type="hidden" value="05adf5bfb9be3766186f25db19b545134c6b0077" name="csrf_token" id="csrf_token"></div>
                     <input type="hidden" value="098f6bcd4621d373cade4e832627b4f6" name="del_uid" id="del_uid">
-                    <i class="icon-remove-sign"></i>
+                    <i class="icon-remove"></i>
                     <input type="submit" value="delete" onclick="return confirm('Confirm to remove this pattern: test');" id="remove_user_3" class="btn btn-link btn-danger">
                 </form>
              </div>
diff --git a/rhodecode/templates/debug_style/tables.html b/rhodecode/templates/debug_style/tables.html
--- a/rhodecode/templates/debug_style/tables.html
+++ b/rhodecode/templates/debug_style/tables.html
@@ -236,11 +236,12 @@
             <td class="td-action">
               <div class="grid_edit">
                 <a href="/_admin/users/2/edit" title="edit">
-                  <i class="icon-pencil"></i>Edit</a>
+                    Edit
+                </a>
               </div>
               <div class="grid_delete">
               <form action="/_admin/users/2" method="post">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
                 <input class="btn btn-danger btn-link" id="remove_user_2" name="remove_"  type="submit" value="delete">
               </form>
              </div>
diff --git a/rhodecode/templates/ejs_templates/templates.html b/rhodecode/templates/ejs_templates/templates.html
--- a/rhodecode/templates/ejs_templates/templates.html
+++ b/rhodecode/templates/ejs_templates/templates.html
@@ -104,12 +104,12 @@ var CG = new ColorGenerator();
 
       <% if (mandatory) { %>
             <div class="reviewer_member_mandatory_remove" style="visibility: <%= edit_visibility %>;">
-                <i class="icon-remove-sign"></i>
+                <i class="icon-remove"></i>
             </div>
       <% } else { %>
         <% if (allowed_to_update) { %>
           <div class="reviewer_member_remove action_button" onclick="reviewersController.removeReviewMember(<%= member.user_id %>, true)" style="visibility: <%= edit_visibility %>;">
-              <i class="icon-remove-sign" ></i>
+              <i class="icon-remove" ></i>
           </div>
         <% } %>
       <% } %>
diff --git a/rhodecode/templates/summary/components.mako b/rhodecode/templates/summary/components.mako
--- a/rhodecode/templates/summary/components.mako
+++ b/rhodecode/templates/summary/components.mako
@@ -186,7 +186,7 @@
                 % else:
                     <span class="enabled">
                         <a id="archive_link" class="btn btn-small" href="${h.route_path('repo_archivefile',repo_name=c.rhodecode_db_repo.repo_name,fname='tip.zip')}">
-                            <i class="icon-archive"></i> tip.zip
+                            tip.zip
                             ## replaced by some JS on select
                         </a>
                     </span>
diff --git a/rhodecode/templates/summary/summary.mako b/rhodecode/templates/summary/summary.mako
--- a/rhodecode/templates/summary/summary.mako
+++ b/rhodecode/templates/summary/summary.mako
@@ -90,7 +90,7 @@
         var fname = e.added.raw_id + ext;
         var href = pyroutes.url('repo_archivefile', {'repo_name': templateContext.repo_name, 'fname':fname});
         // set new label
-        $('#archive_link').html('<i class="icon-archive"></i> {0}{1}'.format(escapeHtml(e.added.text), ext));
+        $('#archive_link').html('{0}{1}'.format(escapeHtml(e.added.text), ext));
 
         // set new url to button,
         $('#archive_link').attr('href', href)