diff --git a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/constants.kt b/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/constants.kt
index 5a0777c0d66f..db62024c5b13 100644
--- a/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/constants.kt
+++ b/java/compiler/charts/src/com/intellij/java/compiler/charts/ui/constants.kt
@@ -27,14 +27,14 @@ object Colors {
   object Test : Block {
     override val ENABLED: JBColor = exact("CompilationCharts.test.enabled")
     override val DISABLED: JBColor = exact("CompilationCharts.test.disabled")
-    override val BORDER: JBColor = exact("CompilationCharts.test.border")
+    override val BORDER: JBColor = exact("CompilationCharts.test.stroke")
     override val SELECTED: JBColor = exact("CompilationCharts.test.selected")
   }
 
   object Production : Block {
     override val ENABLED: JBColor = exact("CompilationCharts.production.enabled")
     override val DISABLED: JBColor = exact("CompilationCharts.production.disabled")
-    override val BORDER: JBColor = exact("CompilationCharts.production.border")
+    override val BORDER: JBColor = exact("CompilationCharts.production.stroke")
     override val SELECTED: JBColor = exact("CompilationCharts.production.selected")
   }
 
@@ -46,12 +46,12 @@ object Colors {
 
   object Memory: Usage {
     override val BACKGROUND: JBColor = exact("CompilationCharts.memory.background")
-    override val BORDER: JBColor = exact("CompilationCharts.memory.border")
+    override val BORDER: JBColor = exact("CompilationCharts.memory.stroke")
   }
 
   object Cpu: Usage {
     override val BACKGROUND: JBColor = exact("CompilationCharts.cpu.background")
-    override val BORDER: JBColor = exact("CompilationCharts.cpu.border")
+    override val BORDER: JBColor = exact("CompilationCharts.cpu.stroke")
   }
 
   val LINE: JBColor = exact("CompilationCharts.lineColor")
diff --git a/platform/platform-resources/src/themes/HighContrast.theme.json b/platform/platform-resources/src/themes/HighContrast.theme.json
index e2d5c7b950bc..ed2b19639be0 100644
--- a/platform/platform-resources/src/themes/HighContrast.theme.json
+++ b/platform/platform-resources/src/themes/HighContrast.theme.json
@@ -605,33 +605,33 @@
       }
     },
     "CompilationCharts": {
-      "background":{
-        "odd": "#F7F8FA",
-        "even": "#EBECF0",
-        "default": "#F7F8FA"
+      "background": {
+        "odd": "#000000",
+        "even": "#1A1A1A",
+        "default": "#000000"
       },
       "test": {
-        "enabled": "#89C398",
-        "disabled": "#E3F7E7",
-        "border": "#369650",
-        "selected": "#55A76A"
+        "enabled": "#3E8E41",
+        "disabled": "#2B5931",
+        "stroke": "#6FAF6D",
+        "selected": "#5E9E57"
       },
       "production": {
-        "enabled": "#88ADF7",
-        "disabled": "#D4E2FF",
-        "border": "#3574F0",
-        "selected": "#4682FA"
+        "enabled": "#3F88C5",
+        "disabled": "#2D5D87",
+        "stroke": "#6EA7C9",
+        "selected": "#6EB8DF"
       },
       "memory": {
-        "background": "#C2D6FC",
-        "border": "#4682FA"
+        "background": "#3F88C5",
+        "stroke": "#6EB8DF"
       },
       "cpu": {
-        "background": "#C5E5CC",
-        "border": "#89C398"
+        "background": "#3E8E41",
+        "stroke": "#5E9E57"
       },
-      "lineColor": "#D3D5DB",
-      "textColor": "#27282E"
+      "lineColor": "#FFFFFF",
+      "textColor": "#FFFFFF"
     },
     "FlameGraph.Tooltip": {
       "scaleBackground": "#555454",
diff --git a/platform/platform-resources/src/themes/darcula.theme.json b/platform/platform-resources/src/themes/darcula.theme.json
index ea8cc2f4f882..de20d7030628 100644
--- a/platform/platform-resources/src/themes/darcula.theme.json
+++ b/platform/platform-resources/src/themes/darcula.theme.json
@@ -963,24 +963,24 @@
       "test": {
         "enabled": "#375239",
         "disabled": "#273828",
-        "border": "#57965C",
+        "stroke": "#57965C",
         "selected": "#73BD79"
       },
       "production": {
         "enabled": "#2E436E",
         "disabled": "#25324D",
-        "border": "#3574F0",
+        "stroke": "#3574F0",
         "selected": "#548AF7"
       },
       "memory": {
         "background": "#2E436E",
-        "border": "#548AF7"
+        "stroke": "#548AF7"
       },
       "cpu": {
         "background": "#375239",
-        "border": "#57965C"
+        "stroke": "#57965C"
       },
-      "lineColor": "#393B40",
+      "lineColor": "#1E1F22",
       "textColor": "#B4B8BF"
     },
     "FlameGraph.Tooltip": {
diff --git a/platform/platform-resources/src/themes/expUI/expUI_dark.theme.json b/platform/platform-resources/src/themes/expUI/expUI_dark.theme.json
index 565bd7798631..76513ce556af 100644
--- a/platform/platform-resources/src/themes/expUI/expUI_dark.theme.json
+++ b/platform/platform-resources/src/themes/expUI/expUI_dark.theme.json
@@ -1048,24 +1048,24 @@
       "test": {
         "enabled": "Green3",
         "disabled": "Green2",
-        "border": "Green6",
+        "stroke": "Green6",
         "selected": "Green8"
       },
       "production": {
         "enabled": "Blue2",
         "disabled": "Blue1",
-        "border": "Blue6",
+        "stroke": "Blue6",
         "selected": "Blue8"
       },
       "memory": {
         "background": "Blue2",
-        "border": "Blue8"
+        "stroke": "Blue8"
       },
       "cpu": {
         "background": "Green3",
-        "border": "Green6"
+        "stroke": "Green6"
       },
-      "lineColor": "Gray3",
+      "lineColor": "Gray1",
       "textColor": "Gray10"
     },
     "FlameGraph.Tooltip": {
diff --git a/platform/platform-resources/src/themes/expUI/expUI_light.theme.json b/platform/platform-resources/src/themes/expUI/expUI_light.theme.json
index 2e187f81209f..924b7fc081ae 100644
--- a/platform/platform-resources/src/themes/expUI/expUI_light.theme.json
+++ b/platform/platform-resources/src/themes/expUI/expUI_light.theme.json
@@ -1074,24 +1074,24 @@
       "test": {
         "enabled": "Green7",
         "disabled": "Green10",
-        "border": "Green5",
+        "stroke": "Green5",
         "selected": "Green6"
       },
       "production": {
         "enabled": "Blue8",
         "disabled": "Blue11",
-        "border": "Blue4",
+        "stroke": "Blue4",
         "selected": "Blue5"
       },
       "memory": {
         "background": "Blue10",
-        "border": "Blue5"
+        "stroke": "Blue5"
       },
       "cpu": {
         "background": "Green9",
-        "border": "Green7"
+        "stroke": "Green7"
       },
-      "lineColor": "Gray10",
+      "lineColor": "Gray12",
       "textColor": "Gray2"
     },
     "FlameGraph.Tooltip": {
diff --git a/platform/platform-resources/src/themes/intellijlaf.theme.json b/platform/platform-resources/src/themes/intellijlaf.theme.json
index 6cf20f974017..ab4b52964226 100644
--- a/platform/platform-resources/src/themes/intellijlaf.theme.json
+++ b/platform/platform-resources/src/themes/intellijlaf.theme.json
@@ -1295,24 +1295,24 @@
       "test": {
         "enabled": "#89C398",
         "disabled": "#E3F7E7",
-        "border": "#369650",
+        "stroke": "#369650",
         "selected": "#55A76A"
       },
       "production": {
         "enabled": "#88ADF7",
         "disabled": "#D4E2FF",
-        "border": "#3574F0",
+        "stroke": "#3574F0",
         "selected": "#4682FA"
       },
       "memory": {
         "background": "#C2D6FC",
-        "border": "#4682FA"
+        "stroke": "#4682FA"
       },
       "cpu": {
         "background": "#C5E5CC",
-        "border": "#89C398"
+        "stroke": "#89C398"
       },
-      "lineColor": "#D3D5DB",
+      "lineColor": "#EBECF0",
       "textColor": "#27282E"
     },
     "FlameGraph.Tooltip": {