diff --git a/src/app/features/admin/partials/datasources.html b/src/app/features/admin/partials/datasources.html
index e0022e5137f..1199fea27f5 100644
--- a/src/app/features/admin/partials/datasources.html
+++ b/src/app/features/admin/partials/datasources.html
@@ -36,13 +36,13 @@
 									</td>
 									<td style="width: 1%">
 										<a ng-click="edit(ds)" class="btn btn-success btn-mini">
-											<i class="icon-edit"></i>
+											<i class="fa fa-edit"></i>
 											Edit
 										</a>
 									</td>
 									<td style="width: 1%">
 										<a ng-click="remove(ds)" 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/register.html b/src/app/partials/register.html
index 834971972e6..1efb4e1879b 100644
--- a/src/app/partials/register.html
+++ b/src/app/partials/register.html
@@ -35,7 +35,7 @@
 				</div>
 				<div class="span4">
 					<button type="submit" ng-click="register()" class="btn btn-success btn-large">
-						<i class="icon-lock"></i>
+						<i class="fa fa-lock"></i>
 						Sign up
 					</button>
 				</div>