diff --git a/controllers/admin/AdminGeolocationController.php b/controllers/admin/AdminGeolocationController.php
index 665c838c9..ef6430a6d 100755
--- a/controllers/admin/AdminGeolocationController.php
+++ b/controllers/admin/AdminGeolocationController.php
@@ -34,7 +34,7 @@ class AdminGeolocationControllerCore extends AdminController
 		$this->fields_options = array(
 			'geolocationConfiguration' => array(
 				'title' =>	$this->l('Geolocation by IP address'),
-				'icon' =>	'world',
+				'icon' =>	'icon-map-marker',
 				'fields' =>	array(
 		 			'PS_GEOLOCATION_ENABLED' => array(
 		 				'title' => $this->l('Geolocation by IP address'),
@@ -47,7 +47,7 @@ class AdminGeolocationControllerCore extends AdminController
 			),
 			'geolocationCountries' => array(
 				'title' =>	$this->l('Options'),
-				'icon' =>	'world',
+				'icon' =>	'icon-map-marker',
 				'description' => $this->l('The following features are only available if you enable the Geolocation by IP address feature.'),
 				'fields' =>	array(
 		 			'PS_GEOLOCATION_BEHAVIOR' => array(
@@ -69,7 +69,7 @@ class AdminGeolocationControllerCore extends AdminController
 			),
 			'geolocationWhitelist' => array(
 				'title' =>	$this->l('IP address whitelist'),
-				'icon' =>	'world',
+				'icon' =>	'icon-sitemap',
 				'description' => $this->l('You can add IP addresses that will always be allowed to access your shop (e.g. Google bots\' IP).'),
 				'fields' =>	array(
 		 			'PS_GEOLOCATION_WHITELIST' => array('title' => $this->l('Whitelisted IP addresses'), 'type' => 'textarea_newlines', 'cols' => 15, 'rows' => 30),
diff --git a/controllers/admin/AdminMaintenanceController.php b/controllers/admin/AdminMaintenanceController.php
index cf4208b40..ff85ae044 100644
--- a/controllers/admin/AdminMaintenanceController.php
+++ b/controllers/admin/AdminMaintenanceController.php
@@ -37,7 +37,6 @@ class AdminMaintenanceControllerCore extends AdminController
 		$this->fields_options = array(
 			'general' => array(
 				'title' =>	$this->l('General'),
-				'icon' =>	'tab-preferences',
 				'fields' =>	array(
 					'PS_SHOP_ENABLE' => array(
 						'title' => $this->l('Enable Shop'),