From 507614e91619f57cfa98f12db7893bf84cd5e931 Mon Sep 17 00:00:00 2001
From: Omar abu hussein <opetmar91@gmail.com>
Date: Mon, 2 Oct 2017 10:55:39 +0100
Subject: [PATCH] CRM-21195: Improving menu item icon markup

---
 CRM/Core/BAO/Navigation.php | 2 +-
 css/civicrmNavigation.css   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php
index b499f0ceb7..a678648933 100644
--- a/CRM/Core/BAO/Navigation.php
+++ b/CRM/Core/BAO/Navigation.php
@@ -528,7 +528,7 @@ FROM civicrm_navigation WHERE domain_id = $domainID {$whereClause} ORDER BY pare
     }
 
     if (!empty($value['attributes']['icon'])) {
-      $menuIcon = sprintf('<span class="%s"></span>&nbsp;', $value['attributes']['icon']);
+      $menuIcon = sprintf('<span class="menu-item-icon %s"></span>', $value['attributes']['icon']);
       $name = $menuIcon . $name;
     }
 
diff --git a/css/civicrmNavigation.css b/css/civicrmNavigation.css
index 18bc29f25c..d3c94e4867 100644
--- a/css/civicrmNavigation.css
+++ b/css/civicrmNavigation.css
@@ -120,6 +120,9 @@ img.menu-item-arrow{
   right: 4px;
   top: 8px;
 }
+.menu-item-icon {
+  margin-right: 5px;
+}
 li.menu-separator{
   border-bottom: 1px solid #000;
   font-size: 0; /* for ie */
-- 
2.25.1