diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index df43f2572..9565a6c31 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -2537,7 +2537,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 				$tmp[$c]['text']            = $sc->sc_nav_link_name();
 				$tmp[$c]['description']     = $tp->toHTML($lk['link_description'], '', 'defs');
 				$tmp[$c]['link']            = $sc->sc_nav_link_url(); // $tp->replaceConstants($link,'full');
-				$tmp[$c]['image']           = $sc->sc_nav_link_icon(); // vartrue($lk['link_button']) ? "<img class='icon S16' src='".$tp->replaceConstants($lk['link_button'])."' alt='".$tp->toAttribute($lk['link_description'],'','defs')."' />": '';
+				$tmp[$c]['image']           = $sc->sc_nav_link_icon(['class'=>'icon S16']); // vartrue($lk['link_button']) ? "<img class='icon S16' src='".$tp->replaceConstants($lk['link_button'])."' alt='".$tp->toAttribute($lk['link_description'],'','defs')."' />": '';
 				$tmp[$c]['image_large']     = '';
 				$tmp[$c]['image_src']       = vartrue($lk['link_button']);
 				$tmp[$c]['image_large_src'] = '';
diff --git a/e107_core/shortcodes/batch/navigation_shortcodes.php b/e107_core/shortcodes/batch/navigation_shortcodes.php
index fbe588bd1..8aa2f0f37 100644
--- a/e107_core/shortcodes/batch/navigation_shortcodes.php
+++ b/e107_core/shortcodes/batch/navigation_shortcodes.php
@@ -77,7 +77,7 @@ require_once(__DIR__.'/navigation_shortcodes_legacy.php');
 		/**
 		 * Return the name of the current link
 		 *
-		 * @return string
+		 * @return string|null
 		 * @example {NAV_LINK_NAME}
 		 */
 		function sc_nav_link_name($parm = null)
@@ -256,16 +256,14 @@ require_once(__DIR__.'/navigation_shortcodes_legacy.php');
 				return '';
 			}
 
-			//	if($icon = $tp->toGlyph($this->var['link_button']))
-			//	{
-			//		return $icon;	
-			//	}
-			//	else 
+			$opts = array('fw' => true, 'space' => ' ', 'legacy' => "{e_IMAGE}icons/");
+
+			if(!empty($parm) && is_array($parm))
 			{
-				//$path = e107::getParser()->replaceConstants($this->var['link_button'], 'full', TRUE);	
-				return $tp->toIcon($this->var['link_button'], array('fw' => true, 'space' => ' ', 'legacy' => "{e_IMAGE}icons/"));
-				// return "<img class='icon' src='".$path."' alt=''  />";	
+				$opts = array_merge($opts, $parm);
 			}
+			
+			return $tp->toIcon($this->var['link_button'], $opts);
 
 		}
 
@@ -273,7 +271,7 @@ require_once(__DIR__.'/navigation_shortcodes_legacy.php');
 		/**
 		 * Return the link description of the current link
 		 * @example {NAV_LINK_DESCRIPTION}
-		 * @return string
+		 * @return string|null
 		 */
 		function sc_nav_link_description($parm = null)
 		{
@@ -293,14 +291,14 @@ require_once(__DIR__.'/navigation_shortcodes_legacy.php');
 		/**
 		 * Return the parsed sublinks of the current link
 		 * @example {NAV_LINK_SUB}
-		 * @return string
+		 * @return string|null
 		 */
 		function sc_nav_link_sub($parm = null)
 		{
 
 			if(empty($this->var['link_sub']))
 			{
-				return false;
+				return null;
 			}
 
 			if(is_string($this->var['link_sub'])) // html override option.