diff --git a/bower.json b/bower.json
index feef1b4642..1dadcfef82 100644
--- a/bower.json
+++ b/bower.json
@@ -44,5 +44,9 @@
   },
   "devDependencies": {
     "angular-mocks": "~1.2.1"
+  },
+  "resolutions": {
+    "jquery": ">=1.6.4",
+    "bootstrap": "~3.1.0"
   }
 }
diff --git a/views/main/filters.jade b/views/main/filters.jade
index 0a5de7e1db..c3a11240b1 100644
--- a/views/main/filters.jade
+++ b/views/main/filters.jade
@@ -5,15 +5,15 @@
   ul.nav.nav-pills
     li
       a(rel='tooltip', title=env.t('editTags'), ng-click='saveOrEdit()')
-        i(ng-class='{"icon-ok": _editing, "icon-pencil": !_editing}')
+        span.glyphicon(ng-class='{"glyphicon-ok": _editing, "glyphicon-pencil": !_editing}')
     li(bindonce='user.tags', ng-class='{active: user.filters[tag.id]}', ng-repeat='tag in user.tags', style='position: relative;')
       .input-append.option-group.tag-editing(ng-show='_editing')
         input.input.input-small.option-content.tag-editing-pill(type='text', ng-model='tag.name')
         span.add-on.tag-editing-pill
           a.pull-right(ng-click='user.ops.deleteTag({params:{id:tag.id}})')
-            i.icon-trash
+            span.glyphicon.glyphicon-trash
       a(ng-hide='_editing', ng-click='toggleFilter(tag)')
-        i.icon-bullhorn(bo-if="tag.challenge")
+        span.glyphicon.glyphicon-bullhorn(bo-if="tag.challenge")
         markdown(ng-model='tag.name',style='display: inline-block')
     li
       form.form-inline(ng-show='_editing', ng-submit='createTag(_newTag)')
@@ -23,4 +23,4 @@
     // <li class="{#unless activeFilters(users[_userId].filters)}hidden{/}">
     li
       a(rel='tooltip', title=env.t('clearFilters'), ng-click='user.filters = {}')
-        i.icon-remove-sign
+        span.glyphicon.glyphicon-remove-sign
diff --git a/views/options/index.jade b/views/options/index.jade
index aea6dedb26..496acde639 100644
--- a/views/options/index.jade
+++ b/views/options/index.jade
@@ -12,19 +12,19 @@ script(id='partials/options.html', type="text/ng-template")
       ul.nav.nav-tabs
         li(ng-class="{ active: $state.includes('options.profile') }")
           a(ui-sref='options.profile')
-            i.icon-user
+            span.glyphicon.glyphicon-user
             =env.t('profile')
         li(ng-class="{ active: $state.includes('options.social') }")
           a(ui-sref='options.social')
-            i.icon-heart
+            span.glyphicon.glyphicon-heart
             =env.t('social')
         li(ng-class="{ active: $state.includes('options.inventory') }", ng-if='user.flags.dropsEnabled')
           a(ui-sref='options.inventory')
-            i.icon-gift
+            span.glyphicon.glyphicon-gift
             =env.t('inventory')
         li(ng-class="{ active: $state.includes('options.settings') }")
           a(ui-sref='options.settings')
-            i.icon-wrench
+            span.glyphicon.glyphicon-wrench
             =env.t('settings')
 
       .tab-content
diff --git a/views/options/profile.jade b/views/options/profile.jade
index 36eec2f599..ed68f3e95d 100644
--- a/views/options/profile.jade
+++ b/views/options/profile.jade
@@ -41,7 +41,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
             .label.label-info.pull-right(popover=env.t('limited31Jan'), popover-title=env.t('limitededition'), popover-placement='right', popover-trigger='mouseenter')
               =env.t('limitededition')
               | 
-              i.icon.icon-question-sign
+              span.glyphicon.glyphicon.icon-question-sign
             menu(label=env.t('wintercolors'))
               each color in ['candycane','frost','winternight','holly']
                 button(type='button', ng-class='{locked: !user.purchased.hair.color.#{color}}', class='customize-option hair_bangs_1_#{color}', style='width: 40px; height: 40px;', ng-click='unlock("hair.color.#{color}")')
@@ -129,7 +129,7 @@ script(id='partials/options.profile.stats.html', type='text/ng-template')
               {{user.stats.points}}&nbsp;
               =env.t('unallocated')
             &nbsp;
-            i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelpopover'))
+            span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelpopover'))
           td
         tr
           td(colspan=2)
@@ -138,23 +138,23 @@ script(id='partials/options.profile.stats.html', type='text/ng-template')
                 input(type='checkbox', ng-model='user.preferences.automaticAllocation', ng-change='set({"preferences.automaticAllocation": user.preferences.automaticAllocation?true: false})', ng-click='set({"preferences.allocationMode":"taskbased"})')
                 =env.t('automaticallocation')
                 &nbsp;
