diff --git a/src/app/features/admin/partials/account.html b/src/app/features/admin/partials/account.html
index 15a80d86fe4..ff686736b55 100644
--- a/src/app/features/admin/partials/account.html
+++ b/src/app/features/admin/partials/account.html
@@ -7,7 +7,7 @@
 
 			<div class="dashboard-editor-header">
 				<div class="dashboard-editor-title">
-					<i class="icon icon-user"></i>
+					<i class="fa fa-user"></i>
 					Personal information
 				</div>
 			</div>
@@ -45,7 +45,7 @@
 		<div class="section">
 			<div class="dashboard-editor-header">
 				<div class="dashboard-editor-title">
-					<i class="icon icon-eye-open"></i>
+					<i class="fa fa-eye"></i>
 					Active account
 				</div>
 			</div>
@@ -74,7 +74,7 @@
 
 	<div class="dashboard-editor-header">
 		<div class="dashboard-editor-title">
-			<i class="icon icon-eye-open"></i>
+			<i class="fa fa-users"></i>
 			Collaborators
 		</div>
 	</div>
@@ -100,7 +100,7 @@
 					</td>
 					<td style="width: 1%">
 						<a ng-click="removeCollaborator(collaborator)" class="btn btn-danger btn-mini">
-							<i class="icon-remove"></i>
+							<i class="fa fa-remove"></i>
 						</a>
 					</td>
 				</tr>
diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html
index 7b286fb4f60..4f45264348e 100644
--- a/src/app/partials/sidemenu.html
+++ b/src/app/partials/sidemenu.html
@@ -9,27 +9,27 @@
 		</ul>
 	</div>
 	<a class="pro-sidemenu-link" ng-href="{{appSubUrl}}/">
-		<i class="icon-th-large"></i>
+		<i class="fa fa-th-large"></i>
 		Dashboards
 	</a>
 	<a class="pro-sidemenu-link" href="charts">
-		<i class="icon-signal"></i>
+		<i class="fa fa-signal"></i>
 		Graphs
 	</a>
 	<a class="pro-sidemenu-link" href="/charts">
-		<i class="icon-bolt" style="padding-right: 23px"></i>
+		<i class="fa fa-bolt" style="padding-right: 23px"></i>
 		 Alerts
 	</a>
 	<a class="pro-sidemenu-link" href="admin/datasources">
-		<i class="icon-sitemap"></i>
+		<i class="fa fa-sitemap"></i>
 		Data sources
 	</a>
 	<a class="pro-sidemenu-link" href="account">
-		<i class="icon-user"></i>
+		<i class="fa fa-user"></i>
 		Account settings
 	</a>
 	<a class="pro-sidemenu-link" href="login?logout">
-		<i class="icon-signout"></i>
+		<i class="fa fa-sign-out"></i>
 		Sign out
 	</a>