diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less
--- a/rhodecode/public/css/code-block.less
+++ b/rhodecode/public/css/code-block.less
@@ -494,16 +494,29 @@ div.codeblock {
 }
 
 .code-highlighttable,
-div.codeblock .code-body table {
-    width: 0 !important;
-    border: 0px !important;
-    margin: 0;
-    letter-spacing: normal;
+div.codeblock {
+
+    .code-body .markdown-block table {
+        border-collapse: collapse;
+
+        th,
+        td {
+            padding: .5em !important;
+            border: @border-thickness solid @border-default-color !important;
+        }
+    }
 
-
-    td {
+    .code-body table {
+        width: 0 !important;
         border: 0px !important;
-        vertical-align: top;
+        margin: 0;
+        letter-spacing: normal;
+    
+    
+        td {
+            border: 0px !important;
+            vertical-align: top;
+        }
     }
 }
 
diff --git a/rhodecode/public/css/legacy_code_styles.less b/rhodecode/public/css/legacy_code_styles.less
--- a/rhodecode/public/css/legacy_code_styles.less
+++ b/rhodecode/public/css/legacy_code_styles.less
@@ -177,8 +177,7 @@ div.markdown-block p,
 div.markdown-block blockquote,
 div.markdown-block dl,
 div.markdown-block li,
-div.markdown-block table,
-div.markdown-block pre {
+div.markdown-block table {
     margin: 15px 0 !important;
     margin: 3px 0px 13px 0px !important;
     color: #424242 !important;
@@ -189,6 +188,17 @@ div.markdown-block pre {
     line-height: 140% !important;
 }
 
+div.markdown-block pre {
+  margin: 15px 0 !important;
+  margin: 3px 0px 13px 0px !important;
+  padding: .5em;
+  color: #424242 !important;
+  font-size: 13px !important;
+  overflow: visible !important;
+  line-height: 140% !important;
+  background-color: @grey7;
+}
+
 div.markdown-block img {
         padding: 4px;
         border: @border-thickness solid @grey5;
@@ -265,7 +275,8 @@ div.markdown-block code {
 div.markdown-block pre {
     border: @border-thickness solid @grey5;
     overflow: auto;
-    padding: 4px 8px;
+    padding: .5em;
+    background-color: @grey7;
 }
 
 div.markdown-block pre > code {