diff --git a/admin/db_stats.php b/admin/db_stats.php
index 7688adf553..ed9b419715 100644
--- a/admin/db_stats.php
+++ b/admin/db_stats.php
@@ -65,7 +65,7 @@ function helper_table_row_count( $p_table ) {
 <div class="widget-box widget-color-blue2">
 <div class="widget-header widget-header-small">
 <h4 class="widget-title lighter">
-	<i class="ace-icon fa fa-database"></i>
+	<?php print_icon( 'fa-database', 'ace-icon' ); ?>
 	<?php echo lang_get( 'mantisbt_database_statistics' ) ?>
 </h4>
 </div>
diff --git a/admin/email_queue.php b/admin/email_queue.php
index db2c56a391..c1cf6bfb37 100644
--- a/admin/email_queue.php
+++ b/admin/email_queue.php
@@ -85,13 +85,13 @@
 
 	if( !$t_result ) {
 		echo '<div class="alert alert-sm alert-danger">';
-		echo '<i class="ace-icon fa fa-times fa-lg"></i> ';
+		print_icon( 'fa-times', 'ace-icon fa-lg' );
 		echo '<strong>Testing Mail</strong> - ';
 		echo ' PROBLEMS SENDING MAIL TO: ' . config_get_global( 'webmaster_email' ) . '. Please check your php/mail server settings.';
 		echo '</div>';
 	} else {
 		echo '<div class="alert alert-sm alert-success">';
-		echo '<i class="ace-icon fa fa-check fa-lg"></i> ';
+		print_icon( 'fa-check', 'ace-icon fa-lg' );
 		echo '<strong>Testing Mail</strong> - ';
 		echo ' mail() send successful.';
 		echo '</div>';
@@ -105,8 +105,8 @@
 <div class="widget-box widget-color-blue2">
 <div class="widget-header widget-header-small">
 	<h4 class="widget-title lighter">
-	<i class="ace-icon fa fa-envelope"></i>
-	Email Queue
+		<?php print_icon( 'fa-envelope', 'ace-icon' ); ?>
+		Email Queue
 	</h4>
 </div>
 <div class="widget-body">
diff --git a/admin/index.php b/admin/index.php
index b8d52bb0e2..1de0af4ece 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -55,7 +55,7 @@ function print_info_row( $p_description, $p_value ) {
 <div class="widget-box widget-color-blue2">
 <div class="widget-header widget-header-small">
 	<h4 class="widget-title lighter">
-		<i class="ace-icon fa fa-download"></i>
+		<?php print_icon( 'fa-download', 'ace-icon' ); ?>
 		<?php echo lang_get( 'install_information' ) ?>
 	</h4>
 </div>
diff --git a/admin/move_attachments.php b/admin/move_attachments.php
index 7805d38df5..682da75e2d 100644
--- a/admin/move_attachments.php
+++ b/admin/move_attachments.php
@@ -309,14 +309,15 @@ function move_attachments_to_disk( $p_type, array $p_projects ) {
 			echo '<div class="widget-box widget-color-blue2">';
 			echo '<div class="widget-header widget-header-small">';
 			echo '<h4 class="widget-title lighter">';
-			echo '<i class="ace-icon fa fa-paperclip"></i>';
-				printf(
-					"Project '%s' : %d attachments %s",
-					$t_row['name'],
-					$t_row['rows'],
-					( 0 == $t_row['failed']
-						? 'moved successfully'
-						: 'to move, ' . $t_row['failed'] . ' failures') );
+			print_icon( 'fa-paperclip', 'ace-icon' );
+			printf(
+				"Project '%s' : %d attachments %s",
+				$t_row['name'],
+				$t_row['rows'],
+				( 0 == $t_row['failed']
+					? 'moved successfully'
+					: 'to move, ' . $t_row['failed'] . ' failures')
+			);
 			echo '</h4>';
 			echo '</div>';
 			echo '<div class="widget-body">';
diff --git a/admin/move_attachments_page.php b/admin/move_attachments_page.php
index ed77020212..d9b1e4c9f5 100644
--- a/admin/move_attachments_page.php
+++ b/admin/move_attachments_page.php
@@ -107,7 +107,7 @@ function get_attachment_stats( $p_file_type, $p_in_db ) {
 <div class="widget-box widget-color-blue2">
 <div class="widget-header widget-header-small">
 	<h4 class="widget-title lighter">
-		<i class="ace-icon fa fa-paperclip"></i>
+		<?php print_icon( 'fa-paperclip', 'ace-icon' ); ?>
 		<?php echo "$t_type to move"; ?>
 	</h4>
 </div>
diff --git a/admin/system_utils.php b/admin/system_utils.php
index 7653e371a4..85617cd750 100644
--- a/admin/system_utils.php
+++ b/admin/system_utils.php
@@ -43,7 +43,7 @@
 <div class="widget-box widget-color-blue2">
 <div class="widget-header widget-header-small">
 	<h4 class="widget-title lighter">
-		<i class="ace-icon fa fa-wrench"></i>
+		<?php print_icon( 'fa-wrench', 'ace-icon' ); ?>
 		System Utilities
 	</h4>
 </div>
diff --git a/admin/test_langs.php b/admin/test_langs.php
index 3eb86be853..548214050f 100644
--- a/admin/test_langs.php
+++ b/admin/test_langs.php
@@ -61,7 +61,7 @@
 <div class="widget-box widget-color-blue2">
 <div class="widget-header widget-header-small">
 	<h4 class="widget-title lighter">
-		<i class="ace-icon fa fa-text-width"></i>
+		<?php print_icon( 'fa-text-width', 'ace-icon' ); ?>
 		Test Langs
 	</h4>
 </div>
diff --git a/tests/Mantis/PrepareTest.php b/tests/Mantis/PrepareTest.php
index bd3e78df28..58ebe77d84 100644
--- a/tests/Mantis/PrepareTest.php
+++ b/tests/Mantis/PrepareTest.php
@@ -92,7 +92,7 @@ public function providerEmailLink() {
 		$t_text = 'Link Text';
 		$t_tooltip = 'Tooltip';
 		$t_button_classes = 'class="noprint blue zoom-130"';
-		$t_button_text = sprintf( '<i class="fa fa-envelope-o bigger-115"></i>&nbsp;%s', $t_text );
+		$t_button_text = icon_get( 'fa-envelope-o', 'bigger-115' ) . '&nbsp;' . $t_text;
 
 		$t_test_data = array(
 			'Basic' => array(