-                i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('automaticallocationpopover'))
+                span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('automaticallocationpopover'))
               form(ng-show='user.preferences.automaticAllocation',style='margin-left:1em')
                 label.radio
                   input(type='radio', name='allocationMode', value='flat', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "flat"})')
                   =env.t('evenallocation')
                   &nbsp;
-                  i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('evenallocationpopover'))
+                  span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('evenallocationpopover'))
                 label.radio
                   input(type='radio', name='allocationMode', value='classbased', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "classbased"})')
                   =env.t('classallocation')
                   &nbsp;
-                  i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('classallocationpopover'))
+                  span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('classallocationpopover'))
                 label.radio
                   input(type='radio', name='allocationMode', value='taskbased', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "taskbased"})')
                   =env.t('taskallocation')
                   &nbsp;
-                  i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('taskallocationpopover'))
+                  span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('taskallocationpopover'))
         tr
           td= env.t('allocatestr') + ' {{user.stats.str}}'
           td
diff --git a/views/options/settings.jade b/views/options/settings.jade
index 5a330cda07..f6f6c393ef 100644
--- a/views/options/settings.jade
+++ b/views/options/settings.jade
@@ -38,27 +38,27 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
         input(type='checkbox', ng-click='set({"preferences.hideHeader":user.preferences.hideHeader?false:true})', ng-checked='user.preferences.hideHeader!==true')
         =env.t('showHeader')
         &nbsp;
-        i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('showHeaderpop'))
+        span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('showHeaderpop'))
       label.checkbox
         input(type='checkbox', ng-click='toggleStickyHeader()', ng-checked='user.preferences.stickyHeader!==false')
         =env.t('stickyHeader')
         &nbsp;
-        i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('stickyHeaderpop'))
+        span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('stickyHeaderpop'))
       label.checkbox
         input(type='checkbox', ng-model='user.preferences.newTaskEdit', ng-change='set({"preferences.newTaskEdit": user.preferences.newTaskEdit?true: false})')
         =env.t('newtaskedit')
         &nbsp;
-        i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('newtaskeditpop'))
+        span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('newtaskeditpop'))
       label.checkbox
         input(type='checkbox', ng-model='user.preferences.tagsCollapsed', ng-change='set({"preferences.tagsCollapsed": user.preferences.tagsCollapsed?true: false})')
         =env.t('startcollapsed')
         &nbsp;
-        i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('startcollapsedpop'))
+        span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('startcollapsedpop'))
       label.checkbox
         input(type='checkbox', ng-model='user.preferences.advancedCollapsed', ng-change='set({"preferences.advancedCollapsed": user.preferences.advancedCollapsed?true: false})')
         =env.t('startacollapsed')
         &nbsp;
