diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php
index f0fa64495..e0d4f9eeb 100644
--- a/e107_core/shortcodes/batch/news_shortcodes.php
+++ b/e107_core/shortcodes/batch/news_shortcodes.php
@@ -368,7 +368,7 @@ class news_shortcodes extends e_shortcode
 			
 			$class = varset($parm['class']);
 			
-			return "<a class='e-tip ".$class."' rel='external' href='".e_ADMIN_ABS."newspost.php?action=edit&amp;id=".$this->news_item['news_id']."' title=\"".LAN_EDIT."\">".$adop_icon."</a>\n";
+			return "<a class='e-tip ".$class." hidden-print' rel='external' href='".e_ADMIN_ABS."newspost.php?action=edit&amp;id=".$this->news_item['news_id']."' title=\"".LAN_EDIT."\">".$adop_icon."</a>\n";
 		}
 		else
 		{
diff --git a/e107_handlers/emailprint_class.php b/e107_handlers/emailprint_class.php
index d2789e1c5..56324e6a2 100644
--- a/e107_handlers/emailprint_class.php
+++ b/e107_handlers/emailprint_class.php
@@ -76,13 +76,13 @@ class emailprint
 		{
 			$ico_mail = (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL) ? "<img src='".THEME_ABS."images/".ICONMAIL."'  alt='".LAN_EMAIL_7."'  />" : $genericMail);
 			//TDOD CSS class
-			$text_emailprint .= "<a class='e-tip ".$class."' href='".e_HTTP."email.php?".$email.".".$id."' title='".LAN_EMAIL_7."'>".$ico_mail."</a> ";
+			$text_emailprint .= "<a class='e-tip hidden-print".$class."' href='".e_HTTP."email.php?".$email.".".$id."' title='".LAN_EMAIL_7."'>".$ico_mail."</a> ";
 		}
 		if ($look == 0 || $look == 2) 
 		{
 			$ico_print = (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT) ? "<img src='".THEME_ABS."images/".ICONPRINT."' alt='".LAN_PRINT_1."'  />" : $genericPrint);
 			//TODO CSS class
-			$text_emailprint .= "<a class='e-tip ".$class."' href='".e_HTTP."print.php?".$print.".".$id."' title='".LAN_PRINT_1."'>".$ico_print."</a>";
+			$text_emailprint .= "<a class='e-tip ".$class." hidden-print' href='".e_HTTP."print.php?".$print.".".$id."' title='".LAN_PRINT_1."'>".$ico_print."</a>";
 		}
 		return $text_emailprint;
 	}
diff --git a/print.php b/print.php
index 2b7e2f553..c1cb01782 100644
--- a/print.php
+++ b/print.php
@@ -29,12 +29,18 @@ if ($qs[0] == "") {
 
 $CSS = <<<CSS
 
-	body { background-color: #FFF; color: #000 }
+	body { background: #fff; color: #000 }
 
 @media print {
 
-
-
+	img {
+        display: block;
+    }
+    img, table, ul, ol, .code-snippet {
+        page-break-inside: avoid;
+        page-break-before: auto;
+        page-break-after: auto;
+    }
 
   a[href]:after {
     content: none;