diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/generic/files.scss
index 1412277ffb..e2b0ef0c5e 100644
--- a/app/assets/stylesheets/generic/files.scss
+++ b/app/assets/stylesheets/generic/files.scss
@@ -60,7 +60,6 @@
 
       .highlight {
         margin-bottom: 9px;
-        @include border-radius(4px);
 
         > pre {
           margin: 0;
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss
index c06bed3c21..815cf367ae 100644
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -1,14 +1,8 @@
 .white {
-  background-color: #fff;
-
   .line.hll {
     background: #FFA;
   }
 
-  .highlight{
-    border-left: 1px solid #eee;
-  }
-
   pre {
     background-color: #fff;
     color: #333;
@@ -179,8 +173,16 @@
   @include box-shadow(0 5px 15px #000);
 }
 
-.wiki, .note-body {
-  .highlight {
-    border: 1px solid #DDD;
+.file-content {
+  &.code .white {
+    .highlight {
+      border-left: 1px solid #eee;
+    }
+  }
+
+  &.wiki .white {
+    .highlight, pre, .hljs {
+      background: #F9F9F9;
+    }
   }
 }