diff --git a/cockatrice/resources/icons/essence/J.svg b/cockatrice/resources/icons/essence/J.svg
index cb7b06c8d..a6027d25c 100644
--- a/cockatrice/resources/icons/essence/J.svg
+++ b/cockatrice/resources/icons/essence/J.svg
@@ -1,15 +1 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96 96">
-  <title>J Essence (Jasper)</title>
-  <defs><linearGradient id="g" x1="0" x2="1" y1="0" y2="1">
-    <stop offset="0" stop-color="#222139"/><stop offset="1" stop-color="#131423"/>
-  </linearGradient></defs>
-  <circle cx="48" cy="48" r="43" fill="url(#g)" stroke="#ACB5E9" stroke-width="4"/>
-  <circle cx="48" cy="48" r="35" fill="none" stroke="#ACB5E9" stroke-opacity=".35" stroke-width="1.5"/>
-  <text x="48" y="65" text-anchor="middle" font-family="DejaVu Sans,Liberation Sans,sans-serif"
-        font-size="46" font-weight="700" fill="#F1F0FF">J</text>
-</svg>
-=======
-<svg version="1.1" width="1024" height="1024" viewBox="0 0 1024 1024" preserveAspectRatio="xMidYMid meet" shape-rendering="geometricPrecision" xmlns="http://www.w3.org/2000/svg"><g fill="#70452D" id="trace-layer-000" data-trace-color="#70452D" data-stack-index="0" data-stack-count="2" data-stack-scans="false" data-mask-colors="1" data-trace-optimization="strong" data-trace-bleed="1" data-source-components="2" data-merged-paths="true" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0.000000,1024.000000) scale(0.100000,-0.100000)"><path d="M4510 10221 c-8 -5 -40 -11 -70 -15 -157 -19 -357 -49 -371 -57 -9 -4 -63 -18 -120 -29 -375 -75 -1081 -352 -1391 -545 -29 -18 -73 -46 -98 -61 -71 -43 -158 -97 -193 -121 -155 -105 -207 -142 -242 -170 -55 -46 -79 -65 -160 -128 -38 -30 -87 -69 -107 -87 -184 -165 -361 -342 -526 -526 -18 -20 -57 -68 -87 -107 -63 -81 -82 -105 -128 -160 -28 -35 -65 -87 -170 -242 -24 -35 -78 -122 -121 -193 -15 -25 -43 -69 -61 -98 -40 -64 -222 -429 -266 -532 -103 -246 -241 -671 -279 -859 -11 -57 -25 -111 -29 -120 -5 -9 -19 -88 -31 -176 -12 -88 -27 -185 -33 -215 -15 -76 -15 -1244 0 -1320 6 -30 21 -127 33 -215 12 -88 26 -167 31 -176 4 -9 18 -63 29 -120 75 -375 352 -1081 545 -1391 18 -29 46 -73 61 -98 43 -71 97 -158 121 -193 105 -155 142 -207 170 -242 46 -55 65 -79 128 -160 30 -38 69 -87 87 -107 165 -184 342 -361 526 -526 20 -18 69 -57 107 -87 81 -63 105 -82 160 -128 22 -18 78 -59 125 -91 47 -31 99 -67 117 -79 18 -12 62 -40 98 -62 36 -22 79 -50 94 -62 16 -13 33 -23 38 -23 5 0 32 -15 61 -34 61 -39 423 -221 532 -267 246 -103 671 -241 859 -279 57 -11 111 -25 120 -29 9 -5 88 -19 176 -31 88 -12 185 -27 215 -33 76 -15 1244 -15 1320 0 30 6 127 21 215 33 88 12 167 26 176 31 9 4 63 18 120 29 187 37 618 178 854 278 156 66 613 298 649 330 12 10 49 36 84 58 34 21 77 49 95 61 155 105 207 142 242 170 55 46 79 65 160 128 39 30 87 69 107 87 184 165 361 342 526 526 18 20 57 69 87 107 63 81 82 105 128 160 28 35 65 87 170 242 24 35 78 122 121 193 15 25 43 69 61 98 40 64 222 429 266 532 103 246 241 671 279 859 11 57 25 111 29 120 5 9 19 88 31 176 12 88 27 185 33 215 15 76 15 1244 0 1320 -6 30 -21 127 -33 215 -12 88 -26 167 -31 176 -4 9 -18 63 -29 120 -75 375 -352 1081 -545 1391 -18 29 -46 73 -61 98 -43 71 -97 158 -121 193 -105 155 -142 207 -170 242 -46 55 -65 79 -128 160 -30 39 -69 87 -87 107 -165 184 -342 361 -526 526 -20 18 -68 57 -107 87 -81 63 -105 82 -160 128 -35 28 -87 65 -242 170 -35 24 -122 78 -193 121 -25 15 -69 43 -98 61 -64 40 -429 222 -532 266 -246 103 -671 241 -859 279 -57 11 -111 25 -120 29 -9 5 -88 19 -176 31 -88 12 -185 27 -215 33 -67 13 -1248 21 -1270 8z m1172 -796 c71 -8 168 -24 218 -35 482 -105 658 -644 320 -980 -153 -152 -193 -161 -865 -190 -615 -27 -882 -64 -1054 -145 -455 -216 -550 -1179 -210 -2107 129 -352 183 -363 268 -56 221 794 636 1277 1276 1487 242 79 395 72 715 -35 775 -258 1209 -1213 979 -2154 -217 -887 -888 -1523 -1746 -1656 -229 -35 -239 -41 -253 -165 -5 -41 -14 -306 -20 -589 -28 -1328 -65 -1880 -139 -2032 -235 -486 -958 -400 -1077 127 -24 103 -24 586 0 1225 24 635 32 1304 17 1473 -24 267 -44 310 -238 510 -1064 1096 -1487 3056 -906 4199 351 692 877 992 1878 1073 346 28 539 47 560 55 32 13 139 11 277 -5z M5879 6216 c-210 -75 -403 -502 -489 -1081 -58 -391 -41 -430 164 -370 529 153 847 919 555 1335 -75 107 -150 145 -230 116z" fill-rule="evenodd" data-source-components="2" /></g></g><g fill="#000000" id="trace-layer-001" data-trace-color="#000000" data-stack-index="1" data-stack-count="2" data-stack-scans="false" data-mask-colors="1" data-trace-optimization="strong" data-trace-bleed="1" data-source-components="1" data-merged-paths="true" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0.000000,1024.000000) scale(0.100000,-0.100000)"><path d="M5405 9440 c-21 -8 -214 -27 -560 -55 -1005 -82 -1533 -385 -1889 -1085 -526 -1033 -217 -2830 678 -3944 45 -56 148 -169 229 -253 194 -200 214 -243 238 -510 15 -169 7 -838 -17 -1473 -24 -639 -24 -1122 0 -1225 74 -328 433 -538 745 -436 197 65 355 239 396 439 36 172 75 946 95 1872 17 801 -2 734 210 765 903 132 1586 765 1809 1675 230 943 -209 1904 -989 2164 -320 107 -473 114 -715 35 -642 -211 -1065 -702 -1285 -1496 -83 -296 -123 -287 -249 55 -292 796 -267 1656 57 1991 161 166 397 216 1197 251 676 29 711 37 870 195 345 343 167 888 -326 996 -178 39 -444 60 -494 39z m611 -3255 c130 -75 215 -332 186 -564 -52 -414 -307 -747 -648 -846 -197 -57 -211 -25 -154 360 108 731 376 1188 616 1050z" fill-rule="evenodd" data-source-components="1" /></g></g></svg>
->>>>>>> 1fb06a985 (piles)
+<svg version="1.1" width="1024" height="1024" viewBox="0 0 1024 1024" preserveAspectRatio="xMidYMid meet" shape-rendering="geometricPrecision" xmlns="http://www.w3.org/2000/svg"><g fill="#70452D" id="trace-layer-000" data-trace-color="#70452D" data-stack-index="0" data-stack-count="2" data-stack-scans="false" data-mask-colors="1" data-trace-optimization="strong" data-trace-bleed="1" data-source-components="2" data-merged-paths="true" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0.000000,1024.000000) scale(0.100000,-0.100000)"><path d="M4510 10221 c-8 -5 -40 -11 -70 -15 -157 -19 -357 -49 -371 -57 -9 -4 -63 -18 -120 -29 -375 -75 -1081 -352 -1391 -545 -29 -18 -73 -46 -98 -61 -71 -43 -158 -97 -193 -121 -155 -105 -207 -142 -242 -170 -55 -46 -79 -65 -160 -128 -38 -30 -87 -69 -107 -87 -184 -165 -361 -342 -526 -526 -18 -20 -57 -68 -87 -107 -63 -81 -82 -105 -128 -160 -28 -35 -65 -87 -170 -242 -24 -35 -78 -122 -121 -193 -15 -25 -43 -69 -61 -98 -40 -64 -222 -429 -266 -532 -103 -246 -241 -671 -279 -859 -11 -57 -25 -111 -29 -120 -5 -9 -19 -88 -31 -176 -12 -88 -27 -185 -33 -215 -15 -76 -15 -1244 0 -1320 6 -30 21 -127 33 -215 12 -88 26 -167 31 -176 4 -9 18 -63 29 -120 75 -375 352 -1081 545 -1391 18 -29 46 -73 61 -98 43 -71 97 -158 121 -193 105 -155 142 -207 170 -242 46 -55 65 -79 128 -160 30 -38 69 -87 87 -107 165 -184 342 -361 526 -526 20 -18 69 -57 107 -87 81 -63 105 -82 160 -128 22 -18 78 -59 125 -91 47 -31 99 -67 117 -79 18 -12 62 -40 98 -62 36 -22 79 -50 94 -62 16 -13 33 -23 38 -23 5 0 32 -15 61 -34 61 -39 423 -221 532 -267 246 -103 671 -241 859 -279 57 -11 111 -25 120 -29 9 -5 88 -19 176 -31 88 -12 185 -27 215 -33 76 -15 1244 -15 1320 0 30 6 127 21 215 33 88 12 167 26 176 31 9 4 63 18 120 29 187 37 618 178 854 278 156 66 613 298 649 330 12 10 49 36 84 58 34 21 77 49 95 61 155 105 207 142 242 170 55 46 79 65 160 128 39 30 87 69 107 87 184 165 361 342 526 526 18 20 57 69 87 107 63 81 82 105 128 160 28 35 65 87 170 242 24 35 78 122 121 193 15 25 43 69 61 98 40 64 222 429 266 532 103 246 241 671 279 859 11 57 25 111 29 120 5 9 19 88 31 176 12 88 27 185 33 215 15 76 15 1244 0 1320 -6 30 -21 127 -33 215 -12 88 -26 167 -31 176 -4 9 -18 63 -29 120 -75 375 -352 1081 -545 1391 -18 29 -46 73 -61 98 -43 71 -97 158 -121 193 -105 155 -142 207 -170 242 -46 55 -65 79 -128 160 -30 39 -69 87 -87 107 -165 184 -342 361 -526 526 -20 18 -68 57 -107 87 -81 63 -105 82 -160 128 -35 28 -87 65 -242 170 -35 24 -122 78 -193 121 -25 15 -69 43 -98 61 -64 40 -429 222 -532 266 -246 103 -671 241 -859 279 -57 11 -111 25 -120 29 -9 5 -88 19 -176 31 -88 12 -185 27 -215 33 -67 13 -1248 21 -1270 8z m1172 -796 c71 -8 168 -24 218 -35 482 -105 658 -644 320 -980 -153 -152 -193 -161 -865 -190 -615 -27 -882 -64 -1054 -145 -455 -216 -550 -1179 -210 -2107 129 -352 183 -363 268 -56 221 794 636 1277 1276 1487 242 79 395 72 715 -35 775 -258 1209 -1213 979 -2154 -217 -887 -888 -1523 -1746 -1656 -229 -35 -239 -41 -253 -165 -5 -41 -14 -306 -20 -589 -28 -1328 -65 -1880 -139 -2032 -235 -486 -958 -400 -1077 127 -24 103 -24 586 0 1225 24 635 32 1304 17 1473 -24 267 -44 310 -238 510 -1064 1096 -1487 3056 -906 4199 351 692 877 992 1878 1073 346 28 539 47 560 55 32 13 139 11 277 -5z M5879 6216 c-210 -75 -403 -502 -489 -1081 -58 -391 -41 -430 164 -370 529 153 847 919 555 1335 -75 107 -150 145 -230 116z" fill-rule="evenodd" data-source-components="2" /></g></g><g fill="#000000" id="trace-layer-001" data-trace-color="#000000" data-stack-index="1" data-stack-count="2" data-stack-scans="false" data-mask-colors="1" data-trace-optimization="strong" data-trace-bleed="1" data-source-components="1" data-merged-paths="true" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0.000000,1024.000000) scale(0.100000,-0.100000)"><path d="M5405 9440 c-21 -8 -214 -27 -560 -55 -1005 -82 -1533 -385 -1889 -1085 -526 -1033 -217 -2830 678 -3944 45 -56 148 -169 229 -253 194 -200 214 -243 238 -510 15 -169 7 -838 -17 -1473 -24 -639 -24 -1122 0 -1225 74 -328 433 -538 745 -436 197 65 355 239 396 439 36 172 75 946 95 1872 17 801 -2 734 210 765 903 132 1586 765 1809 1675 230 943 -209 1904 -989 2164 -320 107 -473 114 -715 35 -642 -211 -1065 -702 -1285 -1496 -83 -296 -123 -287 -249 55 -292 796 -267 1656 57 1991 161 166 397 216 1197 251 676 29 711 37 870 195 345 343 167 888 -326 996 -178 39 -444 60 -494 39z m611 -3255 c130 -75 215 -332 186 -564 -52 -414 -307 -747 -648 -846 -197 -57 -211 -25 -154 360 108 731 376 1188 616 1050z" fill-rule="evenodd" data-source-components="1" /></g></g></svg>
\ No newline at end of file