diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index faf43aad0..d9088c939 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -115,11 +115,6 @@ body {
   }
 }
 
-blockquote {
-  /* 13px left is intentional here to properly align with post quotes */
-  padding: 10px 4px 4px 13px;
-}
-
 .topic-statuses {
   float: left;
   margin: 0 3px 0 0;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 474301516..8e646f238 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -665,7 +665,7 @@ iframe {
 
 /* solo quotes */
 blockquote {
-  /* inherit only the default top and bottom margins here */
+  /* leave browser defaults for top and bottom here */
   margin-left: 0;
   margin-right: 0;
   padding: 12px;
@@ -675,10 +675,10 @@ blockquote {
 // we assume blockquotes have their own margins, so all blockquotes
 // will remove margins from first (top) and last (bottom) child elements
 blockquote > *:first-child {
-  margin-top: 0;
+  margin-top: 0 !important;
 }
 blockquote > *:last-child {
-  margin-bottom: 0;
+  margin-bottom: 0 !important;
 }
 
 
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 5491019aa..55a5ef2a8 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -482,10 +482,10 @@ blockquote {
 // we assume blockquotes have their own margins, so all blockquotes
 // will remove margins from first (top) and last (bottom) child elements
 blockquote > *:first-child {
-  margin-top: 0;
+  margin-top: 0 !important;
 }
 blockquote > *:last-child {
-  margin-bottom: 0;
+  margin-bottom: 0 !important;
 }
 
 .quote-controls {