diff --git a/resources/assets/stylesheets/scss/blockquote.scss b/resources/assets/stylesheets/scss/blockquote.scss
deleted file mode 100644
index 40643ba5c80f6746ce55e9ef8bd2677eacf4f562..0000000000000000000000000000000000000000
--- a/resources/assets/stylesheets/scss/blockquote.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-blockquote {
-    background-color: $dark-gray-color-5;
-    border-left: 3px solid $base-color;
-    padding: 4px 10px;
-    margin: 0 0 8px;
-    color: black;
-    > .author {
-        margin-bottom: 4px;
-        color: black;
-        font-weight: 600;
-    }
-    blockquote {
-        background-color: white;
-        blockquote {
-            background-color: $dark-gray-color-5;
-            blockquote {
-                background-color: white;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/resources/assets/stylesheets/scss/blubber.scss b/resources/assets/stylesheets/scss/blubber.scss
index c9040ea2fbd3260b73c76bb81495d48c61de6e2c..49eee3cb865a1e990fc4e138ed469e56ff37cc87 100644
--- a/resources/assets/stylesheets/scss/blubber.scss
+++ b/resources/assets/stylesheets/scss/blubber.scss
@@ -207,6 +207,9 @@
                     > .name {
                         display: none;
                     }
+                    blockquote {
+                        background-color: rgba(255, 255, 255, 0.1);
+                    }
                 }
                 > .avatar {
                     display: none;
diff --git a/resources/assets/stylesheets/studip.less b/resources/assets/stylesheets/studip.less
index 3fa0b8d055b8068d349dbcfd5431f71e2026c6cb..07550d49205ddd729a80ee093c480d1e0ddcb67e 100644
--- a/resources/assets/stylesheets/studip.less
+++ b/resources/assets/stylesheets/studip.less
@@ -108,6 +108,25 @@ ul + br, table + br {
     display: none;
 }
 
+blockquote {
+    border-left: 3px solid @brand-color-lighter;
+    padding: 5px;
+    margin: 8px;
+    padding-left: 8px;
+    margin-left: 0px;
+    background-color: rgba(0,0,0,0.05);
+    > .author {
+    	background-color: @brand-color-lighter;
+        padding: 4px;
+        margin-left: -10px;
+        padding-left: 15px;
+        margin-right: -5px;
+        color: white;
+        margin-top: -5px;
+        margin-bottom: 5px;
+    }
+}
+
 dd { margin-left: 1.5em; }
 
 input.placeholder { opacity: 0.7; }
diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss
index 931c4d0b264ef7a8a3ba6a6c20438207450c92e8..62bc7b59ca9c451205f4a39bd91a1bcf09687373 100644
--- a/resources/assets/stylesheets/studip.scss
+++ b/resources/assets/stylesheets/studip.scss
@@ -12,7 +12,6 @@
 @import "scss/admin-courses";
 @import "scss/admission";
 @import "scss/avatar";
-@import "scss/blockquote";
 @import "scss/blubber";
 @import "scss/contentbar";
 @import "scss/contents";