-        i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('startacollapsedpop'))
+        span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('startacollapsedpop'))
       button.btn(ng-click='showTour()', popover-placement='right', popover-trigger='mouseenter', popover=env.t('showtourpop1'))= env.t('showtour')
       br
       button.btn(ng-click='showBailey()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('showtourpop'))= env.t('showtour2')
@@ -156,7 +156,7 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template')
     div(ng-if='user.purchased.plan.customerId')
       .well
         div(style='font-size:22px')
-          i.icon-ok
+          span.glyphicon.glyphicon-ok
           | Subscribed
         div(ng-include="'partials/options.settings.subscription.perks.html'")
       .btn.btn-small.btn-danger(ng-click='cancelSubscription()') Cancel Subscription
\ No newline at end of file
diff --git a/views/options/social/challenge-box.jade b/views/options/social/challenge-box.jade
index 5b7254bbc7..683d5ba829 100644
--- a/views/options/social/challenge-box.jade
+++ b/views/options/social/challenge-box.jade
@@ -3,7 +3,7 @@
   .modal-header
     h3=env.t('challenges')
       a.pull-right(target='_blank', href='https://trello.com/card/challenges-individual-party-guild-public/50e5d3684fe3a7266b0036d6/58')
-        i.icon-question-sign
+        span.glyphicon.glyphicon-question-sign
   .modal-body(bindonce='group.challenges')
     div(ng-if='group.challenges.length > 0')
       table.table.table-striped
@@ -13,6 +13,6 @@
     div(ng-if='group.challenges.length == 0')
       p=env.t('noChallenges')
         a(class='label' ui-sref='options.social.challenges')
-          i.icon-bullhorn
+          span.glyphicon.glyphicon-bullhorn
           =env.t('challenges')
         =env.t('toCreate')
diff --git a/views/options/social/challenges.jade b/views/options/social/challenges.jade
index fe2769b6a1..08cc85c531 100644
--- a/views/options/social/challenges.jade
+++ b/views/options/social/challenges.jade
@@ -39,7 +39,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht
 
   .well(bindonce='challenge', ng-if='challenge.description')
     markdown(ng-model='challenge.description')
-  i.icon-question-sign(popover=env.t('challengeDiscription'), popover-trigger='mouseenter', popover-placement='right')
+  span.glyphicon.glyphicon-question-sign(popover=env.t('challengeDiscription'), popover-trigger='mouseenter', popover-placement='right')
   habitrpg-tasks(obj='challenge', main=false)
 
   // Member List
@@ -98,7 +98,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
             .option-medium
               input.option-content(type='text', minlength="3", maxlength="16", ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required)
               a(target='_blank', href='http://habitrpg.wikia.com/wiki/Tags')
-                i.icon-question-sign(popover=env.t('challengeTagPop'), popover-trigger='mouseenter', popover-placement='right')
+                span.glyphicon.glyphicon-question-sign(popover=env.t('challengeTagPop'), popover-trigger='mouseenter', popover-placement='right')
 
             textarea.option-content(cols='3', placeholder=env.t('challengeDescr'), ng-model='newChallenge.description')
 
@@ -109,7 +109,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
             .option-medium
               input.option-content(type='number', min="{{newChallenge.group=='habitrpg' ? 1 : 0}}", max="{{maxPrize}}", ng-model='newChallenge.prize', placeholder=env.t('prize'))
               span.input-suffix.Pet_Currency_Gem1x.inline-gems
-              i.icon-question-sign(popover=env.t('prizePop'), popover-trigger='mouseenter', popover-placement='right')
+              span.glyphicon.glyphicon-question-sign(popover=env.t('prizePop'), popover-trigger='mouseenter', popover-placement='right')
               span(ng-show='newChallenge.group=="habitrpg"')
                 !=env.t('min1Gem') + ' <strong>' + env.t('publicChallenges') + '</strong> ' + env.t('helpsPrevent')
 
@@ -144,10 +144,10 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
             li
               // leave / join
               a.btn.btn-small.btn-danger(ng-show='challenge._isMember', ng-click='clickLeave(challenge, $event)')
-                i.icon-ban-circle
+                span.glyphicon.glyphicon-ban-circle
                 =env.t('leave')
               a.btn.btn-small.btn-success(ng-hide='challenge._isMember', ng-click='join(challenge)')
-                i.icon-ok
+                span.glyphicon.glyphicon-ok
                 =env.t('join')
           a.accordion-toggle(ng-click='toggle(challenge._id)') {{challenge.name}}
         .accordion-body(ng-class='{collapse: !$stateParams.cid == challenge._id}')
diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade
index 6aab142028..bf8e731a66 100644
--- a/views/options/social/chat-message.jade
+++ b/views/options/social/chat-message.jade
@@ -9,6 +9,6 @@ li.chat-message(bindonce='group.chat', ng-repeat='message in group.chat', bo-cla
       a.label(ng-show='countExists(message.likes)',ng-class='{"label-success":message.likes[user._id]}',ng-click='likeChatMessage(group,message)') +{{countExists(message.likes)}}
       a.chat-plus-one.muted(ng-show='!countExists(message.likes)',ng-click='likeChatMessage(group,message)',style='background-color:#eee;padding:3px 3px 0px 3px') +1
     a(bo-show='user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)',style='padding: 0px 3px')
-      i.icon-trash(tooltip=env.t('delete'))
+      span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))
   a.label.chat-message(bo-show='message.user', class='float-label', bo-class='{"label-npc": message.backer.npc, "label-contributor-{{message.contributor.level}}":message.contributor.level}', ng-click='clickMember(message.uuid, true)')
       span(tooltip='{{contribText(message.contributor, message.backer)}}') {{message.user}}&nbsp;
diff --git a/views/options/social/group.jade b/views/options/social/group.jade
index 95a9871e43..46ba51453e 100644
--- a/views/options/social/group.jade
+++ b/views/options/social/group.jade
@@ -33,13 +33,13 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild
               .progress(style="height:10px")
               .bar(style='width: {{Shared.percent(group.quest.hp, Content.quests[group.quest.key].hp)}}%;')
               span.meter-text
-                i.icon-heart
+                span.glyphicon.glyphicon-heart
                 | {{group.quest.hp | number:0}} / {{Content.quests[group.quest.key].hp}}
             .hero-stats
               .meter.health(title=env.t('bossHP'))
                 .bar(style='width: {{Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp)}}%;')
                 span.meter-text
-                  i.icon-heart
+                  span.glyphicon.glyphicon-heart
                   | {{group.quest.progress.hp | number:0}} / {{Content.quests[group.quest.key].boss.hp}}
 
           div(ng-if='Content.quests[group.quest.key].collect')
@@ -124,7 +124,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild
               // allow leaders to ban members
               div(ng-show='group.leader == user.id && user.id!=member._id')
                 a(ng-click='removeMember(group, member, true)')
