diff --git a/web_src/css/features/dropzone.css b/web_src/css/features/dropzone.css
index 0ce067ef30..16b3faf737 100644
--- a/web_src/css/features/dropzone.css
+++ b/web_src/css/features/dropzone.css
@@ -51,3 +51,13 @@
 .dropzone .dz-preview:hover .dz-image img {
   filter: opacity(0.5) !important;
 }
+
+.dropzone-attachments .divider {
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+}
+
+.dropzone-attachments .grid,
+.dropzone-attachments .thumbnails {
+  padding: .5rem 1rem;
+}
diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css
index 00283dd0a2..5eef220962 100644
--- a/web_src/css/markup/content.css
+++ b/web_src/css/markup/content.css
@@ -3,6 +3,7 @@
   font-size: 16px;
   line-height: 1.5 !important;
   word-wrap: break-word;
+  background: var(--color-box-body);
 }
 
 .markup.ui.segment {
@@ -308,6 +309,7 @@
 .markup img {
   max-width: 100%;
   box-sizing: initial;
+  background: var(--color-box-body);
 }
 
 .markup img[align="right"] {
diff --git a/web_src/css/repository.css b/web_src/css/repository.css
index abc812b5b4..eb555abec8 100644
--- a/web_src/css/repository.css
+++ b/web_src/css/repository.css
@@ -2740,6 +2740,12 @@
   width: 100% !important;
   max-width: 100% !important;
   margin: 0 !important;
+  padding: 0 !important;
+}
+
+.comment-body .markup {
+  padding: 1em;
+  border-radius: 0 0 var(--border-radius) var(--border-radius); /* don't render outside box */
 }
 
 .edit-label.modal .form .column,