diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php
index 2682e79bf..adc73a2b3 100644
--- a/e107_core/shortcodes/batch/user_shortcodes.php
+++ b/e107_core/shortcodes/batch/user_shortcodes.php
@@ -196,6 +196,7 @@ class user_shortcodes extends e_shortcode
 		{
 			return "<img src='".THEME_ABS."images/user_realname.png' alt='' style='vertical-align:middle;' /> ";
 		}
+		
 		return "<img src='".e_IMAGE_ABS."user_icons/user_realname.png' alt='' style='vertical-align:middle;' /> ";
 	}
 
@@ -218,6 +219,7 @@ class user_shortcodes extends e_shortcode
 		{
 			return "<img src='".THEME_ABS."images/email.png' alt='' style='vertical-align:middle;' /> ";
 		}
+		
 		return "<img src='".e_IMAGE_ABS."generic/email.png' alt='' style='vertical-align:middle;' /> ";
 	}
 
@@ -263,9 +265,60 @@ class user_shortcodes extends e_shortcode
 	}
 
 
-	
-	function sc_user_icon($parm) 
+	/**
+	 * USER_ICON Shortcode
+	 * v2.x usage - always provide $parm to determine type. 
+	 * @param string $parm 
+	 * @example {USER_ICON=email}
+	 * 
+	 */
+	function sc_user_icon($parm='') 
 	{
+		$boot = deftrue('e_BOOTSTRAP');
+		
+		switch ($parm) 
+		{
+			case 'email':
+				return ($boot) ? "<i class='icon-envelope'></i>" : $this->sc_user_email_icon();	
+			break;
+			
+			case 'lastvisit':
+				return ($boot) ? "<i class='icon-time'></i>" : '';		 	
+			break;
+			
+			case 'birthday':
+				return ($boot) ? "<i class='icon-calendar'></i>" : $this->sc_user_birthday_icon();		
+			break;
+
+			case 'level':
+				return ($boot) ? "<i class='icon-signal'></i>" : '';	
+			break;
+			
+			case 'website':
+				return ($boot) ? "<i class='icon-home'></i>" : '';		
+			break;
+			
+			case 'location':
+				return ($boot) ? "<i class='icon-map-marker'></i>" : '';		
+			break;
+			
+			case 'icq':
+				return ($boot) ? "<i class='icon-comment'></i>" : '';		
+			break;	
+				
+			case 'msn':
+				return ($boot) ? "<i class='icon-comment'></i>" : '';		
+			break;		
+
+			default:
+			case 'realname':
+			case 'user':
+				return ($boot) ? "<i class='icon-user'></i>" : $this->sc_user_icon();		
+			break;
+		}
+
+	
+		
 		if(defined("USER_ICON"))
 		{
 			return USER_ICON;
@@ -274,6 +327,7 @@ class user_shortcodes extends e_shortcode
 		{
 			return "<img src='".THEME_ABS."images/user.png' alt='' style='vertical-align:middle;' /> ";
 		}
+		
 		return "<img src='".e_IMAGE_ABS."user_icons/user.png' alt='' style='vertical-align:middle;' /> ";
 	}
 
@@ -342,6 +396,7 @@ class user_shortcodes extends e_shortcode
 		{
 			return "<img src='".THEME_ABS."images/user_birthday.png' alt='' style='vertical-align:middle;' /> ";
 		}
+		
 		return "<img src='".e_IMAGE_ABS."user_icons/user_birthday.png' alt='' style='vertical-align:middle;' /> ";
 	}
 
diff --git a/e107_core/templates/user_template.php b/e107_core/templates/user_template.php
index 1e9513ee0..cd57f6066 100644
--- a/e107_core/templates/user_template.php
+++ b/e107_core/templates/user_template.php
@@ -134,28 +134,28 @@ $USER_FULL_TEMPLATE = "{SETIMAGE: w=250}
 <tr>
 	<td {$span} class='forumheader3 center middle' style='width:20%'>{USER_PICTURE}</td>
 	<td {$main_colspan} class='forumheader3'>
-		<div class='f-left'>{USER_REALNAME_ICON} ".LAN_USER_63."</div>
+		<div class='f-left'>{USER_ICON=realname} ".LAN_USER_63."</div>
 		<div class='f-right right'>{USER_REALNAME}</div>
 	</td>
 </tr>
 
 <tr>
 	<td  {$main_colspan} class='forumheader3'>
-		<div class='f-left'>{USER_EMAIL_ICON} ".LAN_USER_60."</div>
+		<div class='f-left'>{USER_ICON=email} ".LAN_USER_60."</div>
 		<div class='f-right right'>{USER_EMAIL}</div>
 	</td>
 </tr>
 
 <tr>
 	<td  {$main_colspan} class='forumheader3'>
-		<div class='f-left'>".LAN_USER_54.":</div>
+		<div class='f-left'>{USER_ICON=level} ".LAN_USER_54.":</div>
 		<div class='f-right right'>{USER_LEVEL}</div>
 	</td>
 </tr>
 
 <tr>
 	<td  {$main_colspan} class='forumheader3'>
-		<div class='f-left'>".LAN_USER_65.":&nbsp;&nbsp;</div>
+		<div class='f-left'>{USER_ICON=lastvisit} ".LAN_USER_65.":&nbsp;&nbsp;</div>
 		<div class='f-right right'>{USER_LASTVISIT}<br />{USER_LASTVISIT_LAPSE}</div>
 	</td>
 </tr>