From 40558eeedba2b4bcebc32699995df9ed763cd4d1 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 21 Apr 2017 12:13:12 -0700
Subject: [PATCH] Fixes #2588 - admin-menu icon.

---
 e107_handlers/admin_ui.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index aceffa02d..cc1d97931 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -1578,8 +1578,17 @@ class e_admin_dispatcher
 		if(!$selected) $selected = $request->getMode().'/'.$request->getAction();
 		$selected = vartrue($this->adminMenuAliases[$selected], $selected);
 
-		$icon = (deftrue('e_CURRENT_PLUGIN')) ? e107::getPlugin()->getIcon(e_CURRENT_PLUGIN, 32, '') : e107::getParser()->toIcon($this->adminMenuIcon);
+		$icon = '';
 
+		if(!empty($this->adminMenuIcon))
+		{
+			$icon = e107::getParser()->toIcon($this->adminMenuIcon);
+		}
+		elseif(deftrue('e_CURRENT_PLUGIN'))
+		{
+			$icon = e107::getPlugin()->getIcon(e_CURRENT_PLUGIN, 32, '');
+		}
+		
 		return e107::getNav()->admin($icon."<span>".$this->menuTitle."</span>", $selected, $var);
 	}