diff --git a/view/global.css b/view/global.css
index cea6c51036..e266ceb53e 100644
--- a/view/global.css
+++ b/view/global.css
@@ -248,7 +248,6 @@ span.oembed, h4 {
 }
 
 code {
-  display: block;
   background-color: #eee;
   color: #666;
   padding: 1em;
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index aadbfcd8ee..7da270d3ff 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -7,7 +7,6 @@
 <link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b29ff37477..e327a1ec91 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -41,7 +41,7 @@ img { border :0px; }
 	width: 384px;
 }
 
-code {
+pre code {
 	font-family: Courier, monospace;
 	white-space: pre;
 	display: block;
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index cd55dcadc4..9b48336117 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -96,9 +96,6 @@ blockquote {
     max-height: 0px !important;
     overflow: hidden !important;
 }
-code {
-    white-space: pre-wrap;
-}
 
 /**
  * mobile aside
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 7d6cadea94..9d26a61b45 100644
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -12,7 +12,6 @@
 <link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap.min.css" type="text/css" media="screen"/>
 <link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap-theme.min.css" type="text/css" media="screen"/>
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 87dc372023..bfb078e566 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -469,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 55cb32556b..1dce844acd 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -469,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 4e6c727b09..870fe6ce23 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -469,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 399f12e556..0907237871 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -1860,7 +1860,7 @@ blockquote.shared_content {
 
 #item-delete-selected-icon {}
 
-code {
+pre code {
 	font-family: Courier, monospace;
 	display: block;
 	overflow: auto;
@@ -2024,7 +2024,7 @@ code {
 	float: right;
 }
 
-.wall-item-body code {
+.wall-item-body pre code {
 	font-family: Courier, monospace;
 	display: block;
 	overflow: auto;
diff --git a/view/theme/vier/breathe.css b/view/theme/vier/breathe.css
index ec6d91a569..3403a24b27 100644
--- a/view/theme/vier/breathe.css
+++ b/view/theme/vier/breathe.css
@@ -14,7 +14,7 @@ header #banner #logo-text {
   border-bottom: none !important;
 }
 
-code {
+pre code {
   border: none;
   border-radius: 5px;
 }
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 572be5e18f..6c4f2b20f3 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -323,7 +323,7 @@ a:hover {
 	/* color: #005c94; */
 	text-decoration: underline;
 }
-code {
+pre code {
 	font-family: Courier, monospace;
 	white-space: pre;
 	display: block;