diff --git a/colorSchemes/src/colorSchemes/Darcula.xml b/colorSchemes/src/colorSchemes/Darcula.xml
index 2665674ca240..9691e1db6a5e 100644
--- a/colorSchemes/src/colorSchemes/Darcula.xml
+++ b/colorSchemes/src/colorSchemes/Darcula.xml
@@ -553,9 +553,9 @@
     </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_COLOR" value="dc3737" />
+        <option name="EFFECT_COLOR" value="bc3f3c" />
         <option name="EFFECT_TYPE" value="2" />
-        <option name="ERROR_STRIPE_COLOR" value="dc3737" />
+        <option name="ERROR_STRIPE_COLOR" value="bc3f3c" />
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
@@ -578,9 +578,9 @@
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_COLOR" value="fa8c00" />
+        <option name="EFFECT_COLOR" value="f49810" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="ERROR_STRIPE_COLOR" value="fa8c00" />
+        <option name="ERROR_STRIPE_COLOR" value="f49810" />
       </value>
     </option>
     <option name="GRADLE_CHANGE_CONFLICT">
@@ -1565,9 +1565,9 @@
     </option>
     <option name="WARNING_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="ffd900" />
+        <option name="BACKGROUND" value="52503a" />
         <option name="EFFECT_TYPE" value="2" />
-        <option name="ERROR_STRIPE_COLOR" value="ffd900" />
+        <option name="ERROR_STRIPE_COLOR" value="8c8c00" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
diff --git a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java b/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
index d77144064518..75a2eca11e43 100644
--- a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
+++ b/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
@@ -38,7 +38,7 @@ public class HighlightDisplayLevel {
                                                                                                         createIconByMask(CodeInsightColors.GENERIC_SERVER_ERROR_OR_WARNING));
   public static final HighlightDisplayLevel ERROR = new HighlightDisplayLevel(HighlightSeverity.ERROR, createIconByMask(CodeInsightColors.ERRORS_ATTRIBUTES));
   public static final HighlightDisplayLevel WARNING = new HighlightDisplayLevel(HighlightSeverity.WARNING, createIconByMask(CodeInsightColors.WARNINGS_ATTRIBUTES));
-  public static final HighlightDisplayLevel DO_NOT_SHOW = new HighlightDisplayLevel(HighlightSeverity.INFORMATION, createIconByMask(new Color(110, 180, 65)));
+  public static final HighlightDisplayLevel DO_NOT_SHOW = new HighlightDisplayLevel(HighlightSeverity.INFORMATION, createIconByMask(new Color(30, 160, 0)));
   /**
    * use #WEAK_WARNING instead
    */
diff --git a/platform/icons/src/general/errorMask.png b/platform/icons/src/general/errorMask.png
index 38690e9cdd77..c9e0305c1b3c 100644
Binary files a/platform/icons/src/general/errorMask.png and b/platform/icons/src/general/errorMask.png differ
diff --git a/platform/icons/src/general/errorMask@2x.png b/platform/icons/src/general/errorMask@2x.png
deleted file mode 100644
index 560f53709f24..000000000000
Binary files a/platform/icons/src/general/errorMask@2x.png and /dev/null differ
diff --git a/platform/icons/src/general/errorMask_dark.png b/platform/icons/src/general/errorMask_dark.png
new file mode 100644
index 000000000000..d2c4cfda28cf
Binary files /dev/null and b/platform/icons/src/general/errorMask_dark.png differ
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/MultiScopeSeverityIcon.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/MultiScopeSeverityIcon.java
index 360138095d04..099dbb622261 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/MultiScopeSeverityIcon.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/MultiScopeSeverityIcon.java
@@ -62,7 +62,6 @@ public class MultiScopeSeverityIcon implements Icon {
 
     final Collection<HighlightSeverity> values = myScopeToAverageSeverityMap.values();
     int idx = 0;
-    ((Graphics2D)g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
     for (final HighlightSeverity severity : values) {
       final Icon icon = HighlightDisplayLevel.find(severity).getIcon();
       g.setColor(icon instanceof HighlightDisplayLevel.SingleColorIconWithMask ?
@@ -71,6 +70,7 @@ public class MultiScopeSeverityIcon implements Icon {
       g.fillRect(x, j, partWidth, getIconHeight());
       idx++;
     }
+    g.drawImage(HighlightDisplayLevel.ImageHolder.ourErrorMaskImage, i, j, null);
   }
 
   @Override
diff --git a/platform/platform-resources/src/DefaultColorSchemesManager.xml b/platform/platform-resources/src/DefaultColorSchemesManager.xml
index 6dce76772a7f..e0737bb3195d 100644
--- a/platform/platform-resources/src/DefaultColorSchemesManager.xml
+++ b/platform/platform-resources/src/DefaultColorSchemesManager.xml
@@ -239,9 +239,9 @@
         <value>
           <option name="FOREGROUND"/>
           <option name="BACKGROUND"/>
-          <option name="EFFECT_COLOR" value="dc3737"/>
+          <option name="EFFECT_COLOR" value="ff0000"/>
           <option name="EFFECT_TYPE" value="2"/>
-          <option name="ERROR_STRIPE_COLOR" value="dc3737" />
+          <option name="ERROR_STRIPE_COLOR" value="ff0000" />
         </value>
       </option>
       <option name="BLINKING_HIGHLIGHTS_ATTRIBUTES">
@@ -281,19 +281,19 @@
       <option name="WARNING_ATTRIBUTES">
         <value>
           <option name="FOREGROUND"/>
-          <option name="BACKGROUND" value="ffd900"/>
+          <option name="BACKGROUND" value="f6ebbc"/>
           <option name="EFFECT_COLOR"/>
           <option name="EFFECT_TYPE" value="1"/>
-          <option name="ERROR_STRIPE_COLOR" value="ffd900" />
+          <option name="ERROR_STRIPE_COLOR" value="ffff00" />
         </value>
       </option>
       <option name="GENERIC_SERVER_ERROR_OR_WARNING">
         <value>
           <option name="FOREGROUND"/>
           <option name="BACKGROUND"/>
-          <option name="EFFECT_COLOR" value="fa8c00"/>
+          <option name="EFFECT_COLOR" value="f49810"/>
           <option name="EFFECT_TYPE" value="2"/>
-          <option name="ERROR_STRIPE_COLOR" value="fa8c00" />
+          <option name="ERROR_STRIPE_COLOR" value="f49810" />
         </value>
       </option>
       <option name="DUPLICATE_FROM_SERVER">