From e5dd49b5e3d2964bd1d690445a2174b5c22fe1e8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 2 Oct 2017 14:52:18 -0400
Subject: [PATCH] CRM-21195 - Menu markup tweaks

---
 CRM/Core/BAO/Navigation.php | 2 +-
 css/civicrmNavigation.css   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php
index a678648933..f549621bb9 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="menu-item-icon %s"></span>', $value['attributes']['icon']);
+      $menuIcon = sprintf('<i class="%s"></i>', $value['attributes']['icon']);
       $name = $menuIcon . $name;
     }
 
diff --git a/css/civicrmNavigation.css b/css/civicrmNavigation.css
index d3c94e4867..694aad4ea0 100644
--- a/css/civicrmNavigation.css
+++ b/css/civicrmNavigation.css
@@ -120,7 +120,7 @@ img.menu-item-arrow{
   right: 4px;
   top: 8px;
 }
-.menu-item-icon {
+#civicrm-menu i {
   margin-right: 5px;
 }
 li.menu-separator{
-- 
2.25.1