diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php
index 9d6535a3b..6f58027bc 100644
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -151,11 +151,11 @@ class adminlog_admin extends e_admin_dispatcher
 	protected $adminMenu = array(
 
 		'main/list'			=> array('caption'=> RL_LAN_030, 'perm' => '5'),
-		'audit/list'		=> array('caption'=> RL_LAN_062, 'perm' => '5'),
+		'audit/list'		=> array('caption'=> RL_LAN_062, 'perm' => '5', 'icon'=>'fa-user'),
 		'rolling/list'		=> array('caption'=> RL_LAN_002, 'perm' => '5'),
 		'divider/01'        => array('divider'=>true),
 		'main/prefs' 		=> array('caption'=> LAN_PREFS, 'perm' => '5'),	
-		'main/maintenance'	=> array('caption'=> LAN_OPTIONS, 'perm' => '5')
+		'main/maintenance'	=> array('caption'=> LAN_OPTIONS, 'perm' => '5', 'icon'=>'fa-wrench')
 
 		// 'main/custom'		=> array('caption'=> 'Custom Page', 'perm' => 'P')
 	);
diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index 7aafdd14c..b4edc6b04 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -34,7 +34,7 @@ class cron_admin extends e_admin_dispatcher
 
 	protected $adminMenu = array(
 		'main/list'		=> array('caption'=> LAN_MANAGE, 'perm' => '0'),
-		'main/refresh' 	=> array('caption'=> LAN_CRON_M_02, 'perm' => '0','url'=>'cron.php', 'icon'=>'fa-sync'),
+		'main/refresh' 	=> array('caption'=> LAN_CRON_M_02, 'perm' => '0','url'=>'cron.php', 'icon'=>'fa-refresh'),
 	//	'main/prefs' 	=> array('caption'=> 'Settings', 'perm' => '0'),
 	//	'main/custom'	=> array('caption'=> 'Custom Page', 'perm' => '0')		
 	);
diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php
index cec2f74b8..1d6e51f87 100644
--- a/e107_admin/userclass2.php
+++ b/e107_admin/userclass2.php
@@ -41,7 +41,7 @@ e107::coreLan('userclass2', true);
 
 			'main/list'			=> array('caption'=> LAN_MANAGE, 'perm' => '4'),
 			'main/create'		=> array('caption'=> LAN_CREATE, 'perm' => '4'),
-			'main/initial' 		=> array('caption'=> UCSLAN_38, 'perm' => '4'),
+			'main/initial' 		=> array('caption'=> UCSLAN_38, 'perm' => '4', 'icon'=>'fa-asterisk'),
 			'main/options' 		=> array('caption'=> LAN_OPTIONS, 'perm' => '4'),
 
 			// 'main/custom'		=> array('caption'=> 'Custom Page', 'perm' => 'P')
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 0c45db745..edd1e5df8 100755
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -1331,7 +1331,7 @@ class e_admin_dispatcher
 	 */
 	public function getMenuTitle()
 	{
-		return $this->menuTitle;
+		return defset($this->menuTitle,$this->menuTitle);
 	}
 
 	/**
@@ -5828,7 +5828,8 @@ class e_admin_ui extends e_admin_controller_ui
 			$this->fieldpref = $ufieldpref;
 		}*/
 
-		$this->addTitle($this->pluginTitle)->parseAliases();
+		$pluginTitle = $this->getPluginTitle();
+		$this->addTitle($pluginTitle)->parseAliases();
 
 		$this->initAdminAddons();
 
diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php
index aee3b337a..e66ff5a23 100644
--- a/e107_plugins/gsitemap/admin_config.php
+++ b/e107_plugins/gsitemap/admin_config.php
@@ -40,12 +40,12 @@ class gsitemap_adminArea extends e_admin_dispatcher
 	
 	protected $adminMenu = array(
 
-		'main/list'			=> array('caption'=> LAN_MANAGE, 'perm' => 'P'),
-		'main/create'		=> array('caption'=> GSLAN_22, 'perm' => 'P'),
+		'main/list'			=> array('caption'=> 'LAN_MANAGE', 'perm' => 'P'),
+		'main/create'		=> array('caption'=> 'GSLAN_22', 'perm' => 'P'),
 
-		 'main/div0'        => array('divider'=> true),
-		 'main/import'		=> array('caption'=> LAN_IMPORT, 'perm' => 'P'),
-		 'main/instructions' => array('caption'=> GSLAN_53, 'perm' => 'P'),
+		// 'main/div0'        => array('divider'=> true),
+		 'main/import'		=> array('caption'=> 'LAN_IMPORT', 'perm' => 'P'),
+		 'main/instructions' => array('caption'=> 'GSLAN_53', 'perm' => 'P', 'icon'=>'fa-info-circle'),
 		
 	);
 
@@ -53,7 +53,7 @@ class gsitemap_adminArea extends e_admin_dispatcher
 		'main/edit'	=> 'main/list'				
 	);	
 	
-	protected $menuTitle = LAN_PLUGIN_GSITEMAP_NAME;
+	protected $menuTitle = 'LAN_PLUGIN_GSITEMAP_NAME';
 }
 
 
