Merge remote-tracking branch 'upstream/pull/4681'

diff --combined app/assets/stylesheets/common.scss
index 3e80e66f5dde14f0dbbedf6e7614a4d3e0884ed2,6ec251a179b52a5048f64afbf977d80df12f7190..1ccdc7871454547b94623c1f393e469a1c222e1f
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -383,6 -383,11 +383,6 @@@ body.small-nav 
      width: 250px;
      height: 100%;
      overflow: auto;
 -
 -    .section {
 -      border-bottom: 1px solid $grey;
 -      padding: $spacer;
 -    }
    }
  }
  
@@@ -1031,4 -1036,17 +1031,17 @@@ div.secondary-actions 
    margin-bottom: -1px;
  }
  
+ /* Rules for traces */
+ 
+ img.trace_image {
+   mix-blend-mode: darken;
+ }
+ 
+ @include color-mode(dark) {
+   img.trace_image {
+     filter: invert(1);
+     mix-blend-mode: lighten;
+   }
+ }
+ 
  @import 'browse';