diff --git a/platform/icons/src/debugger/db_verified_breakpoint.png b/platform/icons/src/debugger/db_pending_breakpoint.png
similarity index 100%
rename from platform/icons/src/debugger/db_verified_breakpoint.png
rename to platform/icons/src/debugger/db_pending_breakpoint.png
diff --git a/platform/icons/src/debugger/db_pending_breakpoint.svg b/platform/icons/src/debugger/db_pending_breakpoint.svg
deleted file mode 100644
index 4e6596a4a678..000000000000
--- a/platform/icons/src/debugger/db_pending_breakpoint.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
-  <defs>
-    <circle id="db_pending_breakpoint-a" cx="6" cy="6" r="5.5"/>
-  </defs>
-  <g fill="none" fill-rule="evenodd">
-    <use fill="#E5A0A0" xlink:href="#db_pending_breakpoint-a"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/debugger/db_pending_breakpoint_dark.svg b/platform/icons/src/debugger/db_pending_breakpoint_dark.svg
deleted file mode 100644
index 92c7257c6652..000000000000
--- a/platform/icons/src/debugger/db_pending_breakpoint_dark.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
-  <defs>
-    <circle id="db_pending_breakpoint_dark-a" cx="6" cy="6" r="5.5"/>
-  </defs>
-  <g fill="none" fill-rule="evenodd">
-    <use fill="#814948" xlink:href="#db_pending_breakpoint_dark-a"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/debugger/db_verified_field_breakpoint.png b/platform/icons/src/debugger/db_pending_field_breakpoint.png
similarity index 100%
rename from platform/icons/src/debugger/db_verified_field_breakpoint.png
rename to platform/icons/src/debugger/db_pending_field_breakpoint.png
diff --git a/platform/icons/src/debugger/db_pending_field_breakpoint.svg b/platform/icons/src/debugger/db_pending_field_breakpoint.svg
deleted file mode 100644
index f279d35d88af..000000000000
--- a/platform/icons/src/debugger/db_pending_field_breakpoint.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
-  <defs>
-    <path id="db_pending_field_breakpoint-a" d="M1.54849275e-11,6 C1.06550595,3.63505267 3.35165999,2 6,2 C8.64834001,2 10.9344941,3.63505267 12,6 C10.9344941,8.36494733 8.64834001,10 6,10 C3.35165999,10 1.06550595,8.36494733 1.11676587e-11,6 Z M6,9 C7.65685425,9 9,7.65685425 9,6 C9,4.34314575 7.65685425,3 6,3 C4.34314575,3 3,4.34314575 3,6 C3,7.65685425 4.34314575,9 6,9 Z M6,8 C4.8954305,8 4,7.1045695 4,6 C4,4.8954305 4.8954305,4 6,4 C7.1045695,4 8,4.8954305 8,6 C8,7.1045695 7.1045695,8 6,8 Z"/>
-  </defs>
-  <g fill="none" fill-rule="evenodd">
-    <use fill="#E5A0A0" xlink:href="#db_pending_field_breakpoint-a"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/debugger/db_pending_field_breakpoint_dark.svg b/platform/icons/src/debugger/db_pending_field_breakpoint_dark.svg
deleted file mode 100644
index a3678ab724d9..000000000000
--- a/platform/icons/src/debugger/db_pending_field_breakpoint_dark.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
-  <defs>
-    <path id="db_pending_field_breakpoint_dark-a" d="M1.54849275e-11,6 C1.06550595,3.63505267 3.35165999,2 6,2 C8.64834001,2 10.9344941,3.63505267 12,6 C10.9344941,8.36494733 8.64834001,10 6,10 C3.35165999,10 1.06550595,8.36494733 1.11676587e-11,6 Z M6,9 C7.65685425,9 9,7.65685425 9,6 C9,4.34314575 7.65685425,3 6,3 C4.34314575,3 3,4.34314575 3,6 C3,7.65685425 4.34314575,9 6,9 Z M6,8 C4.8954305,8 4,7.1045695 4,6 C4,4.8954305 4.8954305,4 6,4 C7.1045695,4 8,4.8954305 8,6 C8,7.1045695 7.1045695,8 6,8 Z"/>
-  </defs>
-  <g fill="none" fill-rule="evenodd">
-    <use fill="#814948" xlink:href="#db_pending_field_breakpoint_dark-a"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/debugger/db_verified_method_breakpoint.png b/platform/icons/src/debugger/db_pending_method_breakpoint.png
similarity index 100%
rename from platform/icons/src/debugger/db_verified_method_breakpoint.png
rename to platform/icons/src/debugger/db_pending_method_breakpoint.png
diff --git a/platform/icons/src/debugger/db_pending_method_breakpoint.svg b/platform/icons/src/debugger/db_pending_method_breakpoint.svg
deleted file mode 100644
index 1c7f85e543a6..000000000000
--- a/platform/icons/src/debugger/db_pending_method_breakpoint.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
-  <defs>
-    <polygon id="db_pending_method_breakpoint-a" points="1.757 1.757 10.243 1.757 10.243 10.243 1.757 10.243"/>
-  </defs>
-  <g fill="none" fill-rule="evenodd">
-    <use fill="#E5A0A0" transform="rotate(45 6 6)" xlink:href="#db_pending_method_breakpoint-a"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/debugger/db_pending_method_breakpoint_dark.svg b/platform/icons/src/debugger/db_pending_method_breakpoint_dark.svg
deleted file mode 100644
index 3595e98be4c9..000000000000
--- a/platform/icons/src/debugger/db_pending_method_breakpoint_dark.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
-  <defs>
-    <polygon id="db_pending_method_breakpoint_dark-a" points="1.757 1.757 10.243 1.757 10.243 10.243 1.757 10.243"/>
-  </defs>
-  <g fill="none" fill-rule="evenodd">
-    <use fill="#814948" transform="rotate(45 6 6)" xlink:href="#db_pending_method_breakpoint_dark-a"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/debugger/db_verified_breakpoint.svg b/platform/icons/src/debugger/db_verified_breakpoint.svg
new file mode 100644
index 000000000000..86b1a2b66f39
--- /dev/null
+++ b/platform/icons/src/debugger/db_verified_breakpoint.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#DB5860" d="M8.37318536,1.03693453 L7.47951278,1.8456667 L6.66900324,1.11219322 C6.48513239,0.945798643 6.24599493,0.853658299 5.99801179,0.853658299 L5,0.853658299 C4.44771525,0.853658299 4,1.30137355 4,1.8536583 L4,2.7568126 C4,3.03934809 4.11951834,3.30869878 4.32900855,3.49827768 L6.80779591,5.74146508 C7.18872475,6.08618798 7.7688909,6.08617705 8.14980675,5.74143981 L10.8111692,3.33284812 C11.2500442,4.12282749 11.5,5.0322236 11.5,6 C11.5,9.03756612 9.03756612,11.5 6,11.5 C2.96243388,11.5 0.5,9.03756612 0.5,6 C0.5,2.96243388 2.96243388,0.5 6,0.5 C6.84986038,0.5 7.65470015,0.692756159 8.37318536,1.03693453 Z"/>
+    <polygon fill="#231F20" fill-rule="nonzero" points="12 .908 7.479 5 5 2.757 5 1.854 5.998 1.854 7.48 3.194 11.009 0 12 0"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/debugger/db_verified_breakpoint_dark.svg b/platform/icons/src/debugger/db_verified_breakpoint_dark.svg
new file mode 100644
index 000000000000..b3281821507d
--- /dev/null
+++ b/platform/icons/src/debugger/db_verified_breakpoint_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#C75450" d="M8.37318536,1.03693453 L7.47951278,1.8456667 L6.66900324,1.11219322 C6.48513239,0.945798643 6.24599493,0.853658299 5.99801179,0.853658299 L5,0.853658299 C4.44771525,0.853658299 4,1.30137355 4,1.8536583 L4,2.7568126 C4,3.03934809 4.11951834,3.30869878 4.32900855,3.49827768 L6.80779591,5.74146508 C7.18872475,6.08618798 7.7688909,6.08617705 8.14980675,5.74143981 L10.8111692,3.33284812 C11.2500442,4.12282749 11.5,5.0322236 11.5,6 C11.5,9.03756612 9.03756612,11.5 6,11.5 C2.96243388,11.5 0.5,9.03756612 0.5,6 C0.5,2.96243388 2.96243388,0.5 6,0.5 C6.84986038,0.5 7.65470015,0.692756159 8.37318536,1.03693453 Z"/>
+    <polygon fill="#AFB1B3" fill-rule="nonzero" points="12 .908 7.479 5 5 2.757 5 1.854 5.998 1.854 7.48 3.194 11.009 0 12 0"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/debugger/db_verified_field_breakpoint.svg b/platform/icons/src/debugger/db_verified_field_breakpoint.svg
new file mode 100644
index 000000000000..9c4a551fe9be
--- /dev/null
+++ b/platform/icons/src/debugger/db_verified_field_breakpoint.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#DB5860" d="M4,2.32322866 L4,2.7568126 C4,3.03934809 4.11951834,3.30869878 4.32900855,3.49827768 L4.33523423,3.50391164 C3.5301773,4.0419131 3,4.95904178 3,6 C3,7.65685425 4.34314575,9 6,9 C7.65685425,9 9,7.65685425 9,6 C9,5.68537643 8.95156748,5.38206488 8.86175134,5.09711424 L10.3710279,3.7311857 C11.0507445,4.35860652 11.6079859,5.12990385 12,6 C10.9344941,8.36494733 8.64834001,10 6,10 C3.35165999,10 1.06550595,8.36494733 1.22014429e-11,6 C0.78509536,4.25743893 2.23290075,2.91114975 4,2.32322866 Z M5.11243052,4.20723817 L6.80779591,5.74146508 C7.14007477,6.04216202 7.62394987,6.08055693 7.99494206,5.85665481 C7.99829501,5.90400031 8,5.95180104 8,6 C8,7.1045695 7.1045695,8 6,8 C4.8954305,8 4,7.1045695 4,6 C4,5.21420428 4.45317413,4.53425304 5.11243052,4.20723817 Z"/>
+    <polygon fill="#231F20" fill-rule="nonzero" points="12 .908 7.479 5 5 2.757 5 1.854 5.998 1.854 7.48 3.194 11.009 0 12 0"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/debugger/db_verified_field_breakpoint_dark.svg b/platform/icons/src/debugger/db_verified_field_breakpoint_dark.svg
new file mode 100644
index 000000000000..f4438fd1fa64
--- /dev/null
+++ b/platform/icons/src/debugger/db_verified_field_breakpoint_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#C75450" d="M4,2.32322866 L4,2.7568126 C4,3.03934809 4.11951834,3.30869878 4.32900855,3.49827768 L4.33523423,3.50391164 C3.5301773,4.0419131 3,4.95904178 3,6 C3,7.65685425 4.34314575,9 6,9 C7.65685425,9 9,7.65685425 9,6 C9,5.68537643 8.95156748,5.38206488 8.86175134,5.09711424 L10.3710279,3.7311857 C11.0507445,4.35860652 11.6079859,5.12990385 12,6 C10.9344941,8.36494733 8.64834001,10 6,10 C3.35165999,10 1.06550595,8.36494733 1.22014429e-11,6 C0.78509536,4.25743893 2.23290075,2.91114975 4,2.32322866 Z M5.11243052,4.20723817 L6.80779591,5.74146508 C7.14007477,6.04216202 7.62394987,6.08055693 7.99494206,5.85665481 C7.99829501,5.90400031 8,5.95180104 8,6 C8,7.1045695 7.1045695,8 6,8 C4.8954305,8 4,7.1045695 4,6 C4,5.21420428 4.45317413,4.53425304 5.11243052,4.20723817 Z"/>
+    <polygon fill="#AFB1B3" fill-rule="nonzero" points="12 .908 7.479 5 5 2.757 5 1.854 5.998 1.854 7.48 3.194 11.009 0 12 0"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/debugger/db_verified_method_breakpoint.svg b/platform/icons/src/debugger/db_verified_method_breakpoint.svg
new file mode 100644
index 000000000000..66478b0cf94b
--- /dev/null
+++ b/platform/icons/src/debugger/db_verified_method_breakpoint.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#DB5860" d="M7.67172425,1.67172425 L7.47951278,1.8456667 L6.66900324,1.11219322 C6.48513239,0.945798643 6.24599493,0.853658299 5.99801179,0.853658299 L5.1463417,0.853658299 L6,2.70894418e-14 L7.67172425,1.67172425 Z M10.0351566,4.0351566 L12,6 L6,12 L2.59792188e-14,6 L4,2 L4,2.7568126 C4,3.03934809 4.11951834,3.30869878 4.32900855,3.49827768 L6.80779591,5.74146508 C7.18872475,6.08618798 7.7688909,6.08617705 8.14980675,5.74143981 L10.0351566,4.0351566 Z"/>
+    <polygon fill="#231F20" fill-rule="nonzero" points="12 .908 7.479 5 5 2.757 5 1.854 5.998 1.854 7.48 3.194 11.009 0 12 0"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/debugger/db_verified_method_breakpoint_dark.svg b/platform/icons/src/debugger/db_verified_method_breakpoint_dark.svg
new file mode 100644
index 000000000000..ee43f3819dec
--- /dev/null
+++ b/platform/icons/src/debugger/db_verified_method_breakpoint_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#C75450" d="M7.67172425,1.67172425 L7.47951278,1.8456667 L6.66900324,1.11219322 C6.48513239,0.945798643 6.24599493,0.853658299 5.99801179,0.853658299 L5.1463417,0.853658299 L6,4.57411886e-14 L7.67172425,1.67172425 Z M10.0351566,4.0351566 L12,6 L6,12 L3.4861003e-14,6 L4,2 L4,2.7568126 C4,3.03934809 4.11951834,3.30869878 4.32900855,3.49827768 L6.80779591,5.74146508 C7.18872475,6.08618798 7.7688909,6.08617705 8.14980675,5.74143981 L10.0351566,4.0351566 Z"/>
+    <polygon fill="#AFB1B3" fill-rule="nonzero" points="12 .908 7.479 5 5 2.757 5 1.854 5.998 1.854 7.48 3.194 11.009 0 12 0"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/debugger/icon-robots.txt b/platform/icons/src/debugger/icon-robots.txt
index ebc1efd0fd0d..da4378838ad1 100644
--- a/platform/icons/src/debugger/icon-robots.txt
+++ b/platform/icons/src/debugger/icon-robots.txt
@@ -18,10 +18,10 @@ deprecated: db_muted_verified_field_breakpoint.png -> /debugger/db_muted_field_b
 deprecated: db_muted_verified_method_breakpoint.png -> /debugger/db_muted_field_breakpoint.svg; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_muted_field_breakpoint
 deprecated: db_muted_verified_warning_breakpoint.png; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_exception_breakpoint
 deprecated: db_muted_temporary_breakpoint.png -> /debugger/db_muted_breakpoint.svg; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_muted_breakpoint
