From 77dcc64591d94e025e2923bd29e557ed0396930c Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Thu, 15 Nov 2018 15:13:57 +0300
Subject: [PATCH] svn: Update icons

---
 plugins/svn4idea/gen/icons/SvnIcons.java      |  30 +++++++++---------
 plugins/svn4idea/resources/icons/Common.png   | Bin 319 -> 0 bytes
 plugins/svn4idea/resources/icons/Common.svg   |   3 ++
 .../svn4idea/resources/icons/Integrated.png   | Bin 319 -> 0 bytes
 .../svn4idea/resources/icons/Integrated.svg   |   3 ++
 .../icons/IntegrationStatusUnknown.png        | Bin 364 -> 0 bytes
 .../icons/IntegrationStatusUnknown.svg        |   3 ++
 .../svn4idea/resources/icons/MarkAsMerged.png | Bin 673 -> 0 bytes
 .../svn4idea/resources/icons/MarkAsMerged.svg |   6 ++++
 .../resources/icons/MarkAsMerged_dark.svg     |   6 ++++
 .../resources/icons/MarkAsNotMerged.png       | Bin 340 -> 0 bytes
 .../resources/icons/MarkAsNotMerged.svg       |   6 ++++
 .../resources/icons/MarkAsNotMerged_dark.svg  |   6 ++++
 .../resources/icons/Notintegrated.png         | Bin 370 -> 0 bytes
 .../resources/icons/Notintegrated.svg         |   3 ++
 .../resources/icons/ShowIntegratedFrom.png    | Bin 385 -> 0 bytes
 .../resources/icons/UndoIntegrateToBranch.png | Bin 412 -> 0 bytes
 .../resources/icons/UndoIntegrateToBranch.svg |   9 ++++++
 .../icons/UndoIntegrateToBranch_dark.svg      |   9 ++++++
 .../svn4idea/resources/icons/conflictc.png    | Bin 547 -> 0 bytes
 .../svn4idea/resources/icons/conflictc.svg    |   6 ++++
 .../svn4idea/resources/icons/conflictcp.png   | Bin 593 -> 0 bytes
 .../svn4idea/resources/icons/conflictcp.svg   |   7 ++++
 .../svn4idea/resources/icons/conflictct.png   | Bin 587 -> 0 bytes
 .../svn4idea/resources/icons/conflictct.svg   |   7 ++++
 .../svn4idea/resources/icons/conflictctp.png  | Bin 659 -> 0 bytes
 .../svn4idea/resources/icons/conflictctp.svg  |   8 +++++
 .../svn4idea/resources/icons/conflictp.png    | Bin 528 -> 0 bytes
 .../svn4idea/resources/icons/conflictp.svg    |   6 ++++
 .../svn4idea/resources/icons/conflictt.png    | Bin 513 -> 0 bytes
 .../svn4idea/resources/icons/conflictt.svg    |   6 ++++
 .../svn4idea/resources/icons/conflicttp.png   | Bin 567 -> 0 bytes
 .../svn4idea/resources/icons/conflicttp.svg   |   7 ++++
 .../resources/icons/previewDetailsLeft.svg    |   3 ++
 .../icons/previewDetailsLeft_dark.svg         |   3 ++
 .../svn/history/ShowHideMergePanelAction.java |   2 +-
 36 files changed, 123 insertions(+), 16 deletions(-)
 delete mode 100644 plugins/svn4idea/resources/icons/Common.png
 create mode 100644 plugins/svn4idea/resources/icons/Common.svg
 delete mode 100644 plugins/svn4idea/resources/icons/Integrated.png
 create mode 100644 plugins/svn4idea/resources/icons/Integrated.svg
 delete mode 100644 plugins/svn4idea/resources/icons/IntegrationStatusUnknown.png
 create mode 100644 plugins/svn4idea/resources/icons/IntegrationStatusUnknown.svg
 delete mode 100644 plugins/svn4idea/resources/icons/MarkAsMerged.png
 create mode 100644 plugins/svn4idea/resources/icons/MarkAsMerged.svg
 create mode 100644 plugins/svn4idea/resources/icons/MarkAsMerged_dark.svg
 delete mode 100644 plugins/svn4idea/resources/icons/MarkAsNotMerged.png
 create mode 100644 plugins/svn4idea/resources/icons/MarkAsNotMerged.svg
 create mode 100644 plugins/svn4idea/resources/icons/MarkAsNotMerged_dark.svg
 delete mode 100644 plugins/svn4idea/resources/icons/Notintegrated.png
 create mode 100644 plugins/svn4idea/resources/icons/Notintegrated.svg
 delete mode 100644 plugins/svn4idea/resources/icons/ShowIntegratedFrom.png
 delete mode 100644 plugins/svn4idea/resources/icons/UndoIntegrateToBranch.png
 create mode 100644 plugins/svn4idea/resources/icons/UndoIntegrateToBranch.svg
 create mode 100644 plugins/svn4idea/resources/icons/UndoIntegrateToBranch_dark.svg
 delete mode 100644 plugins/svn4idea/resources/icons/conflictc.png
 create mode 100644 plugins/svn4idea/resources/icons/conflictc.svg
 delete mode 100644 plugins/svn4idea/resources/icons/conflictcp.png
 create mode 100644 plugins/svn4idea/resources/icons/conflictcp.svg
 delete mode 100644 plugins/svn4idea/resources/icons/conflictct.png
 create mode 100644 plugins/svn4idea/resources/icons/conflictct.svg
 delete mode 100644 plugins/svn4idea/resources/icons/conflictctp.png
 create mode 100644 plugins/svn4idea/resources/icons/conflictctp.svg
 delete mode 100644 plugins/svn4idea/resources/icons/conflictp.png
 create mode 100644 plugins/svn4idea/resources/icons/conflictp.svg
 delete mode 100644 plugins/svn4idea/resources/icons/conflictt.png
 create mode 100644 plugins/svn4idea/resources/icons/conflictt.svg
 delete mode 100644 plugins/svn4idea/resources/icons/conflicttp.png
 create mode 100644 plugins/svn4idea/resources/icons/conflicttp.svg
 create mode 100644 plugins/svn4idea/resources/icons/previewDetailsLeft.svg
 create mode 100644 plugins/svn4idea/resources/icons/previewDetailsLeft_dark.svg

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 7ecb455f54b388baad48cd0e6ff88fd9a29aa81e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 319
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}QGic~>-6c<|Ns9V+7%Mo8xqnM
z8Zjv}Vp@3g?1<<E5ixTkVirXttcpn95|zFuy69mdL%%aagC#?f_QD^rm;S6|$T432
zBW=ZxjJ1!Ktou>2>D}@<-$SnaS$F-<=Iej9-1xKY&Y%7F{v3Jw_u`wscYpo+{_yX~
z?LV8oPn*02XghyNkRQ+$&yYcWaBU(`D%aD+F+?J~_w;c-2L^$bhgWw;?k&IfU$pav
zfcU?|GW$|IDqZ(CbTlOAacCC^{+Op7p!=Xws`@vRjNycBeGKzmdsU|=v8{KWK7;8X
zi`+INW0pULy}OM1w{nZD&!4T*ogI2$tL$kLlTh)BZ@ku(tJs!=v-ds(TFl_->gTe~
HDWM4fZTpf@

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 31b3f946e17f20f4f80e85ea2a7236ac0edff999..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 319
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}QGic~>-6c<|NsAAl3-ntWK)}B
zn;&b{lwseV<<OPm*q7%xp}=WYiObSz_w@~)w`PVg^gA;&STZDO|9QCb?!jrVPR{wh
zC*;S0*dK?}ejLg8ak7LV$N10Vb$_00{_|wZpQqdYyxjli)sesNF8=*=_uudDf8U(^
zd9KMPTzV(acK(teKcFj~A%pzj+C-pKuBVG*h(vhr>EnD33<50=ukMcATYm4qXy*+9
z@qdS9_N91Ky6$i2Xh_cE2rdx%F;9Df-h)c1>gP-{h5_5RG0b=ERh^!~w%%EMHq${C
zxoxX1u>RTDw`<jzt=uB(^JnikVH|p(H0Sgc)2jj%-*~OdSlE_H)drsfTFl_->gTe~
HDWM4f4;z#n

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 7888e72177e939e05c4349a435d9675c809eefeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 364
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf`~aU2*Z=?jho;t*Bv@A@+0>@k
zHf7kiXE}7`IQHc^PAG87kF}ar;<B{beSL!`P+3$)T|#mHkCP=o&(#0AKKt*xOFxen
z{5;q6<3Q}sQ{{)(_x?DX_VYr=uPgmWHuV0wz2x_;`M>Y2K6>)(-;X!`e!Sh#KJmwq
zj9*tK{<=2p)yX;E_k{dBQ+I4*-=8O&|GYf#=gpbF?=D{7Gv)5VY0r<%`upkbzu({g
zos<p)I+d>^$S;^7<{1*G52%|1l*#jSaSW-5n|t0=?689X^M#b_5;G#rif6q1m)<?Q
zvNCh+C-2_0%Sy-2{AUn+xHC>SdD3C`1H13;?s#yO^Tq4CnkqLqBzp8NH6*<84c2-s
zZ1c`M)@o+;{-aw1ie?uuwRmTJesY52T&UO&x%BSL<NN+!XP<xT>8duM%?zHdelF{r
G5}E)fpTT$l

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 6d5fef54d7e6e995a62a40ad210a948aed3a7975..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 673
zcmV;S0$%-zP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0003^P)t-smzS6S
z|NkN*A|)*)Cod-_F()4<A165`COjo0M<N|L9U3$m8&(<}O&l9&8W~d;8GscSc@q+%
z4HR4x5M&S#Vh<C45fOk64`U4uh6@dJ3Jj1532Fz2YCwu?L5^-gkZ?kpbVQ|lN3VcM
z+L=@fpa_C!KL~vXiE&E^cLfHL0t9*i3b6(s<rf680R^%F4!jBlgaZkn1{Jgt1Azep
zrT_$^00giA3$zEFly$P9g1DxI1-<|Pk3#@}Io-jQ>dBlb>LdV#KLBhq{N=X%>csu-
z(f#q({N%F-?Ew7auKn`e{q)`b_2Rw6gV4l*A;1+Pu@WN8A0vqwCcqpp)GQIZ4+--C
z59bN%<;^MUBnbNe3Bv^Y-=PJ$00qkc{N=PP|06BZDKF_LCe$J)z#af%D*$IO6aNbR
z@X#N<86W8yAO96Ot115b_x3o_9smFUJ#<n|Qvd(~2L}iX5D_CKCon!nPG4tkfQXBi
zv&6>H+TG^n=H}++=H}++=j!Y2^Yioe_WAny`uqI+{Qdp?{r=Y}Ua9~90LDo~K~xwS
z1;NWM17R2d(DVH>y$DUTaS7>4Ev#y1=LNjB2Vf^*<1z^mk}86>)6Y2(0D!=`O9Bv%
z$8AKDnGc{CPuZGGCJEH%?G<y~PC|E7M1)S~xFo9W-EtX&w7Gx3w?RGHtBYny?)2Ki
z=Hc0Qk=Z?2K9~8(U_88juOqY59IaNf?C(#1Uw&$Nm-%tp>y^iG|K@EO0fra3+If9y
zX5UqSZ0mltXx_e50ouR*L3`WGr~+85y*|C82CP39U-QI2-a}2sw^tBb00000NkvXX
Hu0mjfRPY`p

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 863c7309aa8dd5aab9360191cfff984a48055e1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}PJmB{>-6c<|NsBLo|XB(uqcph
z&vNL>aqP=;oKWC2tHfn#wfp)8&s#G?ddvJbHf3&I+|1Bm$<Xf%RLPKI%#fsg_u#Zw
zC+ED`-1z75x<5}g|9QIY&#NPU-(CFs;lkgK*ZzLG`}fP;e_tQ{`~4kgeoLs!C6FUZ
zg8V@CGZ;UEg4cilZZ|D*1`4%%x;TbZ#KoSA<ZCwIVY#3(V{b$5x4GNC?@#uP67QV&
zsDHX=N^-uTkdmahjnyHu^Osx}Rtvs6ZFAIKfm7&e@{$I-vjVRsm#Npt-Hy_D!u{~z
zo$zyvn;p!qpFNhZr+Z?{v1OMn*6ih&<F3%Tc*6=WK|}QikD2P_V;Huxy^!bHSAR-=
c$=|z=nN{Pt^v@RT(EvHq)78&qol`;+0PnDv^#A|>

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 fa8ea23d727d38760498b21e78ce060421324d7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfiU6Mw*Z=?j&nj_Q-{9Go=QyFj
zX=$~4SB_&vl1+P-LsN!*ZHjG4g7ujR0k>v`T%H<qxW{j2yH9?s)!$Edf1E7&aUk~R
zxuze7)Be7@_~+G;NdkO-9<TfR?$X~kC!eu!-90$%_r2A>ZZG+DefF;_{r`S{|MPI=
zzi-d~e!TJP+O%I+CjPw8@$*dmk0TlDS(*Pl+5G3}wx4I}UY(rt=jHxCPqzF#RsQpM
z!S_8O|9*ZrBqaRJ;j<Oc%|azXe!&dS&_T?N*DgTWbWaz@5Q(YD2@8ZCJbnC7JRvDH
zrIAxYWA;j}PVX0n&ObK^ELeP+P1t~)*;A8mhM1+IX{MyJvZ&t-hRJ)H7EM~QK|<W8
zAvD%G*gGP+MON*A#;W`rCAFkeyut~IX^$T~NqR1(a$cGt{5wad(#}(JfL1biy85}S
Ib4q9e08;e2ivR!s

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 d1a9517605bb1cd10f217cc8aa366c63a6c4bf23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 385
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf%mAMd*V=`<rca;#|Nnn|=L8^X
z%CK+Ga_Gu&?8|eUP~emwYgL<KTasX1kz_Ng#ARu<`}zjYTQfr#8Y~(5oeQRKT6yH^
z-GkE@a*P?0v|pW^^W#A5kHcv{PL}+6xbn~Ab$_00{_|wZpQqdYyxjli)sesNF8=*=
zw<Oj5=eefxbdL-7-qd7zOe^>Qz9(d9Q|QX3;J<H9{y37c^5Ct1zrU-qv~U0&DO3{V
z2XbuRnP<pgn$IICplGY7i(^PdT<*E+e1{Bp94@MqY}z=v<lVu0|Nj@VtYBPtPyO|Y
zX=hqC9LaC~ko#qSB5%`_pbh0|HHXeJJeQfcdhV|ST22?9Up}bb@s1<*c1Rq52GfxR
z1)L8;XIPgkvTpH?O*1>V$#sQ!rjcTViDSgF>lN3SXNSAaQ~g-zHUHPV*EfE@t@^|8
Ys*6``?dQt9KnF2+y85}Sb4q9e08<pbw*UYD

diff --git a/plugins/svn4idea/resources/icons/UndoIntegrateToBranch.png b/plugins/svn4idea/resources/icons/UndoIntegrateToBranch.png
deleted file mode 100644
index 51f90b2e43e1bf4cf827f28d211a984c88057481..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfx&WUL*V=`<8X6kbvoik&0%1`g
zL*F?8h=7chN3JrgNGO=Tsq?7k)J?}2Iv7^XTdmygdvW_-pi1RU4yset3}+dd&N8!j
zEoC>)&i=Kc<9sKlDX}icbzNSnyS~)&S>)?;+|2j6f!`uO|0_u$Pi;b<Sw$_2ih1f9
z`@}8%aUe@KOZ9@C^<Sf!4$b1~;o|M%UwQDBP@k~a1W}nuGW#z+Ik|c7g?n!lrYPJ!
zaFn6SP&{h)PN2&<N`m}AK44%l?mM$g!pIEBn(FD|7*Y|J>&MQ;Y{;{D^0MbozLmb)
z`(5t;|A@I$7B8LC)2hQF=JE1myogl%l>fqU3m^X8*TNqW_4q_j2U}tB^_-UL6L=RL
z;iy$^`ne;ve$GTAE}v68%~z9d*}oCGCK|_j_UVS(QU2Q)Q*Bl@+{(F<?J{@z#+l2-
z0`|`N7TDsn(?#c#{<pH(-#6?MG2XpwUAvIeahLq>irifrubpBAxz*Fv&t;ucLK6UH
CF07&e

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 9abaa1646b90117a4bd1f5d637ca61bcc3c0cd00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 547
zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz#Ysd#RCwB?Q$0@=K@>gnmX{ECzrX}K
zX+$in6j~ECmNeK<@DGT;z|NQ$8yh=ge3n!YV?u2-HiXK~5R}J9VA;2Czh>rM&n$}B
zJf9(XvpaitW^&KH=bVgDRg5zx!sp)Vla;CI$!?OQNYeqTs>06J8*^oVc01~dC|=%~
zO<kT#c6cD0%MXrwUq0DUiEDfDwM&4qDq#m17MAXI%(sugEVpl8hdi8t!~?jaQ<R4%
zC=QO0$LG5J6TL<U{WOEK4rU?(q84DNi!er9*L$4C@HJ>L3{fbH5~70o=*E2@=t@fX
zya9ND3a9rF0;~Cl1|ss9p?h=v-Q~gV^A(`7(9*)^7Lv0F{{tA%Y69$jc>8|m)r;4+
z7Uw#lRnS^39em&)r;G_aHBuV@{4hWmU!Ohg&#yn~1itE6g;x5Ie0C0Z7K82(*O8qL
zQ}{Eg{Sz39sN^kq!RoA>v5S7600pVq`fMaX@%;x3Wmbw60DP9iJ5sUiMnhx=`o9j+
zq;@d0sZ11#DBjUx3aP$!K$<Q#0rDi#+Go)VkU%9oj>*x5yB<vu8UWk-+WWf-m7?FX
lJ@PJ?ac^S_V~$?}3;<DY5VeSyjY$9i002ovPDHLkV1m<m^EChf

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 193ecf6d039a43e1e2ce1b319da95ab51f1c57af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 593
zcmV-X0<QguP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006QNkl<Zc-p0t
zT}V@L7>9S&%8VHZC6UpMH(9v3nM)<7hG+95Bea~Gy8I|Dw}#ciZUZmMzKFU}DuP1F
zLelcO8;OD>$|$W_%cZ5bSWIwjPyaJeinAc`;yLH)ecto__#G9XS_!d7QEhv5dCM8{
zYh38}HnPK9%d!OKhEtRt?qK9<SMbHTvp=4mI6615U;5s?S>yi~e+dfgF7gf@BRVnw
zy-tA(?zR!>X(HTZW!@tZsMj-9oQij+CaMq^_BEj`b-?Q<aQ`^;3Bf%Vk();dU$!&f
zQ9{6BU|QP3r)&)hfqZkiWP>+C@OB7BhhnlwPcz{QHH1!^nXA?D)tt(NF^(X;*j6pz
zPk1#*<hp}}&MJbgB4#VMF<FozPFSZD$jAZm@)5{6h<EgPe{4A9u@I=s;+thFU-FXq
zXh?`JkkgM2_Yr;ekjU@@e)V4x;aLba=P*;AhTpUiUv3f~3~Q8vLc1GtlZSk(6MaP^
zZs$oB25%6sYMHG_W6G4m=j<dVveq)LQ!53M=)s=4cIJDpkx^0~%OG^;3e$y~@bBJ$
zZ`XQpdm`gnHDej8lme5@O-@xSKW|@L3Nd)=Jd?S}_>4(-^<s18YR1I&ciK2#V61FG
zTjp3AZfj^I(A|mGkSK0W5L?x}&lJN#FsfB6i=-<%#CFLZtMVd`50uUPca`N~xkzHW
fYLR9AOe^6x%g2qLSFPG300000NkvXXu0mjf@{JV6

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 f0fffd0885bc2543f12d8785398efcbe76a6aa9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 587
zcmV-R0<`^!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006KNkl<Zc-p0s
zTS(Jk7>9QkblNVwiEt5g*JfH<x=4yO+{v^Wj&x_tR%WeOXc%?VsDW9OL0GN4v#2gY
zBd@znNTS0<)RZz^<qj-1YHm;eZ*);?4y23c|G@|E^Z(x8`^o^>|4{rG+`;yiqi5Oe
z2%u>_M2*?avIOSNUYh;=Ox+kvPY#4q&rcsqjN44#?o`XaEX6+py(>WD!5#`z<M7~w
zL;yyQlaF+f8|)z4XCmp<FmF^6t(O-{1ls*w)HVCy^)q;M5*|x}hXL{<N61}sk?psV
z^l6EiHZap5r$iunR+*geMiRW6fVUGxSw3=@+!Y6zGiDO*t<0H~OzX-BR7PjJ1b@S;
zr{r(?_;txnI$&U-Z8Nj_by5p!N(BNDATP&2<RG1e7f*`CnLZ0i&vw3AHuAZ#ijUfr
z<ptt$@v4Kx>u%}UPI6(p6rP2jV-Yf=L!?J8le!xwek+8SR9QhLXe8TfMw~yocaiL<
zBXfTUgEz>&p7XSJpF{6HMT5;xt<_73AZ}BUXj2ontN6Zm6R|z(N#7eF6$z8LeG!8v
zNc{nSabMJCSLqAHoMTN&=9{XSlLDLFS;Z%vf~aN{@!?SM&tlv{AO&42i0TxDnH`Ga
ztfw2+64kEegB05P+7&DeUtn8HCu);xX+b4Kk?33OOIblBwpcx~8jD*divR41Y*~Uz
Z{03jZjo?<qcliJS002ovPDHLkV1mO85TO77

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 c7fcd485f3198b307d7866245987abcbdaa02f69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 659
zcmV;E0&M+>P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0004QP)t-s|NsA-
z9S_iyjVwo8%!`CXUUT0!55jb7v{OhdM_esQUA9+EFH2u8N?t5STrEglFiT)8NL>1d
zRyb2<F-&3q&$IoVW&4d<Nn>{KU^M@$Z~dTX`;lGudQ0$OHUFt^=|~^pI1esKUjL_U
z|I)SgcuDtnNb_$*?Nuw~LK)vT4gH;F{g+|>%dz%%O7LGc>PjKxJrv$G3jW8f{>iWX
z$FBUbkoR{=`Lmt&r<3!bjQfsT?wW)`U2j2LaXVIO^rMgSp^W7`6yrG%-!u#EnS|gu
z4>?t7G*4tsX?y?Fw@GDpKw54zP-Jm#b^5iR@LDnUsFOrsb5Lx4PilQaUU4;1W$~Vf
zNMm+IUvu}VmiDHS=|daypNsLGi0_+*L|=0^QfL3HaR04uOlNxk)wloGxc}C;=tmwv
zTW>vBZ0}w&=SdzhO<`?gYVe$g-!%-~H457>2kn`IGfrdw(6lm5V*jab{?N2TU2%C-
zqwN3y01k9gPE!Ep^8oQ#{_pEq0PFw&K#AQH0002SNkl<Z7*}ItKm&{ntS$=oZ{0%@
zknowu#LV~;!u<~vu+`=Jzk=m6BmZardA~sdVf)M^7`HP50Tbf`kbu(r5Jtww4+UPi
zG2Yq@65wP7>J{U7CJIz@9VEcOB%H87;;9Ts(|ND}i#{U+$UZ&s2PjZ^i4hL={r$km
z5W&c}?Vm41U?ImhMg}`Z#&ZnDAnrNFcZ`1-8Qj$tG9*A0%>E1#D4Y42fr0ZI&=-7+
tA3*~AOrIDS{xUG|FtYsp$^aBV0{~5=JQ4XE6rcbA002ovPDHLkV1j?eFZuug

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 5dd25593d14b19c7d770eb4fef80211e4a11fd5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 528
zcmV+r0`L8aP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzvPnciRCwB?Q?W{1K@>f+&s_`w(Jq8w
ztrkJMG!_9Nq>$8UM6gd0@C#DqBU0%<Bq%~`>_Q4FyI^3~EFr#ici)?NZ|+>r%wlBO
zD2Bc74R@G3_uMn*&KOn2G}geBHghxiv^d}XpTwQ>{OK4#wCxXXpJb0(2H+n8LSYf|
zA$<1_+^^rToi56}r$=pEOfZO+k~5ylP?tcTW!#aCyfOR@8YZIOr2(VhUMRf~L_!)$
zHY$QZU^VxN81y#L3sBWiS3}Agp>znGN3eg27)^&3=?Jl^^N@J{d_aE%85Ynw0?1h1
zzW}T6b{}JTnXv{pk!trG^5Xz<*@M5#;mZ=L9*j&f*w}int=SgJ@5dMv1=bfA@bT3O
z+|LfAAd7yV0PIL00|}EFG+Ryh%H#8!CHUIo@T>#h>$7!TI5Mc6r8GXpBD)C&j^b36
zgK&87Q$Xqp-cdM-i4;;Lbs&s)aRgvl!CH$K``^;y%V%>0ASl;E{MZp?dt+_ExCkQ#
z)+KuTn`?ucz{%lP*S^TA(Zy)qd8JK!jn7|iX;N2j`JH~*d(fLO(>~{G0R{kD`vE@F
SMYI?I0000<MNUMnLSTZq7wZTB

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 806197c7d7ffabaf9facd322cd03d413e2b48764..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzqe(<TRCwB?Q%x@fK@fdySRcDSE)sEY
zbhQUZ4({UO<VM7ga2EeTB;w%g=D=ZpgM%MHSgei6?3j<9neHmpjj&mSsP0O2XS!a!
zSCvuBjQ?04{%QU1hl81kyT2rEUWe0N0M6ET)~15tiUMR4fl>_$6PWfB@`p$0`!=$$
z!;L$%dKftK$$_X+(if5#1o9$yjY`Q@=u-~;yB^3_$Xl>PD<GD<v#?=nK?2O`rzR4A
zBpM48B{(l(vl5i$AUQj*FPrF$6AdrHRm}~o(;vnXBiJMbmkz*o)$IbHPU7{lkt#(Y
zi7|qORaD{>L7rof1k@PRJE(pMP&6N*gaHc!%CuCEP?5?jXIH4zs#2Zt9LGqLbWAUA
z@cGH1>gs{Mx`n=MLf_na&mY>NU*mXj5{Gj`NCYeqHhW96u_dc|8N`vFAiE`0Ntzh$
z@4|@o@vUvdQoRsqzF)+>60#^_KWE}s5GTbgnTWfWrGXLPZ>P{`a_i&f7zS@XfcbJ{
z)LL6}K%Y(h=5MSoufx3~qW65S|KjxMcK|=xivR-vMsxq&PxtgA00000NkvXXu0mjf
D!}{j`

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 a4c758bd927471b59639276435d8867648389a83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 567
zcmV-70?7S|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00060Nkl<Zc-pO#
z-Aj{U7{+%N^uaptBqF2ZvYc({sGxM=yRDTJ8mxV~)U|SRNG*aoX{4a`Wh9o<Ns*2+
ziKu@;gbq57T2WR;>c(Ot=iXoM`<8Q|3&IXAZg}qN`aSpa@H{F&wHm4Z8(?6I`qRH?
zMZiMTD-!cVEC3^|<RVREd#q$a0tuIvFSVt_E7f9AfD(S(24fQ7QGi_3OZKLn%tbQ^
zw~lFHEAOk+6bDEl#@l{DM*Y$R&1A2gBz?iioTGxz#!}wt{{~PdkRWn>aE4r;oB56g
zQUL=q_1l@M-XtAiLvesO*o-*rMXtHNMkSmMnMgSI@YS@9kNZn_t6RG=;AK}hDNc+b
zPL7kCc*4Td8`9;O`0*@4dZd?Bw43B$C$o3M$lgByHTEFJrVt0LezbL`2>Q=4|9psq
zRYQ8T7lW&vy0e!#>bpd>BS_Wp7Rt>o@&Lheo<q)dGO;^KV@Iux^ut?B*K8&=)I~DV
z$=toG7$i^Su@+w4?n#vy?Mo9Jv<2DQ;N$!K>q=NwYPg%JeI<O*ZzQf=$83LC*;#Yg
ztpFs?5<p*n8jZ!B54U=JBnCQ&>(=u|y0q8jYnbW3!tNs;$^`pzK!v3--&oX(6P9m<
zPgh=3jwjfb1LUyWkQWzK_+fULovNKChw8V7LeHvy<4?JtjUT4RelGw3002ovPDHLk
FV1lcs5q<yw

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;
   }