diff --git a/plugins/svn4idea/gen/icons/SvnIcons.java b/plugins/svn4idea/gen/icons/SvnIcons.java
index 87c88c16981d..1b75b866bdb2 100644
--- a/plugins/svn4idea/gen/icons/SvnIcons.java
+++ b/plugins/svn4idea/gen/icons/SvnIcons.java
@@ -14,19 +14,19 @@ public final class SvnIcons {
     return IconLoader.getIcon(path, SvnIcons.class);
   }
 
-  public static final Icon Common = load("/icons/Common.png"); // 16x16
-  public static final Icon Conflictc = load("/icons/conflictc.png"); // 16x16
-  public static final Icon Conflictcp = load("/icons/conflictcp.png"); // 16x16
-  public static final Icon Conflictct = load("/icons/conflictct.png"); // 16x16
-  public static final Icon Conflictctp = load("/icons/conflictctp.png"); // 16x16
-  public static final Icon Conflictp = load("/icons/conflictp.png"); // 16x16
-  public static final Icon Conflictt = load("/icons/conflictt.png"); // 16x16
-  public static final Icon Conflicttp = load("/icons/conflicttp.png"); // 16x16
-  public static final Icon Integrated = load("/icons/Integrated.png"); // 16x16
-  public static final Icon IntegrationStatusUnknown = load("/icons/IntegrationStatusUnknown.png"); // 16x16
-  public static final Icon MarkAsMerged = load("/icons/MarkAsMerged.png"); // 16x16
-  public static final Icon MarkAsNotMerged = load("/icons/MarkAsNotMerged.png"); // 16x16
-  public static final Icon Notintegrated = load("/icons/Notintegrated.png"); // 16x16
-  public static final Icon ShowIntegratedFrom = load("/icons/ShowIntegratedFrom.png"); // 16x16
-  public static final Icon UndoIntegrateToBranch = load("/icons/UndoIntegrateToBranch.png"); // 16x16
+  public static final Icon Common = load("/icons/Common.svg"); // 16x16
+  public static final Icon Conflictc = load("/icons/conflictc.svg"); // 16x16
+  public static final Icon Conflictcp = load("/icons/conflictcp.svg"); // 16x16
+  public static final Icon Conflictct = load("/icons/conflictct.svg"); // 16x16
+  public static final Icon Conflictctp = load("/icons/conflictctp.svg"); // 16x16
+  public static final Icon Conflictp = load("/icons/conflictp.svg"); // 16x16
+  public static final Icon Conflictt = load("/icons/conflictt.svg"); // 16x16
+  public static final Icon Conflicttp = load("/icons/conflicttp.svg"); // 16x16
+  public static final Icon Integrated = load("/icons/Integrated.svg"); // 16x16
+  public static final Icon IntegrationStatusUnknown = load("/icons/IntegrationStatusUnknown.svg"); // 16x16
+  public static final Icon MarkAsMerged = load("/icons/MarkAsMerged.svg"); // 16x16
+  public static final Icon MarkAsNotMerged = load("/icons/MarkAsNotMerged.svg"); // 16x16
+  public static final Icon Notintegrated = load("/icons/Notintegrated.svg"); // 16x16
+  public static final Icon PreviewDetailsLeft = load("/icons/previewDetailsLeft.svg"); // 16x16
+  public static final Icon UndoIntegrateToBranch = load("/icons/UndoIntegrateToBranch.svg"); // 16x16
 }
