diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index c1f23f03d0..33e9e1f8c0 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2739,3 +2739,7 @@ fieldset.permissions .padding {
 	width: 1em;
 }
 /* stylelint-enable declaration-property-unit-whitelist */
+
+.acp-icon {
+	font-size: 1.5em;
+}
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 1dea68ed80..23bd4a116b 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -254,5 +254,10 @@ function parse_document(container)
 		});
 
 		$('#configlist').closest('.send-stats-data-row').addClass('send-stats-data-hidden');
+
+		// Do not underline actions icons on hover (could not be done via CSS)
+		$('.actions a:has(i.acp-icon)').mouseover(function () {
+			$(this).css("text-decoration", "none");
+		});
 	});
 })(jQuery);
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 4e4e888402..e197dcbe3c 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -93,16 +93,16 @@ function adm_page_header($page_title)
 
 		'T_ASSETS_VERSION'		=> $config['assets_version'],
 
-		'ICON_MOVE_UP'				=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
-		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
-		'ICON_MOVE_DOWN'			=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
-		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
-		'ICON_EDIT'					=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
-		'ICON_EDIT_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
-		'ICON_DELETE'				=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
-		'ICON_DELETE_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
-		'ICON_SYNC'					=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
-		'ICON_SYNC_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
+		'ICON_MOVE_UP'				=> '<i class="icon acp-icon fa-arrow-circle-up fa-fw" title="' . $user->lang('MOVE_UP') . '" style="color:#4ba5de"></i>',
+		'ICON_MOVE_UP_DISABLED'		=> '<i class="icon acp-icon fa-arrow-circle-up fa-fw" title="' . $user->lang('MOVE_UP') . '" style="color:#d0d0d0"></i>',
+		'ICON_MOVE_DOWN'			=> '<i class="icon acp-icon fa-arrow-circle-down fa-fw" title="' . $user->lang('MOVE_DOWN') . '" style="color:#4ba5de"></i>',
+		'ICON_MOVE_DOWN_DISABLED'	=> '<i class="icon acp-icon fa-arrow-circle-down fa-fw" title="' . $user->lang('MOVE_DOWN') . '" style="color:#d0d0d0"></i>',
+		'ICON_EDIT'					=> '<i class="icon acp-icon fa-cog fa-fw" title="' . $user->lang('EDIT') . '" style="color:#62c046"></i>',
+		'ICON_EDIT_DISABLED'		=> '<i class="icon acp-icon fa-cog fa-fw" title="' . $user->lang('EDIT') . '" style="color:#d0d0d0"></i>',
+		'ICON_DELETE'				=> '<i class="icon acp-icon fa-times-circle fa-fw" title="' . $user->lang('DELETE') . '" style="color:#d74558"></i>',
+		'ICON_DELETE_DISABLED'		=> '<i class="icon acp-icon fa-times-circle fa-fw" title="' . $user->lang('DELETE') . '" style="color:#d0d0d0"></i>',
+		'ICON_SYNC'					=> '<i class="icon acp-icon fa-refresh fa-fw" title="' . $user->lang('RESYNC') . '" style="color:#f69934"></i>',
+		'ICON_SYNC_DISABLED'		=> '<i class="icon acp-icon fa-refresh fa-fw" title="' . $user->lang('RESYNC') . '" style="color:#d0d0d0"></i>',
 
 		'S_USER_LANG'			=> $user->lang['USER_LANG'],
 		'S_CONTENT_DIRECTION'	=> $user->lang['DIRECTION'],