@@ -63,7 +63,7 @@ class gsitemap_adminArea extends e_admin_dispatcher
 class gsitemap_ui extends e_admin_ui
 {
 			
-		protected $pluginTitle		= LAN_PLUGIN_GSITEMAP_NAME;
+		protected $pluginTitle		= 'LAN_PLUGIN_GSITEMAP_NAME';
 		protected $pluginName		= 'gsitemap';
 	//	protected $eventName		= 'gsitemap-gsitemap'; // remove comment to enable event triggers in admin. 		
 		protected $table			= 'gsitemap';
@@ -85,15 +85,15 @@ class gsitemap_ui extends e_admin_ui
 	
 		protected $fields 		= array (
 			'checkboxes'              => array (  'title' => '',  'type' => null,  'data' => null,  'width' => '5%',  'thclass' => 'center',  'forced' => true,  'class' => 'center',  'toggle' => 'e-multiselect',  'readParms' =>  array (),  'writeParms' =>  array (),),
-			'gsitemap_id'             => array (  'title' => LAN_ID,  'type'=>'number', 'data' => 'int',  'width' => '5%',  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',),
+			'gsitemap_id'             => array (  'title' => 'LAN_ID',  'type'=>'number', 'data' => 'int',  'width' => '5%',  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',),
 			'gsitemap_name'           => array (  'title' => LAN_TITLE,  'type' => 'text',  'data' => 'safestr',  'width' => 'auto',  'inline' => true,  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array ('size'=>'xxlarge'),  'class' => 'left',  'thclass' => 'left',),
 			'gsitemap_url'            => array (  'title' => LAN_URL,  'type' => 'url',  'data' => 'safestr',  'width' => 'auto',  'inline' => true,  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array ('size'=>'xxlarge'),  'class' => 'left',  'thclass' => 'left',),
 			'gsitemap_table'          => array (  'title' => 'Table', 'tab'=>1, 'type' => 'text',  'data' => 'safestr',  'width' => 'auto',  'filter' => true,  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',  'batch' => false,),
 			'gsitemap_table_id'       => array (  'title' => LAN_ID,  'tab'=>1,'type' => 'number',  'data' => 'int',  'width' => '5%',  'readonly' => false,  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',),
-			'gsitemap_lastmod'        => array (  'title' => GSLAN_27, 'tab'=>1, 'type' => 'datestamp', 'readonly'=>2, 'data' => 'int',  'width' => 'auto',  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',  'filter' => false,  'batch' => true,),
-			'gsitemap_freq'           => array (  'title' => GSLAN_28,  'type' => 'dropdown',  'data' => 'safestr',  'width' => 'auto',  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',  'filter' => true,  'batch' => true,),
-			'gsitemap_priority'       => array (  'title' => GSLAN_9,  'type' => 'method',  'data' => 'safestr',  'width' => 'auto',  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',  'filter' => true,  'batch' => true,),
-			'gsitemap_cat'            => array (  'title' => LAN_CATEGORY, 'tab'=>1, 'type' => 'text',  'data' => 'safestr',  'width' => 'auto',  'batch' => true,  'filter' => true,  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',),
+			'gsitemap_lastmod'        => array (  'title' => 'GSLAN_27', 'tab'=>1, 'type' => 'datestamp', 'readonly'=>2, 'data' => 'int',  'width' => 'auto',  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',  'filter' => false,  'batch' => true,),
+			'gsitemap_freq'           => array (  'title' => 'GSLAN_28',  'type' => 'dropdown',  'data' => 'safestr',  'width' => 'auto',  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',  'filter' => true,  'batch' => true,),
+			'gsitemap_priority'       => array (  'title' => 'GSLAN_9',  'type' => 'method',  'data' => 'safestr',  'width' => 'auto',  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',  'filter' => true,  'batch' => true,),
+			'gsitemap_cat'            => array (  'title' => 'LAN_CATEGORY', 'tab'=>1, 'type' => 'text',  'data' => 'safestr',  'width' => 'auto',  'batch' => true,  'filter' => true,  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',),
 			'gsitemap_order'          => array (  'title' => LAN_ORDER,  'type' => 'number',  'data' => 'int',  'width' => 'auto',  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',),
 			'gsitemap_img'            => array (  'title' => LAN_IMAGE,  'type' => 'image',  'data' => 'safestr',  'width' => 'auto',  'help' => '',  'readParms' => 'thumb=80x80',  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',),
 			'gsitemap_active'         => array (  'title' => LAN_VISIBILITY,  'type' => 'userclass',  'data' => 'int',  'width' => 'auto',  'filter' => true,  'help' => '',  'readParms' =>  array (),  'writeParms' =>  array (),  'class' => 'left',  'thclass' => 'left',),
diff --git a/e107_tests/tests/unit/e107Test.php b/e107_tests/tests/unit/e107Test.php
index 101178473..fe1eef997 100644
--- a/e107_tests/tests/unit/e107Test.php
+++ b/e107_tests/tests/unit/e107Test.php
@@ -1071,7 +1071,7 @@ class e107Test extends \Codeception\Test\Unit
 			'ADMIN_SORT_ICON'            => "<i class='admin-ui-option fa fa-sort fa-2x fa-fw'></i>",
 			'ADMIN_EXECUTE_ICON'         => "<i class='admin-ui-option fa fa-play fa-2x fa-fw'></i>",
 			'ADMIN_PAGES_ICON'           => "<i class='admin-ui-option fa fa-file fa-2x fa-fw'></i>",
-			'ADMIN_ADD_ICON'             => '<i class=\'S32 e-add-32\'></i>',
+			'ADMIN_ADD_ICON'             => "<i class='admin-ui-option fa fa-plus fa-2x fa-fw'></i>",
 			'ADMIN_INFO_ICON'            => '<i class=\'fa fa-question-circle\'></i>',
 			'ADMIN_CONFIGURE_ICON'       => "<i class='admin-ui-option fa fa-cog fa-2x fa-fw'></i>",
 			'ADMIN_VIEW_ICON'            => "<i class='admin-ui-option fa fa-search fa-2x fa-fw'></i>",