diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 13f8083..528e2d9 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -442,8 +442,8 @@ define(function(require){
 
 							templateDevice.find('.restriction-matcher-sign').hide();
 							if(matchedLine.find('.restrictions-switch').prop('checked')) {
-								matchedSign.removeClass('monster-red icon-remove')
-										   .addClass('monster-green icon-ok')
+								matchedSign.removeClass('monster-red fa-times')
+										   .addClass('monster-green fa-check')
 										   .css('display', 'inline-block');
 
 								matchedMsg.removeClass('red-box')
@@ -454,8 +454,8 @@ define(function(require){
 										  	monster.template(self, '!' + self.i18n.active().devices.popupSettings.restrictions.matcher.allowMessage, { phoneNumber: monster.util.formatPhoneNumber(number) })
 										  );
 							} else {
-								matchedSign.removeClass('monster-green icon-ok')
-										   .addClass('monster-red icon-remove')
+								matchedSign.removeClass('monster-green fa-check')
+										   .addClass('monster-red fa-times')
 										   .css('display', 'inline-block');
 
 								matchedMsg.removeClass('green-box')
diff --git a/submodules/strategy/strategy.css b/submodules/strategy/strategy.css
index 5f97a73..6857667 100644
--- a/submodules/strategy/strategy.css
+++ b/submodules/strategy/strategy.css
@@ -503,7 +503,7 @@
 	/*display: none;*/
 }
 
-#strategy_container .element-container.helper .icon-info-sign {
+#strategy_container .element-container.helper .fa-info-circle {
 	float: left;
 	margin-right: 10px;
 }
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index 00c0cfd..16d1986 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -1800,7 +1800,7 @@ define(function(require){
 						group.groupIcon = 'icon-telicon-voip-phone';
 						break;
 					case 'ring_group':
-						group.groupIcon = 'icon-group';
+						group.groupIcon = 'fa fa-users';
 						break;
 					case 'voicemail':
 						group.groupIcon = 'icon-telicon-voicemail';
diff --git a/views/app.html b/views/app.html
index 26f27bf..b91b3c5 100644
--- a/views/app.html
+++ b/views/app.html
@@ -24,7 +24,7 @@
 
 			<div id="groups" class="category">
 				<div class="title">
-					<i class="icon-group"></i>
+					<i class="fa fa-users"></i>
 					<span class="title-text visible-desktop">{{ i18n.menuTitles.groups }}</span>
 				</div>
 			</div>
diff --git a/views/callLogs-cdrsList.html b/views/callLogs-cdrsList.html
index 2ad917b..4cfc35e 100644
--- a/views/callLogs-cdrsList.html
+++ b/views/callLogs-cdrsList.html
@@ -42,7 +42,7 @@
 		</div>
 		<div class="grid-cell details">
 			<div class="sub-cell single-cell">
-				<i class="icon-cog icon-large"></i>
+				<i class="icon-cog fa-lg"></i>
 			</div>
 		</div>
 		<div class="grid-cell report">
@@ -88,7 +88,7 @@
 		</div>
 		<div class="grid-cell details">
 			<div class="sub-cell single-cell">
-				<i class="icon-cog icon-large"></i>
+				<i class="icon-cog fa-lg"></i>
 			</div>
 		</div>
 		<div class="grid-cell report">
diff --git a/views/callLogs-layout.html b/views/callLogs-layout.html
index 662ccd9..2398e5f 100644
--- a/views/callLogs-layout.html
+++ b/views/callLogs-layout.html
@@ -37,7 +37,7 @@
 				</div>
 			{{/if}}
 
-			<a href="#" role="button" class="monster-link download-csv"><i class="icon-download-alt monster-green"></i>{{i18n.download}}</a>
+			<a href="#" role="button" class="monster-link download-csv"><i class="fa fa-download monster-green"></i>{{i18n.download}}</a>
 		</div>
 	</div>
 
@@ -95,6 +95,6 @@
 	</div>
 	<div class="call-logs-loader">
 		<div class="loader-message">{{i18n.callLogs.loaderMessage}}</div>
-		<div class="loading-message"><i class="icon-spinner icon-large"></i><span>{{i18n.callLogs.loadingMessage}}</span></div>
+		<div class="loading-message"><i class="icon-spinner fa-lg"></i><span>{{i18n.callLogs.loadingMessage}}</span></div>
 	</div>
 </div>
diff --git a/views/devices-ata.html b/views/devices-ata.html
index cb35a6e..330fb00 100644
--- a/views/devices-ata.html
+++ b/views/devices-ata.html
@@ -22,7 +22,7 @@
 				</a>
 				<ul class="dropdown-menu pull-right">
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="icon-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="icon-ban-circle"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
+					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="icon-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
 				</ul>
 			</li>
@@ -67,7 +67,7 @@
 				</div>
 
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.devices.popupSettings.dragAndDrop }}
 				</div>
 
@@ -77,7 +77,7 @@
 			<div class="tabs-section clearfix" data-section="restrictions">
 				<div class="restrictions-container">
 					<div class="restriction-matcher-div">
-						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
 						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
@@ -89,7 +89,7 @@
 						<div class="control-group restriction-line{{#if this.disabled}} disabled{{/if}}" data-restriction="{{@key}}">
 							<label class="control-label">{{this.friendly_name}}
 								{{#if this.help}}
-									<i class="help-popover icon-question-sign" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
+									<i class="help-popover fa fa-question-circle" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
 								{{/if}}
 							</label>
 							<div class="controls">
@@ -98,7 +98,7 @@
 									<input class="restrictions-switch" type="checkbox" name="call_restriction.{{@key}}.action" data-on="{{../i18n.devices.popupSettings.restrictions.allow}}" data-off="{{../i18n.devices.popupSettings.restrictions.deny}}" {{#compare this.action '===' 'inherit'}}{{#unless this.disabled}} checked{{/unless}}{{/compare}}{{#if this.disabled}} disabled{{/if}}></input>
 								{{/monsterSwitch}}
 								</div>
-								<i class="restriction-matcher-sign icon-large icon-ok monster-green"></i>
+								<i class="restriction-matcher-sign fa-lg fa fa-check monster-green"></i>
 							</div>
 						</div>
 					{{/each}}
@@ -134,7 +134,7 @@
 
 	<div class="actions clearfix">
 		{{#if id}}
-			<a id="delete_device" class="monster-link"><i class="icon-trash monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
+			<a id="delete_device" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
 		{{/if}}
 
 		<div class="pull-right">
diff --git a/views/devices-cellphone.html b/views/devices-cellphone.html
index c256aec..7148aeb 100644
--- a/views/devices-cellphone.html
+++ b/views/devices-cellphone.html
@@ -75,7 +75,7 @@
 
 	<div class="actions clearfix">
 		{{#if id}}
-			<a id="delete_device" class="monster-link"><i class="icon-trash monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
+			<a id="delete_device" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
 		{{/if}}
 
 		<div class="pull-right">
diff --git a/views/devices-fax.html b/views/devices-fax.html
index e7b5f1d..33b07b6 100644
--- a/views/devices-fax.html
+++ b/views/devices-fax.html
@@ -22,7 +22,7 @@
 				</a>
 				<ul class="dropdown-menu pull-right">
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="icon-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="icon-ban-circle"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
+					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="icon-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
 				</ul>
 			</li>
@@ -78,7 +78,7 @@
 				</div>
 
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.devices.popupSettings.dragAndDrop }}
 				</div>
 
@@ -88,7 +88,7 @@
 			<div class="tabs-section clearfix" data-section="restrictions">
 				<div class="restrictions-container">
 					<div class="restriction-matcher-div">
-						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
 						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
@@ -100,7 +100,7 @@
 						<div class="control-group restriction-line{{#if this.disabled}} disabled{{/if}}" data-restriction="{{@key}}">
 							<label class="control-label">{{this.friendly_name}}
 								{{#if this.help}}
-									<i class="help-popover icon-question-sign" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
+									<i class="help-popover fa fa-question-circle" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
 								{{/if}}
 							</label>
 							<div class="controls">
@@ -109,7 +109,7 @@
 									<input class="restrictions-switch" type="checkbox" name="call_restriction.{{@key}}.action" data-on="{{../i18n.devices.popupSettings.restrictions.allow}}" data-off="{{../i18n.devices.popupSettings.restrictions.deny}}" {{#compare this.action '===' 'inherit'}}{{#unless this.disabled}} checked{{/unless}}{{/compare}}{{#if this.disabled}} disabled{{/if}}></input>
 								{{/monsterSwitch}}
 								</div>
-								<i class="restriction-matcher-sign icon-large icon-ok monster-green"></i>
+								<i class="restriction-matcher-sign fa-lg fa fa-check monster-green"></i>
 							</div>
 						</div>
 					{{/each}}
@@ -145,7 +145,7 @@
 
 	<div class="actions clearfix">
 		{{#if id}}
-			<a id="delete_device" class="monster-link"><i class="icon-trash monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
+			<a id="delete_device" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
 		{{/if}}
 
 		<div class="pull-right">
diff --git a/views/devices-landline.html b/views/devices-landline.html
index 586f3ed..5b5eb5e 100644
--- a/views/devices-landline.html
+++ b/views/devices-landline.html
@@ -81,7 +81,7 @@
 
 	<div class="actions clearfix">
 		{{#if id}}
-			<a id="delete_device" class="monster-link"><i class="icon-trash monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
+			<a id="delete_device" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
 		{{/if}}
 
 		<div class="pull-right">
diff --git a/views/devices-layout.html b/views/devices-layout.html
index 6de3a51..8f65f11 100644
--- a/views/devices-layout.html
+++ b/views/devices-layout.html
@@ -7,7 +7,7 @@
 
 		<div class="dropdown">
 			<a href="#" class="add-device monster-link dropdown-toggle" data-toggle="dropdown">
-				<i class="icon-plus-sign"></i>
+				<i class="fa fa-plus-circle"></i>
 				{{i18n.devices.add }}
 			</a>
 			<ul class="dropdown-menu">
diff --git a/views/devices-mobile.html b/views/devices-mobile.html
index 51f68f4..55fbbdd 100644
--- a/views/devices-mobile.html
+++ b/views/devices-mobile.html
@@ -23,7 +23,7 @@
 				<ul class="dropdown-menu pull-right">
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="icon-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="icon-facetime-video"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="icon-ban-circle"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
+					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="icon-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="miscellaneous" href="javascript:void(0)"><i class="icon-cogs"></i>{{ i18n.devices.popupSettings.miscellaneous.menuTitle }}</a></li>
 				</ul>
@@ -76,7 +76,7 @@
 				</div>
 
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.devices.popupSettings.dragAndDrop }}
 				</div>
 
@@ -89,7 +89,7 @@
 					{{ i18n.devices.popupSettings.video.sectionTitle }}
 				</div>
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.devices.popupSettings.dragAndDrop }}
 				</div>
 				<div class="items-selector codec-selector" id="video_codec_selector">
@@ -99,7 +99,7 @@
 			<div class="tabs-section clearfix" data-section="restrictions">
 				<div class="restrictions-container">
 					<div class="restriction-matcher-div">
-						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
 						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
@@ -111,7 +111,7 @@
 						<div class="control-group restriction-line{{#if this.disabled}} disabled{{/if}}" data-restriction="{{@key}}">
 							<label class="control-label">{{this.friendly_name}}
 								{{#if this.help}}
-									<i class="help-popover icon-question-sign" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
+									<i class="help-popover fa fa-question-circle" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
 								{{/if}}
 							</label>
 							<div class="controls">
@@ -120,7 +120,7 @@
 									<input class="restrictions-switch" type="checkbox" name="call_restriction.{{@key}}.action" data-on="{{../i18n.devices.popupSettings.restrictions.allow}}" data-off="{{../i18n.devices.popupSettings.restrictions.deny}}" {{#compare this.action '===' 'inherit'}}{{#unless this.disabled}} checked{{/unless}}{{/compare}}{{#if this.disabled}} disabled{{/if}}></input>
 								{{/monsterSwitch}}
 								</div>
-								<i class="restriction-matcher-sign icon-large icon-ok monster-green"></i>
+								<i class="restriction-matcher-sign fa-lg fa fa-check monster-green"></i>
 							</div>
 						</div>
 					{{/each}}
@@ -162,7 +162,7 @@
 						{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }}
 							<input type="checkbox" name="ignore_completed_elsewhere" id="ignore_completed_elsewhere" {{#if ignore_completed_elsewhere }}checked{{/if}} />
 						{{/monsterCheckbox}}
-						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
 					</label>
 				</div>
 
@@ -190,7 +190,7 @@
 
 	<div class="actions clearfix">
 		{{#if id}}
-			<a id="delete_device" class="monster-link"><i class="icon-trash monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
+			<a id="delete_device" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
 		{{/if}}
 
 		<div class="pull-right">
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index a5ea034..6ed3a34 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -31,11 +31,11 @@
 					{{/if}}
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="icon-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="icon-facetime-video"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="icon-ban-circle"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
+					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="icon-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="miscellaneous" href="javascript:void(0)"><i class="icon-cogs"></i>{{ i18n.devices.popupSettings.miscellaneous.menuTitle }}</a></li>
 				{{#if provision.feature_keys}}
-					<li><a class="tabs-selector change-section" data-section="featureKeys" href="javascript:void(0);"><i class="icon-lightbulb"></i>{{ i18n.devices.popupSettings.featureKeys.menuTitle }}</a></li>
+					<li><a class="tabs-selector change-section" data-section="featureKeys" href="javascript:void(0);"><i class="fa fa-lightbulb-o"></i>{{ i18n.devices.popupSettings.featureKeys.menuTitle }}</a></li>
 				{{/if}}
 				</ul>
 			</li>
@@ -115,7 +115,7 @@
 				</div>
 
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.devices.popupSettings.dragAndDrop }}
 				</div>
 
@@ -127,7 +127,7 @@
 					{{ i18n.devices.popupSettings.video.sectionTitle }}
 				</div>
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.devices.popupSettings.dragAndDrop }}
 				</div>
 				<div class="items-selector codec-selector" id="video_codec_selector"></div>
@@ -136,7 +136,7 @@
 			<div class="tabs-section clearfix" data-section="restrictions">
 				<div class="restrictions-container">
 					<div class="restriction-matcher-div">
-						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
 						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
@@ -148,7 +148,7 @@
 						<div class="control-group restriction-line{{#if this.disabled}} disabled{{/if}}" data-restriction="{{@key}}">
 							<label class="control-label">{{this.friendly_name}}
 								{{#if this.help}}
-									<i class="help-popover icon-question-sign" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
+									<i class="help-popover fa fa-question-circle" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
 								{{/if}}
 							</label>
 							<div class="controls">
@@ -157,7 +157,7 @@
 									<input class="restrictions-switch" type="checkbox" name="call_restriction.{{@key}}.action" data-on="{{../i18n.devices.popupSettings.restrictions.allow}}" data-off="{{../i18n.devices.popupSettings.restrictions.deny}}" {{#compare this.action '===' 'inherit'}}{{#unless this.disabled}} checked{{/unless}}{{/compare}}{{#if this.disabled}} disabled{{/if}}></input>
 								{{/monsterSwitch}}
 								</div>
-								<i class="restriction-matcher-sign icon-large icon-ok monster-green"></i>
+								<i class="restriction-matcher-sign fa-lg fa fa-check monster-green"></i>
 							</div>
 						</div>
 					{{/each}}
@@ -205,7 +205,7 @@
 						{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }}
 							<input type="checkbox" name="ignore_completed_elsewhere" id="ignore_completed_elsewhere" {{#if ignore_completed_elsewhere }}checked{{/if}} />
 						{{/monsterCheckbox}}
-						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
 					</label>
 				</div>
 
@@ -235,7 +235,7 @@
 					{{ i18n.devices.popupSettings.featureKeys.menuTitle }}
 				</div>
 				<div class="type-info helper">
-					<a href="javascript:void(0);" data-toggle="collapse" data-target="#info_content"><i class="icon-question-sign"></i><span class="text">{{ i18n.devices.popupSettings.featureKeys.info.link.showInfo }}</span></a>
+					<a href="javascript:void(0);" data-toggle="collapse" data-target="#info_content"><i class="fa fa-question-circle"></i><span class="text">{{ i18n.devices.popupSettings.featureKeys.info.link.showInfo }}</span></a>
 					<div id="info_content" class="collapse">
 						{{#each extra.featureKeys.types}}
 							<p>{{#if info}}<strong>{{text}}</strong>: {{info}}{{/if}}</p>
@@ -293,7 +293,7 @@
 
 	<div class="actions clearfix">
 		{{#if id}}
-			<a id="delete_device" class="monster-link"><i class="icon-trash monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
+			<a id="delete_device" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
 		{{/if}}
 
 		<div class="pull-right">
diff --git a/views/devices-sip_uri.html b/views/devices-sip_uri.html
index 1c9b088..a81ff35 100644
--- a/views/devices-sip_uri.html
+++ b/views/devices-sip_uri.html
@@ -61,7 +61,7 @@
 
 	<div class="actions clearfix">
 		{{#if id}}
-			<a id="delete_device" class="monster-link"><i class="icon-trash monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
+			<a id="delete_device" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
 		{{/if}}
 
 		<div class="pull-right">
diff --git a/views/devices-smartphone.html b/views/devices-smartphone.html
index be9c850..40b827c 100644
--- a/views/devices-smartphone.html
+++ b/views/devices-smartphone.html
@@ -24,7 +24,7 @@
 					<li><a class="tabs-selector change-section" data-section="options" href="javascript:void(0)"><i class="icon-cogs"></i>{{ i18n.devices.popupSettings.options.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="icon-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="icon-facetime-video"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="icon-ban-circle"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
+					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="icon-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
 				</ul>
 			</li>
@@ -107,7 +107,7 @@
 				</div>
 
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.devices.popupSettings.dragAndDrop }}
 				</div>
 
@@ -119,7 +119,7 @@
 					{{ i18n.devices.popupSettings.video.sectionTitle }}
 				</div>
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.devices.popupSettings.dragAndDrop }}
 				</div>
 
@@ -129,7 +129,7 @@
 			<div class="tabs-section clearfix" data-section="restrictions">
 				<div class="restrictions-container">
 					<div class="restriction-matcher-div">
-						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
 						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
@@ -141,7 +141,7 @@
 						<div class="control-group restriction-line{{#if this.disabled}} disabled{{/if}}" data-restriction="{{@key}}">
 							<label class="control-label">{{this.friendly_name}}
 								{{#if this.help}}
-									<i class="help-popover icon-question-sign" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
+									<i class="help-popover fa fa-question-circle" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
 								{{/if}}
 							</label>
 							<div class="controls">
@@ -150,7 +150,7 @@
 									<input class="restrictions-switch" type="checkbox" name="call_restriction.{{@key}}.action" data-on="{{../i18n.devices.popupSettings.restrictions.allow}}" data-off="{{../i18n.devices.popupSettings.restrictions.deny}}" {{#compare this.action '===' 'inherit'}}{{#unless this.disabled}} checked{{/unless}}{{/compare}}{{#if this.disabled}} disabled{{/if}}></input>
 								{{/monsterSwitch}}
 								</div>
-								<i class="restriction-matcher-sign icon-large icon-ok monster-green"></i>
+								<i class="restriction-matcher-sign fa-lg fa fa-check monster-green"></i>
 							</div>
 						</div>
 					{{/each}}
@@ -186,7 +186,7 @@
 
 	<div class="actions clearfix">
 		{{#if id}}
-			<a id="delete_device" class="monster-link"><i class="icon-trash monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
+			<a id="delete_device" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
 		{{/if}}
 
 		<div class="pull-right">
diff --git a/views/devices-softphone.html b/views/devices-softphone.html
index 15d8798..86dcee0 100644
--- a/views/devices-softphone.html
+++ b/views/devices-softphone.html
@@ -23,7 +23,7 @@
 				<ul class="dropdown-menu pull-right">
 					<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="icon-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="icon-facetime-video"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
-					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="icon-ban-circle"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
+					<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="icon-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
 					<li><a class="tabs-selector change-section" data-section="miscellaneous" href="javascript:void(0)"><i class="icon-cogs"></i>{{ i18n.devices.popupSettings.miscellaneous.menuTitle }}</a></li>
 				</ul>
@@ -69,7 +69,7 @@
 				</div>
 
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.devices.popupSettings.dragAndDrop }}
 				</div>
 
@@ -82,7 +82,7 @@
 					{{ i18n.devices.popupSettings.video.sectionTitle }}
 				</div>
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.devices.popupSettings.dragAndDrop }}
 				</div>
 
@@ -93,7 +93,7 @@
 			<div class="tabs-section clearfix" data-section="restrictions">
 				<div class="restrictions-container">
 					<div class="restriction-matcher-div">
-						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
 						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
@@ -105,7 +105,7 @@
 						<div class="control-group restriction-line{{#if this.disabled}} disabled{{/if}}" data-restriction="{{@key}}">
 							<label class="control-label">{{this.friendly_name}}
 								{{#if this.help}}
-									<i class="help-popover icon-question-sign" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
+									<i class="help-popover fa fa-question-circle" data-original-title="{{this.help}}" data-placement="top" data-toggle="tooltip"></i>
 								{{/if}}
 							</label>
 							<div class="controls">
@@ -114,7 +114,7 @@
 									<input class="restrictions-switch" type="checkbox" name="call_restriction.{{@key}}.action" data-on="{{../i18n.devices.popupSettings.restrictions.allow}}" data-off="{{../i18n.devices.popupSettings.restrictions.deny}}" {{#compare this.action '===' 'inherit'}}{{#unless this.disabled}} checked{{/unless}}{{/compare}}{{#if this.disabled}} disabled{{/if}}></input>
 								{{/monsterSwitch}}
 								</div>
-								<i class="restriction-matcher-sign icon-large icon-ok monster-green"></i>
+								<i class="restriction-matcher-sign fa-lg fa fa-check monster-green"></i>
 							</div>
 						</div>
 					{{/each}}
@@ -162,7 +162,7 @@
 						{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }}
 							<input type="checkbox" name="ignore_completed_elsewhere" id="ignore_completed_elsewhere" {{#if ignore_completed_elsewhere }}checked{{/if}} />
 						{{/monsterCheckbox}}
-						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
 					</label>
 				</div>
 
@@ -190,7 +190,7 @@
 
 	<div class="actions clearfix">
 		{{#if id}}
-			<a id="delete_device" class="monster-link"><i class="icon-trash monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
+			<a id="delete_device" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.devices.deleteDevice }}</a>
 		{{/if}}
 
 		<div class="pull-right">
diff --git a/views/groups-feature-ringback.html b/views/groups-feature-ringback.html
index ac583d5..bacf593 100644
--- a/views/groups-feature-ringback.html
+++ b/views/groups-feature-ringback.html
@@ -26,8 +26,8 @@
 		</div>
 		<div class="upload-div">
 			<input type="file" class="upload-input" accept="audio/*">
-			<button type="button" class="btn btn-success upload-action upload-submit"><i class="icon-upload-alt"></i></button>
-			<button type="button" class="btn btn-danger upload-action upload-cancel"><i class="icon-remove"></i></button>
+			<button type="button" class="btn btn-success upload-action upload-submit"><i class="fa fa-upload"></i></button>
+			<button type="button" class="btn btn-danger upload-action upload-cancel"><i class="fa fa-times"></i></button>
 		</div>
 	</div>
 
diff --git a/views/groups-members.html b/views/groups-members.html
index bb2b08e..7e66cb9 100644
--- a/views/groups-members.html
+++ b/views/groups-members.html
@@ -6,7 +6,7 @@
 		<ul class="pull-left add-user-dropdown">
 			<li class="dropdown">
 				<a href="javascript:void(0);" class="dropdown-toggle monster-link" data-toggle="dropdown" data-target="#">
-					<i class="icon-plus-sign monster-green"></i>
+					<i class="fa fa-plus-circle monster-green"></i>
 					{{ i18n.users.add }}
 				</a>
 				<ul class="dropdown-menu" role="menu">
diff --git a/views/groups-name.html b/views/groups-name.html
index 9d2dfcf..df6a8f3 100644
--- a/views/groups-name.html
+++ b/views/groups-name.html
@@ -8,7 +8,7 @@
 		</div>
 	</form>
 	<div class="actions">
-		<a class="delete-group monster-link" href="javascript:void(0);"><i class="icon-trash monster-red"></i>{{ i18n.groups.delete }}</a>
+		<a class="delete-group monster-link" href="javascript:void(0);"><i class="fa fa-trash-o monster-red"></i>{{ i18n.groups.delete }}</a>
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
diff --git a/views/groups-newExtension.html b/views/groups-newExtension.html
index 84ff445..44bc581 100644
--- a/views/groups-newExtension.html
+++ b/views/groups-newExtension.html
@@ -2,6 +2,6 @@
     <div class="number">
 		{{ i18n.groups.addNewExtension }}
 		<input type="text" class="input-extension" value="{{recommendedExtension}}"></input>
-		<a class="cancel-extension-link monster-link"><i class="monster-red icon-remove"></i></a>
+		<a class="cancel-extension-link monster-link"><i class="monster-red fa fa-times"></i></a>
     </div>
 </div>
diff --git a/views/groups-numbers.html b/views/groups-numbers.html
index 8d82d60..69806aa 100644
--- a/views/groups-numbers.html
+++ b/views/groups-numbers.html
@@ -17,7 +17,7 @@
 											<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ ../../i18n.callerId }}</a></li>
 											<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ ../../i18n.e911 }}</a></li>
 										{{/unless}}
-											<li><a class="prepend-number" href="#"><i class="icon-file-text-alt"></i>{{ ../i18n.numberPrepend }}</a></li>
+											<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ ../i18n.numberPrepend }}</a></li>
 										</ul>
 									</li>
 								</ul>
@@ -25,7 +25,7 @@
 						</div>
 						<div class="features">
 						{{#compare this.state '===' 'port_in'}}
-							<i class="icon-warning-sign monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../../i18n.portIconHelp}}"></i>
+							<i class="fa fa-exclamation-triangle monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../../i18n.portIconHelp}}"></i>
 						{{/compare}}
 							{{#each viewFeatures}}
 								<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
@@ -54,11 +54,11 @@
 
 	<div class="actions">
 		<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
-			<i class="icon-plus monster-green icon-large"></i>{{ i18n.groups.addFromSpare }}
+			<i class="icon-plus monster-green fa-lg"></i>{{ i18n.groups.addFromSpare }}
 		</a>
 		<ul class="nav pull-left">
 			<li class="dropdown">
-				<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="icon-shopping-cart monster-green icon-large"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
+				<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="icon-shopping-cart monster-green fa-lg"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
 				<ul class="dropdown-menu" role="menu">
 					<li><a class="buy-link" data-type="regular" href="#">{{i18n.strategy.numberLinks.buy.regular}}</a></li>
 					<li><a class="buy-link" data-type="tollfree" href="#">{{i18n.strategy.numberLinks.buy.tollfree}}</a></li>
diff --git a/views/groups-numbersItemRow.html b/views/groups-numbersItemRow.html
index d460943..1992492 100644
--- a/views/groups-numbersItemRow.html
+++ b/views/groups-numbersItemRow.html
@@ -10,7 +10,7 @@
 							<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ i18n.callerId }}</a></li>
 							<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ i18n.e911 }}</a></li>
 						{{/unless}}
-							<li><a class="prepend-number" href="#"><i class="icon-file-text-alt"></i>{{ i18n.numberPrepend }}</a></li>
+							<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ i18n.numberPrepend }}</a></li>
 						</ul>
 					</li>
 				</ul>
@@ -18,7 +18,7 @@
 		</div>
 		<div class="features">
 		{{#compare number.state '===' 'port_in'}}
-				<i class="icon-warning-sign monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../i18n.portIconHelp}}"></i>
+				<i class="fa fa-exclamation-triangle monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../i18n.portIconHelp}}"></i>
 		{{/compare}}
 			{{#each number.viewFeatures}}
 				<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
diff --git a/views/myOffice-layout.html b/views/myOffice-layout.html
index 2b4b978..4e6e073 100644
--- a/views/myOffice-layout.html
+++ b/views/myOffice-layout.html
@@ -2,19 +2,19 @@
 	<div class="dashboard-header">
 		<div class="header-title">{{account.name}}</div>
 		<a href="#" class="header-link caller-id{{#compare mainNumbers.length "===" 0}} disabled{{/compare}}">
-			<div class="header-link-icon"><i class="monster-white icon-large icon-user"></i></div>
+			<div class="header-link-icon"><i class="monster-white fa-lg icon-user"></i></div>
 			<div class="header-link-title">{{i18n.myOffice.topBarLinks.callerID}}</div>
 		</a>
 		<a href="#" class="header-link music-on-hold">
-			<div class="header-link-icon"><i class="monster-white icon-large icon-music"></i></div>
+			<div class="header-link-icon"><i class="monster-white fa-lg icon-music"></i></div>
 			<div class="header-link-title">{{i18n.myOffice.topBarLinks.musicOnHold}}</div>
 		</a>
 		<!-- <a href="#" class="header-link call-recording">
-			<div class="header-link-icon"><i class="monster-white icon-large icon-microphone"></i></div>
+			<div class="header-link-icon"><i class="monster-white fa-lg icon-microphone"></i></div>
 			<div class="header-link-title">{{i18n.myOffice.topBarLinks.callRecording}}</div>
 		</a> -->
 		<a href="#" class="header-link strategy-hours link-box" data-category="strategy" data-subcategory="strategy-hours">
-			<div class="header-link-icon"><i class="monster-white icon-large icon-time"></i></div>
+			<div class="header-link-icon"><i class="fa fa-clock-o fa-lg monster-white"></i></div>
 			<div class="header-link-title">{{i18n.myOffice.topBarLinks.hours}}</div>
 		</a>
 	</div>
@@ -22,7 +22,7 @@
 	<div class="dashboard-content">
 		{{#if topMessage}}
 		<div class="dashboard-top-message {{topMessage.class}}">
-			<i class="icon-warning-sign"></i>{{topMessage.message}}<!-- {{i18n.myOffice.missingE911Message}} -->
+			<i class="fa fa-exclamation-triangle"></i>{{topMessage.message}}<!-- {{i18n.myOffice.missingE911Message}} -->
 		</div>
 		{{/if}}
 		<div class="dashboard-content-div dashboard-left-content">
@@ -33,7 +33,7 @@
 				</div>
 				<div class="left-section-content users-section-content">
 					{{#times totalUsers}}
-					<div class="users-element"><i class="icon-2x icon-male{{#compare this '<' ../totalChannels}} monster-blue{{/compare}}"></i></div>
+					<div class="users-element"><i class="fa-2x icon-male{{#compare this '<' ../totalChannels}} monster-blue{{/compare}}"></i></div>
 					{{/times}}
 				</div>
 			</div>
@@ -99,7 +99,7 @@
 				</div>
 				{{else}}
 				<div class="dashboard-warning-row main-number-row link-box" data-category="strategy" data-subcategory="main-number">
-					<i class="icon-warning-sign"></i>{{../i18n.myOffice.missingMainNumberMessage}}
+					<i class="fa fa-exclamation-triangle"></i>{{../i18n.myOffice.missingMainNumberMessage}}
 				</div>	
 				{{/if}}
 				<div class="dashboard-box-row conf-number-row link-box" data-category="strategy" data-subcategory="strategy-confnum">
diff --git a/views/myOffice-musicOnHoldPopup.html b/views/myOffice-musicOnHoldPopup.html
index d7befff..acc153d 100644
--- a/views/myOffice-musicOnHoldPopup.html
+++ b/views/myOffice-musicOnHoldPopup.html
@@ -26,8 +26,8 @@
 		</div>
 		<div class="upload-div">
 			<input type="file" class="upload-input" accept="audio/*">
-			<button type="button" class="btn btn-success upload-action upload-submit"><i class="icon-upload-alt"></i></button>
-			<button type="button" class="btn btn-danger upload-action upload-cancel"><i class="icon-remove"></i></button>
+			<button type="button" class="btn btn-success upload-action upload-submit"><i class="fa fa-upload"></i></button>
+			<button type="button" class="btn btn-danger upload-action upload-cancel"><i class="fa fa-times"></i></button>
 		</div>
 	</div>
 
diff --git a/views/strategy-calls.html b/views/strategy-calls.html
index a21f4de..cb0aa87 100644
--- a/views/strategy-calls.html
+++ b/views/strategy-calls.html
@@ -1,15 +1,15 @@
 <ul class="nav nav-tabs calls-tabs clearfix">
 	<li class="open-hours-tab active">
-		<a href="#strategy_calls_open_hours_tab"><i class="icon-sun"></i>{{i18n.strategy.calls.openHoursTitle}}</a>
+		<a href="#strategy_calls_open_hours_tab"><i class="fa fa-sun-o"></i>{{i18n.strategy.calls.openHoursTitle}}</a>
 	</li>
 	{{#if lunchbreak}}
 	<li class="lunch-hours-tab">
-		<a href="#strategy_calls_lunch_hours_tab"><i class="icon-food"></i>{{i18n.strategy.calls.lunchHoursTitle}}</a>
+		<a href="#strategy_calls_lunch_hours_tab"><i class="fa fa-cutlery"></i>{{i18n.strategy.calls.lunchHoursTitle}}</a>
 	</li>
 	{{/if}}
 	{{#if afterhours}}
 	<li class="after-hours-tab">
-		<a href="#strategy_calls_after_hours_tab"><i class="icon-moon"></i>{{i18n.strategy.calls.afterHoursTitle}}</a>
+		<a href="#strategy_calls_after_hours_tab"><i class="fa fa-moon-o"></i>{{i18n.strategy.calls.afterHoursTitle}}</a>
 	</li>
 	{{/if}}
 	{{#if holidays}}
diff --git a/views/strategy-callsTab.html b/views/strategy-callsTab.html
index 519a15c..3bcfc09 100644
--- a/views/strategy-callsTab.html
+++ b/views/strategy-callsTab.html
@@ -2,12 +2,12 @@
 <div class="call-option menu-call {{#compare callOption.type '===' 'default'}}active{{/compare}}">
 	<div class="radio-div">{{#monsterRadio "radio-large"}}<input type="radio" {{#compare callOption.type '===' 'default'}}checked{{/compare}} name="calls.{{callflow}}" value="menu">{{/monsterRadio}}</div>
 	<div class="title">{{i18n.strategy.calls.incomingCall}}</div>
-	<div class="arrow-icon"><i class="icon-arrow-down icon-large"></i></div>
+	<div class="arrow-icon"><i class="icon-arrow-down fa-lg"></i></div>
 	<div class="menu-div {{#if menu}}has-menu" data-callflow="{{menu}}{{/if}}">
 		<div class="link">
 			<a href="#">
 				<div class="menu-icon">
-					<i class="icon-user icon-3x"></i>
+					<i class="icon-user fa-3x"></i>
 				</div>
 				<div class="link-icon">
 					<i class="icon-cog icon-small"></i>
@@ -20,7 +20,7 @@
 <div class="call-option user-menu-call {{#compare callOption.type '===' 'user-menu'}}active{{/compare}}">
 	<div class="radio-div">{{#monsterRadio "radio-large"}}<input type="radio" {{#compare callOption.type '===' 'user-menu'}}checked{{/compare}} name="calls.{{callflow}}" value="user-menu">{{/monsterRadio}}</div>
 	<div class="title">{{i18n.strategy.calls.incomingCall}}</div>
-	<div class="arrow-icon"><i class="icon-arrow-down icon-large"></i></div>
+	<div class="arrow-icon"><i class="icon-arrow-down fa-lg"></i></div>
 	<div class="user-select">
 		<div class="title">N/A</div>
 		<select>
@@ -33,12 +33,12 @@
 			{{/each}}
 		</select>
 	</div>
-	<div class="arrow-icon"><i class="icon-arrow-down icon-large"></i></div>
+	<div class="arrow-icon"><i class="icon-arrow-down fa-lg"></i></div>
 	<div class="menu-div {{#if menu}}has-menu" data-callflow="{{menu}}{{/if}}">
 		<div class="link">
 			<a href="#">
 				<div class="menu-icon">
-					<i class="icon-user icon-3x"></i>
+					<i class="icon-user fa-3x"></i>
 				</div>
 				<div class="link-icon">
 					<i class="icon-cog icon-small"></i>
@@ -51,7 +51,7 @@
 <div class="call-option user-voicemail-call {{#compare callOption.type '===' 'user-voicemail'}}active{{/compare}}">
 	<div class="radio-div">{{#monsterRadio "radio-large"}}<input type="radio" {{#compare callOption.type '===' 'user-voicemail'}}checked{{/compare}} name="calls.{{callflow}}" value="user-voicemail">{{/monsterRadio}}</div>
 	<div class="title">{{i18n.strategy.calls.incomingCall}}</div>
-	<div class="arrow-icon"><i class="icon-arrow-down icon-large"></i></div>
+	<div class="arrow-icon"><i class="icon-arrow-down fa-lg"></i></div>
 	<div class="user-select">
 		<div class="title">N/A</div>
 		<select>
@@ -67,7 +67,7 @@
 			</optgroup>
 		</select>
 	</div>
-	<div class="arrow-icon"><i class="icon-arrow-down icon-large"></i></div>
+	<div class="arrow-icon"><i class="icon-arrow-down fa-lg"></i></div>
 	<div class="voicemail-select">
 		<div class="title">{{i18n.strategy.calls.voicemail}}</div>
 		<select>
diff --git a/views/strategy-confnum.html b/views/strategy-confnum.html
index 22fc172..5517391 100644
--- a/views/strategy-confnum.html
+++ b/views/strategy-confnum.html
@@ -15,10 +15,10 @@
 <div class="number-actions">
 	<a href="#" class="monster-link blue cancel-link pull-right">{{ i18n.close }}</a>
 	<div class="action-links nav-bar clearfix">
-		<a href="#" class="spare-link monster-link pull-left{{#unless spareLinkEnabled}} disabled{{/unless}}"><i class="icon-file-text-alt monster-orange icon-large"></i>{{ i18n.strategy.numberLinks.spare }}</a>
+		<a href="#" class="spare-link monster-link pull-left{{#unless spareLinkEnabled}} disabled{{/unless}}"><i class="fa fa-file-text-o monster-orange fa-lg"></i>{{ i18n.strategy.numberLinks.spare }}</a>
 		<ul class="nav pull-left">
 			<li class="dropdown">
-				<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="icon-shopping-cart monster-green icon-large"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
+				<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="icon-shopping-cart monster-green fa-lg"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
 				<ul class="dropdown-menu" role="menu">
 					<li><a class="buy-link" data-type="regular" href="#">{{i18n.strategy.numberLinks.buy.regular}}</a></li>
 					<li><a class="buy-link" data-type="tollfree" href="#">{{i18n.strategy.numberLinks.buy.tollfree}}</a></li>
diff --git a/views/strategy-holidayLine.html b/views/strategy-holidayLine.html
index b6b9d8f..2736040 100644
--- a/views/strategy-holidayLine.html
+++ b/views/strategy-holidayLine.html
@@ -1,6 +1,6 @@
 <div class="holidays-element" {{#if id}}data-id="{{id}}{{/if}}">
 	<div class="delete-holiday">
-		<i class="icon-trash monster-red"></i>
+		<i class="fa fa-trash-o monster-red"></i>
 	</div>
 	<div class="holiday-inputs">
 		<input type="text" class="name" value="{{name}}">
diff --git a/views/strategy-layout.html b/views/strategy-layout.html
index 7a674d2..cc10525 100644
--- a/views/strategy-layout.html
+++ b/views/strategy-layout.html
@@ -1,6 +1,6 @@
 <div id="strategy_container">
 	<div class="element-container helper">
-		<i class="icon-info-sign"></i>
+		<i class="fa fa-info-circle"></i>
 		<p>{{ i18n.strategy.noNumberHelp }}</p>
 	</div>
 	<div class="element-container main-number" data-template="numbers">
diff --git a/views/strategy-menuLine.html b/views/strategy-menuLine.html
index 4c8f874..a5cff5e 100644
--- a/views/strategy-menuLine.html
+++ b/views/strategy-menuLine.html
@@ -15,5 +15,5 @@
 			{{/each}}
 		</select>
 	</div>
-	<i class="remove-btn icon-remove monster-lightgrey"></i>
+	<i class="remove-btn fa fa-times monster-lightgrey"></i>
 </div>
\ No newline at end of file
diff --git a/views/strategy-menuPopup.html b/views/strategy-menuPopup.html
index e7a2045..ef38fc2 100644
--- a/views/strategy-menuPopup.html
+++ b/views/strategy-menuPopup.html
@@ -41,7 +41,7 @@
 						<div class="greeting-option-header" data-toggle="collapse" 
 							 data-parent="#strategy_menu_popup_accordion" 
 							 data-target="#strategy_menu_popup_upload_greeting">
-							<div class="pull-right"><i class="icon-upload-alt"></i></div>
+							<div class="pull-right"><i class="fa fa-upload"></i></div>
 							<div>{{i18n.strategy.popup.uploadGreetingTitle}}</div>
 						</div>
 						<div class="collapse" id="strategy_menu_popup_upload_greeting">
@@ -61,7 +61,7 @@
 						<div class="greeting-option-header" data-toggle="collapse" 
 							 data-parent="#strategy_menu_popup_accordion" 
 							 data-target="#strategy_menu_popup_record_greeting">
-							<div class="pull-right"><i class="icon-info-sign"></i></div>
+							<div class="pull-right"><i class="fa fa-info-circle"></i></div>
 							<div>{{i18n.strategy.popup.recordGreetingTitle}}</div>
 						</div>
 						<div class="collapse" id="strategy_menu_popup_record_greeting">
diff --git a/views/strategy-numbers.html b/views/strategy-numbers.html
index f8b9170..1630c32 100644
--- a/views/strategy-numbers.html
+++ b/views/strategy-numbers.html
@@ -17,7 +17,7 @@
 							<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ ../../i18n.callerId }}</a></li>
 							<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ ../../i18n.e911 }}</a></li>
 						{{/unless}}
-							<li><a class="prepend-number" href="#"><i class="icon-file-text-alt"></i>{{ ../i18n.numberPrepend }}</a></li>
+							<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ ../i18n.numberPrepend }}</a></li>
 						</ul>
 					</li>
 				</ul>
@@ -38,10 +38,10 @@
 <div class="number-actions">
 	<a href="#" class="cancel-link pull-right monster-link blue">{{ i18n.close }}</a>
 	<div class="action-links nav-bar clearfix">
-		<a href="#" class="spare-link monster-link pull-left{{#unless spareLinkEnabled}} disabled{{/unless}}"><i class="icon-file-text-alt monster-orange icon-large"></i>{{ i18n.strategy.numberLinks.spare }}</a>
+		<a href="#" class="spare-link monster-link pull-left{{#unless spareLinkEnabled}} disabled{{/unless}}"><i class="fa fa-file-text-o monster-orange fa-lg"></i>{{ i18n.strategy.numberLinks.spare }}</a>
 		<ul class="nav pull-left">
 			<li class="dropdown">
-				<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="icon-shopping-cart monster-green icon-large"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
+				<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="icon-shopping-cart monster-green fa-lg"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
 				<ul class="dropdown-menu" role="menu">
 					<li><a class="buy-link" data-type="regular" href="#">{{i18n.strategy.numberLinks.buy.regular}}</a></li>
 					<li><a class="buy-link" data-type="tollfree" href="#">{{i18n.strategy.numberLinks.buy.tollfree}}</a></li>
diff --git a/views/users-devices.html b/views/users-devices.html
index e29e505..f37331a 100644
--- a/views/users-devices.html
+++ b/views/users-devices.html
@@ -19,7 +19,7 @@
 
 	<div class="actions">
 		<div class="dropdown pull-left">
-			<a href="#" class="add-device monster-link dropdown-toggle" data-toggle="dropdown"><i class="icon-plus-sign monster-green"></i>{{ i18n.users.devices.newDevice }}</a>
+			<a href="#" class="add-device monster-link dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-circle monster-green"></i>{{ i18n.users.devices.newDevice }}</a>
 			<ul class="dropdown-menu">
 				<li><a class="create-device" data-type="sip_device"><i class="icon-telicon-voip-phone"></i>{{ i18n.devices.types.sip_device }}</a></li>
 				<li><a class="create-device" data-type="cellphone"><i class="icon-phone"></i>{{ i18n.devices.types.cellphone }}</a></li>
diff --git a/views/users-feature-music_on_hold.html b/views/users-feature-music_on_hold.html
index 86069c9..a6cc49a 100644
--- a/views/users-feature-music_on_hold.html
+++ b/views/users-feature-music_on_hold.html
@@ -26,8 +26,8 @@
 		</div>
 		<div class="upload-div">
 			<input type="file" class="upload-input" accept="audio/*">
-			<button type="button" class="btn btn-success upload-action upload-submit"><i class="icon-upload-alt"></i></button>
-			<button type="button" class="btn btn-danger upload-action upload-cancel"><i class="icon-remove"></i></button>
+			<button type="button" class="btn btn-success upload-action upload-submit"><i class="fa fa-upload"></i></button>
+			<button type="button" class="btn btn-danger upload-action upload-cancel"><i class="fa fa-times"></i></button>
 		</div>
 	</div>
 
diff --git a/views/users-name.html b/views/users-name.html
index 92b98dd..0d9c26c 100644
--- a/views/users-name.html
+++ b/views/users-name.html
@@ -62,7 +62,7 @@
 			</div>
 
 			<div class="row-fields">
-				<div class="icon-wrapper" data-original-title="{{i18n.users.editionForm.timezoneHelp}}" data-placement="top" data-toggle="tooltip"><i class="icon-time"></i></div>
+				<div class="icon-wrapper" data-original-title="{{i18n.users.editionForm.timezoneHelp}}" data-placement="top" data-toggle="tooltip"><i class="fa fa-clock-o"></i></div>
 				<select id="user_timezone" name="timezone" data-original_value="{{timezone}}"></select>
 			</div>
 
@@ -79,7 +79,7 @@
 			</div>
 
 			<div class="row-fields">
-				<div class="icon-wrapper" data-original-title="{{i18n.users.editionForm.ringingHelp}}" data-placement="top" data-toggle="tooltip"><i class="icon-bell"></i></div>
+				<div class="icon-wrapper" data-original-title="{{i18n.users.editionForm.ringingHelp}}" data-placement="top" data-toggle="tooltip"><i class="fa fa-bell-o"></i></div>
 				{{#unless extra.ringingTimeout}}
 					<div class="ringing-timeout disabled" data-original-title="{{i18n.users.editionForm.disabledTimeoutHint}}" data-placement="top" data-toggle="tooltip">
 				{{else}}
@@ -122,7 +122,7 @@
 	<div class="actions">
 		<!-- We forbid users to delete their own user -->
 		{{#compare id "!==" extra.adminId}}
-			<a id="delete_user" class="monster-link" href="javascript:void(0);"><i class="icon-trash monster-red"></i>{{ i18n.users.delete }}</a>
+			<a id="delete_user" class="monster-link" href="javascript:void(0);"><i class="fa fa-trash-o monster-red"></i>{{ i18n.users.delete }}</a>
 		{{/compare}}
 
 		<div class="pull-right">
diff --git a/views/users-newExtension.html b/views/users-newExtension.html
index 0d97bc6..43bd942 100644
--- a/views/users-newExtension.html
+++ b/views/users-newExtension.html
@@ -2,6 +2,6 @@
     <div class="number">
 		{{ i18n.users.addNewExtension }}
 		<input type="text" class="input-extension" value="{{recommendedExtension}}"></input>
-		<a class="cancel-extension-link monster-link"><i class="monster-red icon-remove"></i></a>
+		<a class="cancel-extension-link monster-link"><i class="monster-red fa fa-times"></i></a>
     </div>
 </div>
diff --git a/views/users-numbers.html b/views/users-numbers.html
index 63a7d8e..8a162d0 100644
--- a/views/users-numbers.html
+++ b/views/users-numbers.html
@@ -17,7 +17,7 @@
 											<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ ../../i18n.callerId }}</a></li>
 											<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ ../../i18n.e911 }}</a></li>
 										{{/unless}}
-											<li><a class="prepend-number" href="#"><i class="icon-file-text-alt"></i>{{ ../i18n.numberPrepend }}</a></li>
+											<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ ../i18n.numberPrepend }}</a></li>
 										</ul>
 									</li>
 								</ul>
@@ -25,7 +25,7 @@
 						</div>
 						<div class="features">
 						{{#compare this.state '===' 'port_in'}}
-							<i class="icon-warning-sign monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../../i18n.portIconHelp}}"></i>
+							<i class="fa fa-exclamation-triangle monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../../i18n.portIconHelp}}"></i>
 						{{/compare}}
 							{{#each this.viewFeatures}}
 								<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
@@ -54,11 +54,11 @@
 
 	<div class="actions">
 		<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
-			<i class="icon-plus monster-green icon-large"></i>{{ i18n.users.addFromSpare }}
+			<i class="icon-plus monster-green fa-lg"></i>{{ i18n.users.addFromSpare }}
 		</a>
 		<ul class="nav pull-left">
 			<li class="dropdown">
-				<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="icon-shopping-cart monster-green icon-large"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
+				<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="icon-shopping-cart monster-green fa-lg"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
 				<ul class="dropdown-menu" role="menu">
 					<li><a class="buy-link" data-type="regular" href="#">{{i18n.strategy.numberLinks.buy.regular}}</a></li>
 					<li><a class="buy-link" data-type="tollfree" href="#">{{i18n.strategy.numberLinks.buy.tollfree}}</a></li>
diff --git a/views/users-numbersItemRow.html b/views/users-numbersItemRow.html
index d460943..1992492 100644
--- a/views/users-numbersItemRow.html
+++ b/views/users-numbersItemRow.html
@@ -10,7 +10,7 @@
 							<li><a class="callerId-number" href="#"><i class="icon-user"></i>{{ i18n.callerId }}</a></li>
 							<li><a class="e911-number" href="#"><i class="icon-ambulance"></i>{{ i18n.e911 }}</a></li>
 						{{/unless}}
-							<li><a class="prepend-number" href="#"><i class="icon-file-text-alt"></i>{{ i18n.numberPrepend }}</a></li>
+							<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ i18n.numberPrepend }}</a></li>
 						</ul>
 					</li>
 				</ul>
@@ -18,7 +18,7 @@
 		</div>
 		<div class="features">
 		{{#compare number.state '===' 'port_in'}}
-				<i class="icon-warning-sign monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../i18n.portIconHelp}}"></i>
+				<i class="fa fa-exclamation-triangle monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../i18n.portIconHelp}}"></i>
 		{{/compare}}
 			{{#each number.viewFeatures}}
 				<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
diff --git a/views/vmboxes-edit.html b/views/vmboxes-edit.html
index a502727..aa2fc0d 100644
--- a/views/vmboxes-edit.html
+++ b/views/vmboxes-edit.html
@@ -142,7 +142,7 @@
 				</div>
 
 				<div class="helper">
-					<i class="icon-info-sign"></i>
+					<i class="fa fa-info-circle"></i>
 					{{ i18n.vmboxes.popupSettings.recipients.header }}
 				</div>
 
@@ -150,7 +150,7 @@
 					<div class="create-entity">
 						<div class="entity-wrapper placeholder">
 							<div class="create-text">
-								<i class="icon-plus-sign"></i>
+								<i class="fa fa-plus-circle"></i>
 								{{ i18n.vmboxes.popupSettings.recipients.create }}
 							</div>
 							
@@ -172,7 +172,7 @@
 
 	<div class="actions clearfix">
 		{{#if id}}
-			<a id="delete_vmbox" class="monster-link"><i class="icon-trash monster-red"></i>{{ i18n.vmboxes.deleteVmbox }}</a>
+			<a id="delete_vmbox" class="monster-link"><i class="fa fa-trash-o monster-red"></i>{{ i18n.vmboxes.deleteVmbox }}</a>
 		{{/if}}
 
 		<div class="pull-right">
diff --git a/views/vmboxes-emailRow.html b/views/vmboxes-emailRow.html
index 6a39a96..fb02025 100644
--- a/views/vmboxes-emailRow.html
+++ b/views/vmboxes-emailRow.html
@@ -1,4 +1,4 @@
 <div class="entity-wrapper" data-name="{{ name }}">
 	<span class="entity-title">{{ name }}</span>
-	<div class="delete-entity"><i class="icon-trash monster-red"></i></div>
+	<div class="delete-entity"><i class="fa fa-trash-o monster-red"></i></div>
 </div>
\ No newline at end of file
diff --git a/views/vmboxes-layout.html b/views/vmboxes-layout.html
index 49f7421..69d72b8 100644
--- a/views/vmboxes-layout.html
+++ b/views/vmboxes-layout.html
@@ -6,7 +6,7 @@
 		</div>
 
 		<a class="monster-link add-vmbox">
-			<i class="icon-plus-sign"></i>
+			<i class="fa fa-plus-circle"></i>
 			{{i18n.vmboxes.add }}
 		</a>