+deprecated: db_pending_breakpoint.png -> /debugger/db_set_breakpoint.svg; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_set_breakpoint
+deprecated: db_pending_field_breakpoint.png -> /debugger/db_field_breakpoint.svg; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_field_breakpoint
+deprecated: db_pending_method_breakpoint.png -> /debugger/db_method_breakpoint.svg; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_method_breakpoint
 deprecated: db_temporary_breakpoint.png -> /debugger/db_set_breakpoint.svg; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_set_breakpoint
-deprecated: db_verified_breakpoint.png -> /debugger/db_set_breakpoint.svg; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_set_breakpoint
-deprecated: db_verified_field_breakpoint.png -> /debugger/db_field_breakpoint.svg; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_field_breakpoint
-deprecated: db_verified_method_breakpoint.png -> /debugger/db_method_breakpoint.svg; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_method_breakpoint
 deprecated: db_verified_warning_breakpoint.png; to be removed in IDEA 2020 - use AllIcons.Debugger.Db_exception_breakpoint
 deprecated: newWatch.png -> /general/add.svg; to be removed in IDEA 2020 - use AllIcons.General.Add
 deprecated: watches.png -> /debugger/watch.svg; to be removed in IDEA 2020 - use AllIcons.Debugger.Watch
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index dbbcd3aea5e7..f6705c9ad2ce 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -446,9 +446,21 @@ public class AllIcons {
     public static final Icon Db_no_suspend_field_breakpoint = IconLoader.getIcon("/debugger/db_no_suspend_field_breakpoint.svg"); // 12x12
     public static final Icon Db_no_suspend_method_breakpoint = IconLoader.getIcon("/debugger/db_no_suspend_method_breakpoint.svg"); // 12x12
     public static final Icon Db_obsolete = IconLoader.getIcon("/debugger/db_obsolete.svg"); // 12x12
-    public static final Icon Db_pending_breakpoint = IconLoader.getIcon("/debugger/db_pending_breakpoint.svg"); // 12x12
-    public static final Icon Db_pending_field_breakpoint = IconLoader.getIcon("/debugger/db_pending_field_breakpoint.svg"); // 12x12
-    public static final Icon Db_pending_method_breakpoint = IconLoader.getIcon("/debugger/db_pending_method_breakpoint.svg"); // 12x12
+
+    /** @deprecated to be removed in IDEA 2020 - use AllIcons.Debugger.Db_set_breakpoint */
+    @SuppressWarnings("unused")
+    @Deprecated
+    public static final Icon Db_pending_breakpoint = IconLoader.getIcon("/debugger/db_set_breakpoint.svg"); // 12x12
+
+    /** @deprecated to be removed in IDEA 2020 - use AllIcons.Debugger.Db_field_breakpoint */
+    @SuppressWarnings("unused")
+    @Deprecated
+    public static final Icon Db_pending_field_breakpoint = IconLoader.getIcon("/debugger/db_field_breakpoint.svg"); // 12x12
+
+    /** @deprecated to be removed in IDEA 2020 - use AllIcons.Debugger.Db_method_breakpoint */
+    @SuppressWarnings("unused")
+    @Deprecated
+    public static final Icon Db_pending_method_breakpoint = IconLoader.getIcon("/debugger/db_method_breakpoint.svg"); // 12x12
     public static final Icon Db_primitive = IconLoader.getIcon("/debugger/db_primitive.png"); // 16x16
     public static final Icon Db_set_breakpoint = IconLoader.getIcon("/debugger/db_set_breakpoint.svg"); // 12x12
 
@@ -456,21 +468,9 @@ public class AllIcons {
     @SuppressWarnings("unused")
     @Deprecated
     public static final Icon Db_temporary_breakpoint = IconLoader.getIcon("/debugger/db_set_breakpoint.svg"); // 12x12
-
-    /** @deprecated to be removed in IDEA 2020 - use AllIcons.Debugger.Db_set_breakpoint */
-    @SuppressWarnings("unused")
-    @Deprecated
-    public static final Icon Db_verified_breakpoint = IconLoader.getIcon("/debugger/db_set_breakpoint.svg"); // 12x12
-
-    /** @deprecated to be removed in IDEA 2020 - use AllIcons.Debugger.Db_field_breakpoint */
-    @SuppressWarnings("unused")
-    @Deprecated
-    public static final Icon Db_verified_field_breakpoint = IconLoader.getIcon("/debugger/db_field_breakpoint.svg"); // 12x12
-
-    /** @deprecated to be removed in IDEA 2020 - use AllIcons.Debugger.Db_method_breakpoint */
-    @SuppressWarnings("unused")
-    @Deprecated
-    public static final Icon Db_verified_method_breakpoint = IconLoader.getIcon("/debugger/db_method_breakpoint.svg"); // 12x12
+    public static final Icon Db_verified_breakpoint = IconLoader.getIcon("/debugger/db_verified_breakpoint.svg"); // 12x12
+    public static final Icon Db_verified_field_breakpoint = IconLoader.getIcon("/debugger/db_verified_field_breakpoint.svg"); // 12x12
+    public static final Icon Db_verified_method_breakpoint = IconLoader.getIcon("/debugger/db_verified_method_breakpoint.svg"); // 12x12
 
     /** @deprecated to be removed in IDEA 2020 - use AllIcons.Debugger.Db_exception_breakpoint */
     @SuppressWarnings("unused")