diff --git a/plugins/svn4idea/resources/icons/Common.png b/plugins/svn4idea/resources/icons/Common.png
deleted file mode 100644
index 7ecb455f54b3..000000000000
Binary files a/plugins/svn4idea/resources/icons/Common.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/Common.svg b/plugins/svn4idea/resources/icons/Common.svg
new file mode 100644
index 000000000000..e5f2a1758a16
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/Common.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#9AA7B0" fill-opacity=".8" fill-rule="evenodd" d="M9,7 L13,7 L13,9 L9,9 L9,13 L7,13 L7,9 L3,9 L3,7 L7,7 L7,3 L9,3 L9,7 Z"/>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/Integrated.png b/plugins/svn4idea/resources/icons/Integrated.png
deleted file mode 100644
index 31b3f946e17f..000000000000
Binary files a/plugins/svn4idea/resources/icons/Integrated.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/Integrated.svg b/plugins/svn4idea/resources/icons/Integrated.svg
new file mode 100644
index 000000000000..05f45b7fa236
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/Integrated.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#62B543" fill-opacity=".7" fill-rule="evenodd" d="M9,7 L13,7 L13,9 L9,9 L9,13 L7,13 L7,9 L3,9 L3,7 L7,7 L7,3 L9,3 L9,7 Z"/>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/IntegrationStatusUnknown.png b/plugins/svn4idea/resources/icons/IntegrationStatusUnknown.png
deleted file mode 100644
index 7888e72177e9..000000000000
Binary files a/plugins/svn4idea/resources/icons/IntegrationStatusUnknown.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/IntegrationStatusUnknown.svg b/plugins/svn4idea/resources/icons/IntegrationStatusUnknown.svg
new file mode 100644
index 000000000000..135b207ff523
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/IntegrationStatusUnknown.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#9AA7B0" fill-opacity=".8" fill-rule="evenodd" d="M7,14 L9,14 L9,12 L7,12 L7,14 Z M8,2 C5.79,2 4,3.79 4,6 L6,6 C6,4.9 6.9,4 8,4 C9.1,4 10,4.9 10,6 C10,8 7,7.75 7,11 L9,11 C9,8.75 12,8.5 12,6 C12,3.79 10.21,2 8,2 Z"/>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/MarkAsMerged.png b/plugins/svn4idea/resources/icons/MarkAsMerged.png
deleted file mode 100644
index 6d5fef54d7e6..000000000000
Binary files a/plugins/svn4idea/resources/icons/MarkAsMerged.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/MarkAsMerged.svg b/plugins/svn4idea/resources/icons/MarkAsMerged.svg
new file mode 100644
index 000000000000..7c7b7d17fa11
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/MarkAsMerged.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#59A869" d="M7,7 L11,7 L11,9 L7,9 L7,13 L5,13 L5,9 L1,9 L1,7 L5,7 L5,3 L7,3 L7,7 Z"/>
+    <polygon fill="#6E6E6E" points="13.855 15.522 13.855 7.522 12.188 7.522 12.188 13.855 9.188 13.855 9.188 15.522" transform="rotate(45 11.522 11.522)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/MarkAsMerged_dark.svg b/plugins/svn4idea/resources/icons/MarkAsMerged_dark.svg
new file mode 100644
index 000000000000..b23c0e2ddb6e
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/MarkAsMerged_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#499C54" d="M7,7 L11,7 L11,9 L7,9 L7,13 L5,13 L5,9 L1,9 L1,7 L5,7 L5,3 L7,3 L7,7 Z"/>
+    <polygon fill="#AFB1B3" points="13.855 15.522 13.855 7.522 12.188 7.522 12.188 13.855 9.188 13.855 9.188 15.522" transform="rotate(45 11.522 11.522)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/MarkAsNotMerged.png b/plugins/svn4idea/resources/icons/MarkAsNotMerged.png
deleted file mode 100644
index 863c7309aa8d..000000000000
Binary files a/plugins/svn4idea/resources/icons/MarkAsNotMerged.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/MarkAsNotMerged.svg b/plugins/svn4idea/resources/icons/MarkAsNotMerged.svg
new file mode 100644
index 000000000000..07f1034bd10e
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/MarkAsNotMerged.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="10" height="2" x="1" y="7" fill="#DB5860"/>
+    <polygon fill="#6E6E6E" points="13.855 15.522 13.855 7.522 12.188 7.522 12.188 13.855 9.188 13.855 9.188 15.522" transform="rotate(45 11.522 11.522)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/MarkAsNotMerged_dark.svg b/plugins/svn4idea/resources/icons/MarkAsNotMerged_dark.svg
new file mode 100644
index 000000000000..c5d727f3fc71
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/MarkAsNotMerged_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="10" height="2" x="1" y="7" fill="#C75450"/>
+    <polygon fill="#AFB1B3" points="13.855 15.522 13.855 7.522 12.188 7.522 12.188 13.855 9.188 13.855 9.188 15.522" transform="rotate(45 11.522 11.522)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/Notintegrated.png b/plugins/svn4idea/resources/icons/Notintegrated.png
deleted file mode 100644
index fa8ea23d727d..000000000000
Binary files a/plugins/svn4idea/resources/icons/Notintegrated.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/Notintegrated.svg b/plugins/svn4idea/resources/icons/Notintegrated.svg
new file mode 100644
index 000000000000..75ec428e912d
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/Notintegrated.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect width="10" height="2" x="3" y="7" fill="#F26522" fill-opacity=".7" fill-rule="evenodd"/>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/ShowIntegratedFrom.png b/plugins/svn4idea/resources/icons/ShowIntegratedFrom.png
deleted file mode 100644
index d1a9517605bb..000000000000
Binary files a/plugins/svn4idea/resources/icons/ShowIntegratedFrom.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/UndoIntegrateToBranch.png b/plugins/svn4idea/resources/icons/UndoIntegrateToBranch.png
deleted file mode 100644
index 51f90b2e43e1..000000000000
Binary files a/plugins/svn4idea/resources/icons/UndoIntegrateToBranch.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/UndoIntegrateToBranch.svg b/plugins/svn4idea/resources/icons/UndoIntegrateToBranch.svg
new file mode 100644
index 000000000000..c5bb3c3b0738
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/UndoIntegrateToBranch.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <g fill="#6E6E6E" transform="translate(2 1)">
+      <polygon points=".5 12.5 5 8 5 4 7 4 7 9 2 14"/>
+      <polygon points="6 0 10 4 2 4"/>
+    </g>
+    <path fill="#DB5860" d="M13.2828424,11.7828424 L16.4828424,11.7828424 L16.4828424,13.3828424 L13.2828424,13.3828424 L13.2828424,16.5828424 L11.6828424,16.5828424 L11.6828424,13.3828424 L8.48284235,13.3828424 L8.48284235,11.7828424 L11.6828424,11.7828424 L11.6828424,8.58284235 L13.2828424,8.58284235 L13.2828424,11.7828424 Z" transform="rotate(45 12.483 12.583)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/UndoIntegrateToBranch_dark.svg b/plugins/svn4idea/resources/icons/UndoIntegrateToBranch_dark.svg
new file mode 100644
index 000000000000..2926a6d457a4
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/UndoIntegrateToBranch_dark.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <g fill="#AFB1B3" transform="translate(2 1)">
+      <polygon points=".5 12.5 5 8 5 4 7 4 7 9 2 14"/>
+      <polygon points="6 0 10 4 2 4"/>
+    </g>
+    <path fill="#C75450" d="M13.2828424,11.7828424 L16.4828424,11.7828424 L16.4828424,13.3828424 L13.2828424,13.3828424 L13.2828424,16.5828424 L11.6828424,16.5828424 L11.6828424,13.3828424 L8.48284235,13.3828424 L8.48284235,11.7828424 L11.6828424,11.7828424 L11.6828424,8.58284235 L13.2828424,8.58284235 L13.2828424,11.7828424 Z" transform="rotate(45 12.483 12.583)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/conflictc.png b/plugins/svn4idea/resources/icons/conflictc.png
deleted file mode 100644
index 9abaa1646b90..000000000000
Binary files a/plugins/svn4idea/resources/icons/conflictc.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/conflictc.svg b/plugins/svn4idea/resources/icons/conflictc.svg
new file mode 100644
index 000000000000..182983b78c67
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/conflictc.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F26522" fill-opacity=".6" d="M7.02372308,3 L13,3 L13,13 L3,13 L3,7.4317582 C3.38479604,7.60456946 3.80704956,7.7 4.25,7.7 C5.49794533,7.7 6.42251969,7.14168445 7.02372308,6.02505335 L6,5 L4.01186154,5 L4,4 L6,4 L7.02372308,3 Z"/>
+    <path fill="#231F20" fill-opacity=".7" d="M0,2.501 C0,1 0.931,2.02832126e-16 2.256,0 C3.20239258,0 3.55,0.311 3.969,0.753 L3.42669678,1.42712402 C3.07669678,1.06812402 2.75,1 2.25,1 C1.418,1 1,1.73791504 1,2.487 C1,3.23608496 1.412,4 2.25,4 C2.787,4 3.05169678,3.89340869 3.42669678,3.50640869 L4,4.144 C3.544,4.669 3.19732666,5 2.225,5 C0.949,5 7.35277938e-17,4.002 0,2.501 Z" transform="translate(2 2)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/conflictcp.png b/plugins/svn4idea/resources/icons/conflictcp.png
deleted file mode 100644
index 193ecf6d039a..000000000000
Binary files a/plugins/svn4idea/resources/icons/conflictcp.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/conflictcp.svg b/plugins/svn4idea/resources/icons/conflictcp.svg
new file mode 100644
index 000000000000..8ad60664fa88
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/conflictcp.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F26522" fill-opacity=".6" d="M5.63948104,13 C6.44137794,12.6407046 7,11.8355889 7,10.9 L7,10.5 C7,9.22974508 5.97025492,8.2 4.7,8.2 L3,8.2 L3,7.4317582 C3.38479604,7.60456946 3.80704956,7.7 4.25,7.7 C5.49794533,7.7 6.42251969,7.14168445 7.02372308,6.02505335 L6,5 L4.01186154,5 L4,4 L6,4 L7.02372308,3 L13,3 L13,13 L5.63948104,13 Z"/>
+    <path fill="#231F20" fill-opacity=".7" d="M0,2.501 C0,1 0.931,2.02832126e-16 2.256,0 C3.20239258,0 3.55,0.311 3.969,0.753 L3.42669678,1.42712402 C3.07669678,1.06812402 2.75,1 2.25,1 C1.418,1 1,1.73791504 1,2.487 C1,3.23608496 1.412,4 2.25,4 C2.787,4 3.05169678,3.89340869 3.42669678,3.50640869 L4,4.144 C3.544,4.669 3.19732666,5 2.225,5 C0.949,5 7.35277938e-17,4.002 0,2.501 Z" transform="translate(2 2)"/>
+    <path fill="#231F20" fill-opacity=".7" d="M1.9,2.5 C2.564,2.5 3,2.38439941 3,1.75 C3,1.11560059 2.557,1 1.9,1 L1,1 L1,2.5 L1.9,2.5 Z M0,0 L1.971,0 C3.142,0 4,0.642 4,1.65 C4,3.28582764 2.971,3.5 1.872,3.5 L1,3.5 L1,5 L0,5 L0,0 Z" transform="translate(2 9)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/conflictct.png b/plugins/svn4idea/resources/icons/conflictct.png
deleted file mode 100644
index f0fffd0885bc..000000000000
Binary files a/plugins/svn4idea/resources/icons/conflictct.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/conflictct.svg b/plugins/svn4idea/resources/icons/conflictct.svg
new file mode 100644
index 000000000000..7c27f0b0d4e7
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/conflictct.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F26522" fill-opacity=".6" d="M10,13 L3,13 L3,7.4317582 C3.38479604,7.60456946 3.80704956,7.7 4.25,7.7 C5.49794533,7.7 6.42251969,7.14168445 7.02372308,6.02505335 L6,5 L4.01186154,5 L4,4 L6,4 L7.02372308,3 L13,3 L13,8 L8.5,8 L8.5,11 L10,11 L10,13 Z"/>
+    <path fill="#231F20" fill-opacity=".7" d="M0,2.501 C0,1 0.931,2.02832126e-16 2.256,0 C3.20239258,0 3.55,0.311 3.969,0.753 L3.42669678,1.42712402 C3.07669678,1.06812402 2.75,1 2.25,1 C1.418,1 1,1.73791504 1,2.487 C1,3.23608496 1.412,4 2.25,4 C2.787,4 3.05169678,3.89340869 3.42669678,3.50640869 L4,4.144 C3.544,4.669 3.19732666,5 2.225,5 C0.949,5 7.35277938e-17,4.002 0,2.501 Z" transform="translate(2 2)"/>
+    <polygon fill="#231F20" fill-opacity=".7" points="2 1 .5 1 .5 0 4.5 0 4.5 1 3 1 3 5 2 5" transform="translate(9 9)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/conflictctp.png b/plugins/svn4idea/resources/icons/conflictctp.png
deleted file mode 100644
index c7fcd485f319..000000000000
Binary files a/plugins/svn4idea/resources/icons/conflictctp.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/conflictctp.svg b/plugins/svn4idea/resources/icons/conflictctp.svg
new file mode 100644
index 000000000000..f05d255c3b18
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/conflictctp.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F26522" fill-opacity=".6" d="M10,13 L5.63948104,13 C6.44137794,12.6407046 7,11.8355889 7,10.9 L7,10.5 C7,9.22974508 5.97025492,8.2 4.7,8.2 L3,8.2 L3,7.4317582 C3.38479604,7.60456946 3.80704956,7.7 4.25,7.7 C5.49794533,7.7 6.42251969,7.14168445 7.02372308,6.02505335 L6,5 L4.01186154,5 L4,4 L6,4 L7.02372308,3 L13,3 L13,8 L8.5,8 L8.5,11 L10,11 L10,13 Z"/>
+    <path fill="#231F20" fill-opacity=".7" d="M0,2.501 C0,1 0.931,2.02832126e-16 2.256,0 C3.20239258,0 3.55,0.311 3.969,0.753 L3.42669678,1.42712402 C3.07669678,1.06812402 2.75,1 2.25,1 C1.418,1 1,1.73791504 1,2.487 C1,3.23608496 1.412,4 2.25,4 C2.787,4 3.05169678,3.89340869 3.42669678,3.50640869 L4,4.144 C3.544,4.669 3.19732666,5 2.225,5 C0.949,5 7.35277938e-17,4.002 0,2.501 Z" transform="translate(2 2)"/>
+    <path fill="#231F20" fill-opacity=".7" d="M1.9,2.5 C2.564,2.5 3,2.38439941 3,1.75 C3,1.11560059 2.557,1 1.9,1 L1,1 L1,2.5 L1.9,2.5 Z M0,0 L1.971,0 C3.142,0 4,0.642 4,1.65 C4,3.28582764 2.971,3.5 1.872,3.5 L1,3.5 L1,5 L0,5 L0,0 Z" transform="translate(2 9)"/>
+    <polygon fill="#231F20" fill-opacity=".7" points="2 1 .5 1 .5 0 4.5 0 4.5 1 3 1 3 5 2 5" transform="translate(9 9)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/conflictp.png b/plugins/svn4idea/resources/icons/conflictp.png
deleted file mode 100644
index 5dd25593d14b..000000000000
Binary files a/plugins/svn4idea/resources/icons/conflictp.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/conflictp.svg b/plugins/svn4idea/resources/icons/conflictp.svg
new file mode 100644
index 000000000000..171c5de851b4
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/conflictp.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F26522" fill-opacity=".6" d="M5.63948104,13 C6.44137794,12.6407046 7,11.8355889 7,10.9 L7,10.5 C7,9.22974508 5.97025492,8.2 4.7,8.2 L3,8.2 L3,3 L13,3 L13,13 L5.63948104,13 Z"/>
+    <path fill="#231F20" fill-opacity=".7" d="M1.9,2.5 C2.564,2.5 3,2.38439941 3,1.75 C3,1.11560059 2.557,1 1.9,1 L1,1 L1,2.5 L1.9,2.5 Z M0,0 L1.971,0 C3.142,0 4,0.642 4,1.65 C4,3.28582764 2.971,3.5 1.872,3.5 L1,3.5 L1,5 L0,5 L0,0 Z" transform="translate(2 9)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/conflictt.png b/plugins/svn4idea/resources/icons/conflictt.png
deleted file mode 100644
index 806197c7d7ff..000000000000
Binary files a/plugins/svn4idea/resources/icons/conflictt.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/conflictt.svg b/plugins/svn4idea/resources/icons/conflictt.svg
new file mode 100644
index 000000000000..b722fb870992
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/conflictt.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F26522" fill-opacity=".6" d="M10,13 L3,13 L3,3 L13,3 L13,8 L8.5,8 L8.5,11 L10,11 L10,13 Z"/>
+    <polygon fill="#231F20" fill-opacity=".7" points="2 1 .5 1 .5 0 4.5 0 4.5 1 3 1 3 5 2 5" transform="translate(9 9)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/conflicttp.png b/plugins/svn4idea/resources/icons/conflicttp.png
deleted file mode 100644
index a4c758bd9274..000000000000
Binary files a/plugins/svn4idea/resources/icons/conflicttp.png and /dev/null differ
diff --git a/plugins/svn4idea/resources/icons/conflicttp.svg b/plugins/svn4idea/resources/icons/conflicttp.svg
new file mode 100644
index 000000000000..5c89176582a1
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/conflicttp.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F26522" fill-opacity=".6" d="M10,13 L5.63948104,13 C6.44137794,12.6407046 7,11.8355889 7,10.9 L7,10.5 C7,9.22974508 5.97025492,8.2 4.7,8.2 L3,8.2 L3,3 L13,3 L13,8 L8.5,8 L8.5,11 L10,11 L10,13 Z"/>
+    <path fill="#231F20" fill-opacity=".7" d="M1.9,2.5 C2.564,2.5 3,2.38439941 3,1.75 C3,1.11560059 2.557,1 1.9,1 L1,1 L1,2.5 L1.9,2.5 Z M0,0 L1.971,0 C3.142,0 4,0.642 4,1.65 C4,3.28582764 2.971,3.5 1.872,3.5 L1,3.5 L1,5 L0,5 L0,0 Z" transform="translate(2 9)"/>
+    <polygon fill="#231F20" fill-opacity=".7" points="2 1 .5 1 .5 0 4.5 0 4.5 1 3 1 3 5 2 5" transform="translate(9 9)"/>
+  </g>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/previewDetailsLeft.svg b/plugins/svn4idea/resources/icons/previewDetailsLeft.svg
new file mode 100644
index 000000000000..96a2aba58043
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/previewDetailsLeft.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#6E6E6E" fill-rule="evenodd" d="M2,2 L14,2 L14,14 L2,14 L2,2 Z M4,4 L4,12 L8,12 L8,4 L4,4 Z" transform="matrix(-1 0 0 1 16 0)"/>
+</svg>
diff --git a/plugins/svn4idea/resources/icons/previewDetailsLeft_dark.svg b/plugins/svn4idea/resources/icons/previewDetailsLeft_dark.svg
new file mode 100644
index 000000000000..12d76cf8d343
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/previewDetailsLeft_dark.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#AFB1B3" fill-rule="evenodd" d="M2,2 L14,2 L14,14 L2,14 L2,2 Z M4,4 L4,12 L8,12 L8,4 L4,4 Z" transform="matrix(-1 0 0 1 16 0)"/>
+</svg>
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/ShowHideMergePanelAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/ShowHideMergePanelAction.java
index b5f206600c2d..3249faa5e361 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/ShowHideMergePanelAction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/ShowHideMergePanelAction.java
@@ -18,7 +18,7 @@ public class ShowHideMergePanelAction extends DumbAwareToggleAction {
 
   public ShowHideMergePanelAction(final DecoratorManager manager, final ChangeListFilteringStrategy strategy) {
     super("Show Integrate Panel", message("committed.changes.action.enable.merge.highlighting.description.text"),
-          SvnIcons.ShowIntegratedFrom);
+          SvnIcons.PreviewDetailsLeft);
     myManager = manager;
     myStrategy = strategy;
   }