diff --git a/e107_core/shortcodes/single/email_item.sc b/e107_core/shortcodes/single/email_item.sc
index 52754bfd3..ed82b8f13 100644
--- a/e107_core/shortcodes/single/email_item.sc
+++ b/e107_core/shortcodes/single/email_item.sc
@@ -1,16 +1,27 @@
+//<?php
+
 if (!check_class(varset($pref['email_item_class'],e_UC_MEMBER)))
 {
 	return '';
 }
 
-if (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL)) 
+
+$parms = explode("^",$parm);
+
+if(deftrue('BOOTSTRAP'))
+{
+	$img = "<i class='icon-envelope'></i>";	
+}
+elseif (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL)) 
 {
 	$icon = THEME_ABS."images/".ICONMAIL;
+	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' />";
 }
 else
 {
 	$icon = e_IMAGE_ABS."generic/email.png";
+	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' />";
 }
-$parms = explode("^",$parm);
+
 // message^source^other_parms
-return "<a href='".e_HTTP."email.php?{$parms[1]}'><img src='".$icon."' style='border:0' alt='{$parms[0]}' title='{$parms[0]}'/></a>";
+return "<a href='".e_HTTP."email.php?{$parms[1]}' title=\"".$parms[0]."\" >".$img."</a>";
diff --git a/e107_core/shortcodes/single/print_item.sc b/e107_core/shortcodes/single/print_item.sc
index ba4b4b307..80f03ad6b 100644
--- a/e107_core/shortcodes/single/print_item.sc
+++ b/e107_core/shortcodes/single/print_item.sc
@@ -1,12 +1,23 @@
+//<?php
 
 
-if (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT))
+$parms = explode("^",$parm);
+
+if(deftrue('BOOTSTRAP'))
+{
+	$img = "<i class='icon-print'></i>"; 
+}
+elseif (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT))
 {
 	$icon = THEME_ABS."images/".ICONPRINT;
+	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}'   />";
 }
 else
 {
 	$icon = e_IMAGE_ABS."generic/printer.png";
+	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}'   />";
 }
-$parms = explode("^",$parm);
-return "<a href='".e_HTTP."print.php?{$parms[1]}'><img src='".$icon."' style='border:0' alt='{$parms[0]}' title='{$parms[0]}' /></a>";
\ No newline at end of file
+
+
+
+return "<a href='".e_HTTP."print.php?{$parms[1]}' title=\"".$parms[0]."\" >".$img."</a>";
\ No newline at end of file