diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index faeb2e051..9e96b39fb 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -785,6 +785,10 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
     top: 0;
     opacity: 0.15;
   }
+  &[href="#"] {
+    color: #444;
+    pointer-events: none;
+  }
 }
 
 .comment-branch .comment-box {
@@ -836,7 +840,8 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
     font-size: 12px;
   }
   .avatar {
-    width: 18px;
+    width: 22px;
+    height: 22px;
     margin-inline-end: 2px !important;
   }
   .content {
@@ -1206,6 +1211,7 @@ input.scroll-box-search, .scroll-box-header-item {
 
 details.section-expander summary {
   border-top: 1px solid #DDD;
+  @include mixins.lightDark(border-color, #DDD, #000);
   font-weight: bold;
   font-size: 12px;
   color: #888;
@@ -1217,4 +1223,5 @@ details.section-expander:open summary {
 }
 details.section-expander {
   border-bottom: 1px solid #DDD;
+  @include mixins.lightDark(border-color, #DDD, #000);
 }
\ No newline at end of file
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index dbdcc0665..621d08f45 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -248,7 +248,7 @@ body.tox-fullscreen, body.markdown-fullscreen {
   z-index: 92;
   pointer-events: all;
   min-width: min(340px, 80vw);
-  background-color: #FFF;
+  @include mixins.lightDark(background-color, #FFF, #222);
   box-shadow: vars.$bs-hover;
   border-radius: 4px;
   overflow: hidden;