-                  i.icon-ban-circle(tooltip=env.t('banTip'))
+                  span.glyphicon.glyphicon-ban-circle(tooltip=env.t('banTip'))
               a
                 span(ng-class='{"badge badge-info": group.leader==member._id}', ng-click='clickMember(member._id, true)')
                   | {{member.profile.name}}
@@ -141,7 +141,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild
               // allow leaders to ban members
               div(ng-show='group.leader == user.id')
                 a(ng-click='removeMember(group, invite, false)')
-                  i.icon-ban-circle(tooltip=env.t('banTip'))
+                  span.glyphicon.glyphicon-ban-circle(tooltip=env.t('banTip'))
               a
                 span(ng-click='clickMember(invite._id, true)')
                   | {{invite.profile.name}}
diff --git a/views/options/social/hall.jade b/views/options/social/hall.jade
index cfda892f3e..780c64dd65 100644
--- a/views/options/social/hall.jade
+++ b/views/options/social/hall.jade
@@ -70,7 +70,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html')
         span(ng-if='hero.contributor.admin',popover=env.t('gamemaster'),popover-trigger='mouseenter',popover-placement='right')
           a.label(class='label-contributor-{{hero.contributor.level}}', ng-class='{"label-npc": hero.backer.npc}', ng-click='clickMember(hero._id, true)')
             | {{hero.profile.name}}&nbsp;
-            i.icon-star.icon-white
+            span.glyphicon.glyphicon-star.icon-white
         span(ng-if='!hero.contributor.admin')
           a.label(class='label-contributor-{{hero.contributor.level}}', ng-class='{"label-npc": hero.backer.npc}', ng-click='clickMember(hero._id, true)') {{hero.profile.name}}
       td(ng-if='user.contributor.admin') {{hero._id}}
diff --git a/views/options/social/index.jade b/views/options/social/index.jade
index ab38723f3b..4fbb2a03b0 100644
--- a/views/options/social/index.jade
+++ b/views/options/social/index.jade
@@ -40,10 +40,10 @@ script(type='text/ng-template', id='partials/options.social.guilds.public.html')
           li
             // join / leave
             a.btn.btn-small.btn-danger(ng-show='group._isMember', ng-click='clickLeave(group, $event)')
-              i.icon-ban-circle
+              span.glyphicon.glyphicon-ban-circle
               =env.t('leave')
             a.btn.btn-small.btn-success(ng-hide='group._isMember', ng-click='join(group)')
-              i.icon-ok
+              span.glyphicon.glyphicon-ok
               =env.t('join')
         h4 {{group.name}}
         p {{group.description}}
@@ -74,7 +74,7 @@ script(type='text/ng-template', id='partials/options.social.html')
   ul.nav.nav-tabs
     li(ng-class="{ active: $state.includes('options.social.tavern') }")
       a(ui-sref='options.social.tavern')
-        i.icon-eye-close
+        span.glyphicon.glyphicon-eye-close
         =env.t('tavern')
     li(ng-class="{ active: $state.includes('options.social.party') }")
       a(ui-sref='options.social.party')
@@ -84,11 +84,11 @@ script(type='text/ng-template', id='partials/options.social.html')
         =env.t('guilds')
     li(ng-class="{ active: $state.includes('options.social.challenges') }")
       a(ui-sref='options.social.challenges')
-        i.icon-bullhorn
+        span.glyphicon.glyphicon-bullhorn
         =env.t('challenges')
     li(ng-class="{ active: $state.includes('options.social.hall') }")
       a(ui-sref='options.social.hall')
-        i.icon-flag
+        span.glyphicon.glyphicon-flag
         =env.t('hall')
 
   .tab-content
diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade
index 5491806c35..6acd65c1a8 100644
--- a/views/shared/header/avatar.jade
+++ b/views/shared/header/avatar.jade
@@ -44,7 +44,7 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(
     // FIXME handle @minimal, this might have to be a directive
     span.current-pet(class='Pet-{{profile.items.currentPet}}', ng-show='profile.items.currentPet && !minimal')
   .avatar-level(ng-class='userLevelStyle(profile,"label")')
-    i.icon-circle-arrow-up.icon-white(ng-show='profile.stats.buffs.str || profile.stats.buffs.per || profile.stats.buffs.con || profile.stats.buffs.int || profile.stats.buffs.stealth', tooltip=env.t('buffed'), style='margin-right:5px;')
+    span.glyphicon.glyphicon-circle-arrow-up.icon-white(ng-show='profile.stats.buffs.str || profile.stats.buffs.per || profile.stats.buffs.con || profile.stats.buffs.int || profile.stats.buffs.stealth', tooltip=env.t('buffed'), style='margin-right:5px;')
     =env.t('lvl') 
     | {{profile.stats.lvl}}
-    i.icon-plus-sign.icon-white(ng-show='profile.achievements.rebirths', tooltip=env.t('reborn') + '{{profile.achievements.rebirthLevel}}', style='margin-left:5px')
+    span.glyphicon.glyphicon-plus-sign.icon-white(ng-show='profile.achievements.rebirths', tooltip=env.t('reborn') + '{{profile.achievements.rebirthLevel}}', style='margin-left:5px')
diff --git a/views/shared/header/header.jade b/views/shared/header/header.jade
index 63ea79962a..a43113558f 100644
--- a/views/shared/header/header.jade
+++ b/views/shared/header/header.jade
@@ -13,21 +13,21 @@
       .meter.health(title=env.t('health'))
         .bar(style='width: {{Shared.percent(user.stats.hp, 50)}}%;')
         span.meter-text
-          i.icon-heart
+          span.glyphicon.glyphicon-heart
           | {{Math.ceil(user.stats.hp)}} / 50
       .meter.experience(title=env.t('experience'))
         .bar(style='width: {{Shared.percent(user.stats.exp,Shared.tnl(user.stats.lvl))}}%;')
         span.meter-text
-          i.icon-star
+          span.glyphicon.glyphicon-star
           | {{Math.floor(user.stats.exp)}} / {{Shared.tnl(user.stats.lvl) | number:0}}
           // FIXME doesn't look great here, but the "Experience" CSS title rollover covers it where it was before
           span(ng-show='user.history.exp')
             a(ng-click='toggleChart("exp")', tooltip=env.t('progress'))
-              i.icon-signal
+              span.glyphicon.glyphicon-signal
       .meter.mana(title='Mana', ng-if='user.flags.classSelected && !user.preferences.disableClasses')
         .bar(style='width: {{user.stats.mp / user._statsComputed.maxMP * 100}}%;')
         span.meter-text
-          i.icon-fire
+          span.glyphicon.glyphicon-fire
           | {{Math.floor(user.stats.mp)}} / {{user._statsComputed.maxMP}}
 
     // party
diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade
index 6933ffbe98..4810f0c69b 100644
--- a/views/shared/header/menu.jade
+++ b/views/shared/header/menu.jade
@@ -7,30 +7,30 @@
         li
           a.task-action-btn.tile.solid
             span(ng-show='$state.includes("options")', ui-sref='tasks')
-              i.icon-ok
+              span.glyphicon.glyphicon-ok
               =env.t('tasks')
             span(ng-show='$state.includes("tasks")', ui-sref='options')
-              i.icon.icon-wrench
+              span.glyphicon.glyphicon.icon-wrench
               =env.t('options')
         li 
           a.task-action-btn.tile.solid(href="http://habitrpg.wikia.com/wiki/FAQ", target='_blank')
-            i.icon.icon-book
+            span.glyphicon.glyphicon.icon-book
             =env.t('FAQ')
         li 
           a.task-action-btn.tile.solid(href="https://vimeo.com/57654086", target='_blank')
-            i.icon.icon-film
+            span.glyphicon.glyphicon.icon-film
             =env.t('tutorials')
         li
           a.task-action-btn.tile.solid(ng-click='User.sync()')
-            i.icon.icon-refresh
+            span.glyphicon.glyphicon.icon-refresh
             =env.t('sync')
         li
           a.task-action-btn.tile.solid(ng-click='logout()')
-            i.icon-share-alt
+            span.glyphicon.glyphicon-share-alt
             =env.t('logout')
     // party invitation notification
     a(ng-show='user.party.invitation', style='cursor: pointer;', x-bind='click:gotoPartyChat')
-      i.icon-user
+      span.glyphicon.glyphicon-user
     // party chat notification
     a(ng-show='newChatMessages(_party.chat,user.party.lastMessageSeen)', style='cursor: pointer;', x-bind='click:gotoPartyChat')
-      i.icon-comment(tooltip=env.t('partyNotification'))
+      span.glyphicon.glyphicon-comment(tooltip=env.t('partyNotification'))
diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade
index ea9a921c01..30b092e03d 100644
--- a/views/shared/profiles/stats.jade
+++ b/views/shared/profiles/stats.jade
@@ -29,35 +29,35 @@ h4=env.t('attributes')
 table.table.table-striped
   tr(ng-repeat='(k,v) in {str:"Strength (STR)",int:"Intelligence (INT)",con:"Constitution (CON)",per:"Perception (PER)"}')
     td
-      i.icon-question-sign(ng-show='k=="str"', popover-title=env.t('strength'), popover-placement='right', popover=env.t('strengthText'), popover-trigger='mouseenter', style='margin-right:3px')
-      i.icon-question-sign(ng-show='k=="con"', popover-title=env.t('constitution'), popover-placement='right', popover=env.t('conText') popover-trigger='mouseenter', style='margin-right:3px')
-      i.icon-question-sign(ng-show='k=="per"', popover-title=env.t('perception'), popover-placement='right', popover=env.t('perText'), popover-trigger='mouseenter', style='margin-right:3px')
-      i.icon-question-sign(ng-show='k=="int"', popover-title=env.t('intelligence'), popover-placement='right', popover=env.t('intText'), popover-trigger='mouseenter', style='margin-right:3px')
+      span.glyphicon.glyphicon-question-sign(ng-show='k=="str"', popover-title=env.t('strength'), popover-placement='right', popover=env.t('strengthText'), popover-trigger='mouseenter', style='margin-right:3px')
+      span.glyphicon.glyphicon-question-sign(ng-show='k=="con"', popover-title=env.t('constitution'), popover-placement='right', popover=env.t('conText') popover-trigger='mouseenter', style='margin-right:3px')
+      span.glyphicon.glyphicon-question-sign(ng-show='k=="per"', popover-title=env.t('perception'), popover-placement='right', popover=env.t('perText'), popover-trigger='mouseenter', style='margin-right:3px')
+      span.glyphicon.glyphicon-question-sign(ng-show='k=="int"', popover-title=env.t('intelligence'), popover-placement='right', popover=env.t('intText'), popover-trigger='mouseenter', style='margin-right:3px')
       strong {{v}}: {{profile._statsComputed[k]}}
     td
       ul(style='list-style-type:none')
         li(ng-show='profile.stats.lvl > 1')
-          i.icon-question-sign(popover-title=env.t('levelBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('levelBonusText'))
+          span.glyphicon.glyphicon-question-sign(popover-title=env.t('levelBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('levelBonusText'))
           | 
           =env.t('level')
           |: {{(profile.stats.lvl - 1) / 2}}&nbsp;
         li(ng-show='Content.gear.flat[profile.items.gear.equipped.weapon][k] + Content.gear.flat[profile.items.gear.equipped.armor][k] + Content.gear.flat[profile.items.gear.equipped.head][k] + Content.gear.flat[profile.items.gear.equipped.shield][k] > 0')
-          i.icon-question-sign(popover-title=env.t('equipment'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('equipmentBonusText'))
+          span.glyphicon.glyphicon-question-sign(popover-title=env.t('equipment'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('equipmentBonusText'))
           | 
           =env.t('equipment')
           |: {{Content.gear.flat[profile.items.gear.equipped.weapon][k] + Content.gear.flat[profile.items.gear.equipped.armor][k] + Content.gear.flat[profile.items.gear.equipped.head][k] + Content.gear.flat[profile.items.gear.equipped.shield][k] || 0}}&nbsp;
         li(ng-show='profile._statsComputed[k] - profile.stats.buffs[k] - ((profile.stats.lvl - 1) / 2) - Content.gear.flat[profile.items.gear.equipped.weapon][k] - Content.gear.flat[profile.items.gear.equipped.armor][k] - Content.gear.flat[profile.items.gear.equipped.head][k] - Content.gear.flat[profile.items.gear.equipped.shield][k] - profile.stats[k] > 0')
-          i.icon-question-sign(popover-title=env.t('classBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('classBonusText'))
+          span.glyphicon.glyphicon-question-sign(popover-title=env.t('classBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('classBonusText'))
           | 
           =env.t('classEquipBonus')
           |: {{profile._statsComputed[k] - profile.stats.buffs[k] - ((profile.stats.lvl - 1) / 2) - Content.gear.flat[profile.items.gear.equipped.weapon][k] - Content.gear.flat[profile.items.gear.equipped.armor][k] - Content.gear.flat[profile.items.gear.equipped.head][k] - Content.gear.flat[profile.items.gear.equipped.shield][k] - profile.stats[k]}}&nbsp;
         li(ng-show='profile.stats[k] > 0')
-          i.icon-question-sign(popover-title=env.t('allocatedPoints'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('allocatedPointsText'))
+          span.glyphicon.glyphicon-question-sign(popover-title=env.t('allocatedPoints'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('allocatedPointsText'))
           | 
           =env.t('allocated')
           |: {{profile.stats[k] || 0}}&nbsp;
         li(ng-show='profile.stats.buffs[k] > 0')
-          i.icon-question-sign(popover-title=env.t('buffs'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('buffsText'))
+          span.glyphicon.glyphicon-question-sign(popover-title=env.t('buffs'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('buffsText'))
           | 
           =env.t('buffs')
           |: {{profile.stats.buffs[k] || 0}}&nbsp;
@@ -65,13 +65,13 @@ table.table.table-striped
     td
       strong=env.t('stealth')
         |: {{profile.stats.buffs.stealth}}&nbsp;
-        i.icon-question-sign(popover-title=env.t('stealth'), popover-trigger='mouseenter', popover-placement='right', popover=env.t('stealthNewDay'))
+        span.glyphicon.glyphicon-question-sign(popover-title=env.t('stealth'), popover-trigger='mouseenter', popover-placement='right', popover=env.t('stealthNewDay'))
     td
   tr(ng-if='profile.stats.buffs.streaks')
     td
       strong=env.t('streaksFrozen')
         | 
-        i.icon-question-sign(popover-title=env.t('streaksFrozen'), popover-trigger='mouseenter', popover-placement='right', popover=env.t('streaksFrozenText'))
+        span.glyphicon.glyphicon-question-sign(popover-title=env.t('streaksFrozen'), popover-trigger='mouseenter', popover-placement='right', popover=env.t('streaksFrozenText'))
     td
 
 h4(ng-show='user.flags.dropsEnabled')=env.t('pets')
diff --git a/views/shared/tasks/lists.jade b/views/shared/tasks/lists.jade
index bd50b3042a..752cb4b9cf 100644
--- a/views/shared/tasks/lists.jade
+++ b/views/shared/tasks/lists.jade
@@ -9,10 +9,10 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
         // Todos export/graph options
         span.option-box.pull-right(bo-if='main && list.type=="todo"')
           a.option-action(ng-show='obj.history.todos', ng-click='toggleChart("todos")', tooltip=env.t('progress'))
-            i.icon-signal
+            span.glyphicon.glyphicon-signal
           //a.option-action(ng-href='/v1/users/{{user.id}}/calendar.ics?apiToken={{user.apiToken}}', tooltip='iCal')
           a.option-action(ng-click='notPorted()', tooltip='iCal', ng-show='false')
-            i.icon-calendar
+            span.glyphicon.glyphicon-calendar
           // <a href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}" rel=tooltip title="Google Calendar"><i class=icon-calendar></i></a>
 
         // Gold & Gems
@@ -47,7 +47,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
             // right-hand side control buttons
             .task-meta-controls
               span.task-notes
-                i.icon-comment
+                span.glyphicon.glyphicon-comment
             //left-hand size commands
             .task-controls
               a.money.btn-buy.item-btn(ng-click='buy(item)')
@@ -62,7 +62,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
           li.task.reward-item(ng-if='user.items.special.snowball>0',popover-trigger='mouseenter', popover-placement='top', popover='{{Content.spells.special.snowball.notes}}')
             .task-meta-controls
               span.task-notes
-                i.icon-comment
+                span.glyphicon.glyphicon-comment
             //left-hand size commands
             .task-controls
               a.money.btn-buy.item-btn(ng-click='castStart(Content.spells.special.snowball)')
@@ -73,7 +73,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
           li.task.reward-item(ng-if='user.stats.buffs.snowball',popover-trigger='mouseenter', popover-placement='top', popover='{{Content.spells.special.salt.notes}}')
             .task-meta-controls
               span.task-notes
-                i.icon-comment
+                span.glyphicon.glyphicon-comment
             //left-hand size commands
             .task-controls
               a.money.btn-buy.item-btn(ng-click='castStart(Content.spells.special.salt)')
@@ -88,7 +88,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
           li.task.reward-item(ng-repeat='(k,spell) in Content.spells[user.stats.class]', ng-if='user.stats.lvl >= spell.lvl',popover-trigger='mouseenter', popover-placement='top', popover='{{spell.notes}}')
             .task-meta-controls
               span.task-notes
-                i.icon-comment
+                span.glyphicon.glyphicon-comment
             //left-hand size commands
             .task-controls
               a.money.btn-buy.item-btn(ng-click='castStart(spell)')
@@ -105,7 +105,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
         div(bo-if='main && !user.purchased.ads && !user.purchased.plan.customerId && list.type!="reward"')
           span.pull-right
             a(ui-sref='options.settings.subscription', popover=env.t('removeAds'), popover-trigger='mouseenter')
-              i.icon-remove
+              span.glyphicon.glyphicon-remove
           // Habit3
           ins.adsbygoogle(ng-init='initAds()', style='display: inline-block; width: 234px; height: 60px;', data-ad-client='ca-pub-3242350243827794', data-ad-slot='9529624576')
 
diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade
index 1546e08faa..5ef7d8b3a5 100644
--- a/views/shared/tasks/task.jade
+++ b/views/shared/tasks/task.jade
@@ -8,39 +8,39 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s
     // Streak
     span(ng-show='task.streak') {{task.streak}}
       span(tooltip=env.t('streakCounter'))
-        i.icon-forward
+        span.glyphicon.glyphicon-forward
 
     // Icons only available if you own the tasks (aka, hidden from challenge stats)
     span(ng-if='!obj._locked')
       a.badge(ng-if='task.checklist[0]', ng-class='{"badge-success":checklistCompletion(task.checklist) == task.checklist.length}', ng-click='collapseChecklist(task)', style='margin:1px')
         {{checklistCompletion(task.checklist)}}/{{task.checklist.length}}
 
-      i.icon-tags(tooltip='{{appliedTags(user.tags, task.tags)}}', ng-hide='Shared.noTags(task.tags)')
+      span.glyphicon.glyphicon-tags(tooltip='{{appliedTags(user.tags, task.tags)}}', ng-hide='Shared.noTags(task.tags)')
       // edit
       a(ng-hide='task._editing', ng-click='editTask(task)', tooltip=env.t('edit'))
-        i.icon-pencil(ng-hide='task._editing')
+        span.glyphicon.glyphicon-pencil(ng-hide='task._editing')
       // cancel
       a(ng-hide='!task._editing', ng-click='editTask(task)', tooltip=env.t('cancel'))
-        i.icon-remove(ng-hide='!task._editing')
+        span.glyphicon.glyphicon-remove(ng-hide='!task._editing')
       // save
       a(ng-hide='!task._editing', ng-click='editTask(task);saveTask(task)', tooltip=env.t('save'))
-        i.icon-ok(ng-hide='!task._editing')
+        span.glyphicon.glyphicon-ok(ng-hide='!task._editing')
       //challenges
       span(ng-if='task.challenge.id')
         span(ng-if='task.challenge.broken')
-          i.icon-bullhorn(style='background-color:red;', ng-click='task._editing = true', tooltip=env.t('brokenChaLink') tooltip-placement='right')
+          span.glyphicon.glyphicon-bullhorn(style='background-color:red;', ng-click='task._editing = true', tooltip=env.t('brokenChaLink') tooltip-placement='right')
         span(ng-if='!task.challenge.broken')
-          i.icon-bullhorn(tooltip=env.t('challenge'))
+          span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge'))
       // delete
       a(ng-if='!task.challenge.id', ng-click='removeTask(obj[list.type+"s"], $index)', tooltip=env.t('delete'))
-        i.icon-trash
+        span.glyphicon.glyphicon-trash
 
     // chart
     a(ng-show='task.history', ng-click='toggleChart(obj._id+task.id, task)', tooltip=env.t('progress'))
-      i.icon-signal
+      span.glyphicon.glyphicon-signal
     // notes
     span.task-notes(ng-show='task.notes && !task._editing')
-      i.icon-comment
+      span.glyphicon.glyphicon-comment
 
   // left-hand side checkbox
   .task-controls.task-primary
@@ -110,18 +110,18 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s
       // Checklists
       div(ng-if='!$state.includes("options.social.challenges")')
         a.btn.btn-small(ng-if='!task.checklist[0] && (task.type=="daily" || task.type=="todo")',ng-click='addChecklist(task)')
-          i.icon-tasks
+          span.glyphicon.glyphicon-tasks
           =env.t('addChecklist')
         form.checklist-form(ng-if='task.checklist')
           fieldset.option-group.task-checklist(ng-if='!$state.includes("options.social.challenges")')
             legend.option-title
               =env.t('checklist')
               | &nbsp;
-              i.icon.icon-question-sign(popover=env.t('checklistText'),popover-trigger='mouseenter',popover-placement='bottom')
+              span.glyphicon.glyphicon.icon-question-sign(popover=env.t('checklistText'),popover-trigger='mouseenter',popover-placement='bottom')
             ul.unstyled
               li(ng-repeat='item in task.checklist')
                 a.pull-right.checklist-icons(ng-click='removeChecklistItem(task,$event,$index,true)')
-                  i.icon-trash(tooltip=env.t('delete'))
+                  span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))
                 input(type='checkbox',ng-model='item.completed',ng-change='saveTask(task,true)')
                 input.inline-edit(type='text',ng-model='item.text',ui-keydown="{'8 46':'removeChecklistItem(task,$event,$index)'}",ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}")//-,ng-blur='saveTask(task,true)')
 
@@ -183,7 +183,7 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s
           fieldset.option-group.advanced-option(ng-class="{visuallyhidden: task._advanced}")
             legend.option-title
               a.priority-multiplier-help(href='https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17', target='_blank', popover-title=env.t('difficultyHelpTitle'), popover-trigger='mouseenter', popover=env.t('difficultyHelpContent'))
-                i.icon-question-sign
+                span.glyphicon.glyphicon-question-sign
               =env.t('difficulty')
             .task-controls.tile-group.priority-multiplier
               button.task-action-btn.tile(type='button', ng-class='{active: task.priority==1 || !task.priority}', ng-click='task.challenge.id || (task.priority=1)')=env.t('easy')
@@ -202,7 +202,7 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s
                 button.task-action-btn.tile(type='button', ng-class='{active: task.attribute=="con"}', ng-click='task.attribute="con"')=env.t('social')
                 button.task-action-btn.tile(type='button', ng-class='{active: task.attribute=="per"}', ng-click='task.attribute="per"', popover=env.t('otherExamples'), popover-trigger='mouseenter', popover-placement='top')=env.t('other')
                   |&nbsp;
-                  i.icon-question-sign
+                  span.glyphicon.glyphicon-question-sign
 
         button.task-action-btn.tile.spacious(type='submit')=env.t('saveAndClose')