diff --git a/core/icon.tid b/core/icon.tid
index 70187c55f..edc77a8e8 100644
--- a/core/icon.tid
+++ b/core/icon.tid
@@ -1,8 +1,6 @@
 title: $:/core/icon
 tags: $:/tags/Image
 
-<svg width="22pt" height="22pt" viewBox="0 0 128 128">
-    <g fill-rule="evenodd">
-        <path d="M64,0 L118.5596,32 L118.5596,96 L64,128 L9.44039956,96 L9.44039956,32 L64,0 Z M85.1274062,95.4080042 C81.5494069,95.3047989 79.9756384,95.3136745 78.1534289,92.2560668 L76.733228,92.2975844 C75.0801573,92.2226776 75.7690718,92.256631 74.6662332,92.2006037 C72.822332,92.1273894 73.1177105,90.3396383 72.7933215,89.3950941 C72.2744094,86.1888106 73.4800004,82.9659571 73.4419681,79.7590415 C73.428503,78.6206623 71.8498363,74.5912119 71.2858469,73.150598 C69.5178104,73.490271 67.7401827,73.5550323 65.9465048,73.6462337 C61.8120677,73.6358996 57.7056703,73.1192806 53.628962,72.4632293 C52.8345141,75.8119659 50.473106,80.4990751 52.4249964,83.9024219 C54.794228,87.4227874 56.45684,88.3980868 59.0339286,88.6103485 C61.6109895,88.8224384 62.1929077,91.7913467 61.5694236,92.8517379 C61.0175661,93.5845847 60.0476425,93.7176093 59.2235739,93.8951553 L57.5752147,93.9742093 C56.2780933,93.9296822 55.1187057,93.5723203 53.9629071,93.0211763 C52.0327307,91.9217335 50.0392154,89.6360411 48.5580719,87.9950695 C48.9028934,88.6503604 49.1085703,89.9296134 48.7958122,90.5249222 C47.9200982,91.7907825 44.1326257,91.7830485 42.3980986,90.996433 C40.4277043,90.1030197 35.6664658,83.8299171 34.9303347,79.1316435 C36.8887135,75.3525836 39.7416856,72.0607931 41.1850909,67.9459622 C38.038852,65.8974525 36.3537697,62.5626501 36.5725198,58.7851619 L36.6514762,58.3478913 C33.5557196,58.9392548 35.1611076,58.7192345 31.8308843,58.9762949 C21.2252017,58.9431831 11.8983553,51.6054609 17.1501626,40.2013394 C17.4916881,39.5260388 17.8165752,38.9120742 18.3955298,39.205288 C18.8602051,39.440565 18.793457,40.3843583 18.5597268,41.4309776 C15.5577203,55.057365 30.2297484,55.161659 39.2489049,52.6401668 C40.1440491,52.3898612 41.9243599,50.7040626 43.1576153,50.1452033 C45.1734825,49.231769 47.3615008,48.8611654 49.5329344,48.5941256 C54.9337165,47.9661653 61.4247946,50.8693254 64.7228943,50.9641212 C68.0210328,51.0589131 72.7127563,50.1582941 75.5928121,50.3479196 C77.6825379,50.4454833 79.734518,50.8303777 81.7507717,51.3786556 C83.0558682,44.8897102 83.1481363,40.1071855 86.2420439,39 C88.0578592,39.2926449 89.4570618,41.8175853 90.4927503,43.1666676 C92.6062592,43.0809984 94.6134653,43.6270518 96.6091885,44.233091 C100.222332,43.7098824 103.254293,41.6394732 106.445091,40.0288813 C103.211767,42.7223157 102.77315,47.1042714 103.142605,51.1564486 C103.280001,53.2591496 102.697713,55.5420684 101.977868,57.6949551 C100.630795,61.2025356 98.0292951,64.8997754 95.009908,64.7101481 C93.868464,64.673306 93.2053722,64.0138 92.3570101,63.3096933 C92.1924386,64.7358711 91.5456263,66.0084523 90.9221089,67.2697748 C89.4822206,70.066388 85.7194927,71.2987762 82.2354164,74.2849828 C78.7515768,77.2712347 83.3502408,87.9363951 84.4652464,89.8796277 C85.5800708,91.8230453 88.6922789,92.5339992 87.484639,94.28798 C87.1151913,94.8672415 86.5502884,95.0744181 85.9465544,95.2991347 L85.1274062,95.4080042 Z M45.0303574,86.5575217 L45.5828655,86.699414 C46.277142,86.4290005 47.6727292,86.8469317 48.4130246,87.0512628 C47.0498362,85.7357167 44.9960929,83.8038623 43.5164417,82.5859671 C43.0307739,81.1115156 43.2380006,79.6278431 43.3424927,78.122648 L43.3634516,77.9981264 C42.7802099,79.2030731 42.040056,80.3743566 41.6422405,81.6426885 C41.176708,83.3537773 43.7112632,85.1999538 44.6940603,86.2580263 L45.0303574,86.5575217 Z"></path>
-    </g>
+<svg id="tw-icon" xmlns="http://www.w3.org/2000/svg" height="22pt" width="22pt" version="1.1" viewBox="0 0 128 128">
+ <path d="m63.96,0-54.537,31.995,0,63.991,54.537,31.995,54.537-31.995,0-63.991l-54.54-31.994zm43.775,38.831c0.57047-0.16456,0.7191,0.16314,0.29087,1.1635-1.7128,4.0013-3.6491,4.2595-3.345,11.053,0.13975,2.0958-0.43132,4.3985-1.1635,6.5445-1.3701,3.4962-3.9099,7.1698-6.9808,6.9808-1.1609-0.03676-2.0458-0.75252-2.9087-1.4543-0.1674,1.4215-0.82016,2.6695-1.4543,3.9267-1.4645,2.7875-5.1824,4.0043-8.726,6.9808-3.5434,2.9765,1.0474,13.624,2.1815,15.561,1.1338,1.9371,4.2824,2.6147,3.0541,4.363-0.65666,0.82242-1.3639,1.0383-2.3269,1.1635-3.6391-0.1029-5.2728-0.0065-7.1262-3.0541-1.3654,0.08666-3.1242-0.12724-3.4904-0.14543-1.8754-0.07297-1.5607-1.8218-1.8906-2.7632-0.52777-3.1958,0.62042-6.4022,0.58173-9.5986-0.01396-1.1347-1.6079-5.1086-2.1815-6.5445-5.9848,0.9922-11.526,0.68428-17.888-0.72716-0.80802,3.3378-3.2941,7.9514-1.3089,11.344,2.4097,3.509,4.0688,4.5877,6.6899,4.7993,2.6211,0.21142,3.252,3.1606,2.6178,4.2176-1.1243,1.1028-2.602,0.94893-4.0721,1.018-1.3193-0.04421-2.4602-0.32326-3.6358-0.8726l-5.5265-5.0902c-1.3041-1.4457-3.2385-3.6064-4.6539-4.9447-0.3315-1.7276-0.36638-3.4368-0.14543-4.9447-0.55794,1.3241-1.2192,2.5329-1.5998,3.9267-0.15599,1.601,2.2767,5.2296,3.7813,5.6719,0.79715-0.09768,1.8307-0.02094,2.4724,0.4363,0.63473,0.79232,0.86176,1.7856,0.4363,2.4724-0.89066,1.2617-4.7804,1.2203-6.5445,0.4363-2.004-0.8905-6.8138-7.0972-7.5625-11.78,1.9918-3.7668,4.7856-7.097,6.2536-11.198-2.9419-2.6487-4.7431-3.3679-4.5084-9.5986-3.1486,0.58944-1.5576,0.32551-4.9447,0.58173-10.787-0.03301-20.322-7.2485-14.98-18.615,0.34736-0.67309,0.72006-1.3103,1.3089-1.018,0.47261,0.23452,0.38315,1.1383,0.14543,2.1815-3.0533,13.582,11.914,13.712,21.088,11.198,3.9744-3.4226,5.3827-3.6693,10.471-4.0721,5.4931-0.6259,12.062,2.3778,15.416,2.4724,3.3544,0.09452,8.1238-0.91617,11.053-0.72716,2.1253,0.09725,5.0755,0.47154,7.1262,1.018-0.53366-2.7249,0.27985-4.9717,1.1635-6.5445,1.4059-2.5026,0.57036-4.9538,2.6178-5.6719,1.8468,0.29169,3.1642,2.7274,4.2176,4.0721,2.1453-0.08466,4.2238,0.41396,6.2536,1.018,2.7561-0.39113,8.0326-4.7419,9.744-5.2356z"/>
 </svg>
\ No newline at end of file
diff --git a/editions/introduction/tiddlers/images/Motovun Jack.svg b/editions/introduction/tiddlers/images/Motovun Jack.svg
index b932c2ccb..d2bd0fbe4 100644
--- a/editions/introduction/tiddlers/images/Motovun Jack.svg	
+++ b/editions/introduction/tiddlers/images/Motovun Jack.svg	
@@ -1,3 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="34 107 510 317" width="510pt" height="317pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2012-05-10 07:32Z</dc:date><!-- Produced by OmniGraffle Professional 5.3.6 --></metadata><defs></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><g><title>Layer 1</title><path d="M 204.10294 372.67294 L 206.91333 373.50204 C 210.44484 371.92197 217.54364 374.36401 221.30923 375.55795 C 214.37523 367.871 203.92865 356.58286 196.40225 349.4665 C 193.93185 340.85104 194.98593 332.1817 195.51744 323.3866 L 195.62405 322.659 C 192.65733 329.6997 188.89246 336.5437 186.86893 343.95477 C 184.50095 353.95294 197.39323 364.74045 202.39233 370.92294 Z M 419.00293 414.95798 C 399.65295 414.411 391.14194 414.45804 381.28735 398.25296 L 373.60684 398.473 C 364.66696 398.076 368.39264 398.25595 362.42844 397.95901 C 352.45654 397.57098 354.05396 388.09604 352.29965 383.09003 C 349.49335 366.09698 356.01324 349.01611 355.80756 332.01971 C 355.73474 325.98639 347.19724 304.63062 344.14716 296.99548 C 334.58554 298.79572 324.97205 299.13895 315.27176 299.62231 C 292.91254 299.56754 270.70496 296.8295 248.65794 293.35248 C 244.36153 311.10052 231.59093 335.94183 242.14684 353.9793 C 254.95975 372.63696 263.95123 377.80597 277.88824 378.93094 C 291.8251 380.055 294.97214 395.78998 291.60031 401.40997 C 288.61584 405.294 283.37045 405.99902 278.91385 406.94 L 269.99945 407.35898 C 262.98456 407.12299 256.71454 405.229 250.46393 402.30798 C 240.02545 396.48102 229.24443 384.36703 221.23434 375.67001 C 223.09915 379.143 224.21146 385.92294 222.52005 389.07803 C 217.78415 395.78699 197.30133 395.746 187.92093 391.577 C 177.26495 386.84198 151.51596 353.59503 147.53493 328.69455 C 158.12593 308.66583 173.55493 291.2196 181.36093 269.41132 C 164.34593 258.55438 155.23293 240.88019 156.41594 220.8598 L 156.84294 218.5423 C 140.10095 221.67648 148.78296 220.51039 130.772964 221.87279 C 73.41696 221.6973 22.976959 182.80795 51.378967 122.367004 C 53.225952 118.787964 54.982956 115.534 58.113968 117.08801 C 60.626953 118.33496 60.265976 123.33699 59.001953 128.88399 C 42.766968 201.10277 122.11395 201.65552 170.88995 188.29181 C 175.73093 186.96521 185.35893 178.03061 192.02843 175.0687 C 202.93033 170.22757 214.76323 168.2634 226.50644 166.84811 C 255.71411 163.51997 290.81815 178.90649 308.65442 179.4089 C 326.4909 179.91129 351.86395 175.13808 367.43942 176.14308 C 378.74075 176.66016 389.83795 178.70007 400.74194 181.6059 C 407.79996 147.215 408.29895 121.867996 425.03094 116 C 434.85095 117.550995 442.4179 130.93298 448.01895 138.08301 L 448.04193 138.07898 C 459.4489 137.62897 470.30396 140.52301 481.09692 143.73497 C 500.63696 140.962006 517.03394 129.989 534.28992 121.45299 C 534.23596 121.721985 533.95398 121.81297 533.78595 121.99397 C 516.80396 135.72798 514.4319 158.952 516.42993 180.42822 C 517.17297 191.57237 514.02393 203.67166 510.13098 215.08179 C 502.84595 233.67169 488.77692 253.26677 472.44794 252.26176 C 466.27496 252.0665 462.68893 248.57117 458.10095 244.83946 C 457.21094 252.39809 453.71295 259.14267 450.34094 265.82758 C 442.55396 280.64941 422.20496 287.18097 403.36292 303.00763 C 384.52216 318.83453 409.39194 375.35904 415.42194 385.65802 C 421.45096 395.95798 438.28192 399.72598 431.75095 409.02194 C 429.75296 412.09198 426.69794 413.19 423.43292 414.38098 Z" fill="black"/></g></g></svg>
+<svg id="motovun-jack" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 510 316" version="1.1">
+<path id="jack" fill="#000" d="m188.07,269.52c-6.934-7.687-17.358-18.936-24.884-26.052-1.7627-9.186-1.953-18.79-0.7782-26.808-2.9667,7.0407-6.7316,13.885-8.7551,21.296-0.82942,8.5127,12.044,27.195,20.044,29.547,4.2386-0.51944,9.9669,0.51622,13.379,2.9476,3.375,4.2129,4.4892,8.9771,2.2269,12.629-4.7359,6.709-25.219,6.668-34.599,2.499-10.656-4.735-36.405-37.982-40.386-62.882,10.591-20.029,26.02-37.475,33.826-59.283-15.643-14.084-25.766-17.74-24.518-50.87-16.742,3.1342-8.06,1.9681-26.07,3.3305-57.356-0.17549-107.8-39.065-79.394-99.506,1.847-3.579,3.604-6.833,6.735-5.279,2.513,1.247,2.152,6.249,0.88798,11.796-16.235,72.219,63.112,72.772,111.89,59.408,21.133-18.199,28.559-19.302,55.616-21.444,29.208-3.3281,64.312,12.058,82.148,12.561,17.836,0.50239,43.21-4.2708,58.785-3.2658,11.301,0.51708,26.642,2.557,37.546,5.4628-2.8376-14.489,1.976-26.752,6.6744-35.115,7.4757-13.307,2.4852-26.673,13.372-30.491,9.82,1.551,17.387,14.933,22.988,22.083l0.023-0.004c11.407-0.45001,22.262,2.444,33.055,5.656,19.54-2.773,62.301-43.558,53.193-22.282-9.1076,21.276-19.477,22.853-17.86,58.975,0.74304,11.144-2.406,23.243-6.299,34.654-7.285,18.59-20.293,38.185-36.622,37.18-6.173-0.19526-10.82-3.6906-15.408-7.4223-0.89001,7.5586-4.388,14.303-7.76,20.988-7.787,14.822-28.136,21.353-46.978,37.18-18.841,15.827,6.029,72.351,12.059,82.65,6.029,10.3,22.86,14.068,16.329,23.364-3.4916,4.373-7.6294,5.2695-12.75,5.9349-19.35-0.54698-27.861-0.49994-37.716-16.705-7.2602,0.46082-16.911-0.19693-18.858-0.29395-9.9719-0.38803-8.3745-9.863-10.129-14.869-2.8063-16.993,3.7136-34.074,3.5079-51.07-0.0728-6.0333-8.6103-27.389-11.66-35.024-31.823,5.2758-61.661,3.862-95.489-3.643-4.2964,17.748-17.067,42.589-6.5111,60.627,12.813,18.658,21.804,23.827,35.741,24.952,13.937,1.1241,17.084,16.859,13.712,22.479-5.978,5.8641-13.783,5.5816-21.6,5.949-7.0149-0.23599-13.285-2.13-19.536-5.051"/>
+</svg>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/images/Motovun Jack.svg b/editions/tw5.com/tiddlers/images/Motovun Jack.svg
index b932c2ccb..d2bd0fbe4 100644
--- a/editions/tw5.com/tiddlers/images/Motovun Jack.svg	
+++ b/editions/tw5.com/tiddlers/images/Motovun Jack.svg	
@@ -1,3 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="34 107 510 317" width="510pt" height="317pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2012-05-10 07:32Z</dc:date><!-- Produced by OmniGraffle Professional 5.3.6 --></metadata><defs></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><g><title>Layer 1</title><path d="M 204.10294 372.67294 L 206.91333 373.50204 C 210.44484 371.92197 217.54364 374.36401 221.30923 375.55795 C 214.37523 367.871 203.92865 356.58286 196.40225 349.4665 C 193.93185 340.85104 194.98593 332.1817 195.51744 323.3866 L 195.62405 322.659 C 192.65733 329.6997 188.89246 336.5437 186.86893 343.95477 C 184.50095 353.95294 197.39323 364.74045 202.39233 370.92294 Z M 419.00293 414.95798 C 399.65295 414.411 391.14194 414.45804 381.28735 398.25296 L 373.60684 398.473 C 364.66696 398.076 368.39264 398.25595 362.42844 397.95901 C 352.45654 397.57098 354.05396 388.09604 352.29965 383.09003 C 349.49335 366.09698 356.01324 349.01611 355.80756 332.01971 C 355.73474 325.98639 347.19724 304.63062 344.14716 296.99548 C 334.58554 298.79572 324.97205 299.13895 315.27176 299.62231 C 292.91254 299.56754 270.70496 296.8295 248.65794 293.35248 C 244.36153 311.10052 231.59093 335.94183 242.14684 353.9793 C 254.95975 372.63696 263.95123 377.80597 277.88824 378.93094 C 291.8251 380.055 294.97214 395.78998 291.60031 401.40997 C 288.61584 405.294 283.37045 405.99902 278.91385 406.94 L 269.99945 407.35898 C 262.98456 407.12299 256.71454 405.229 250.46393 402.30798 C 240.02545 396.48102 229.24443 384.36703 221.23434 375.67001 C 223.09915 379.143 224.21146 385.92294 222.52005 389.07803 C 217.78415 395.78699 197.30133 395.746 187.92093 391.577 C 177.26495 386.84198 151.51596 353.59503 147.53493 328.69455 C 158.12593 308.66583 173.55493 291.2196 181.36093 269.41132 C 164.34593 258.55438 155.23293 240.88019 156.41594 220.8598 L 156.84294 218.5423 C 140.10095 221.67648 148.78296 220.51039 130.772964 221.87279 C 73.41696 221.6973 22.976959 182.80795 51.378967 122.367004 C 53.225952 118.787964 54.982956 115.534 58.113968 117.08801 C 60.626953 118.33496 60.265976 123.33699 59.001953 128.88399 C 42.766968 201.10277 122.11395 201.65552 170.88995 188.29181 C 175.73093 186.96521 185.35893 178.03061 192.02843 175.0687 C 202.93033 170.22757 214.76323 168.2634 226.50644 166.84811 C 255.71411 163.51997 290.81815 178.90649 308.65442 179.4089 C 326.4909 179.91129 351.86395 175.13808 367.43942 176.14308 C 378.74075 176.66016 389.83795 178.70007 400.74194 181.6059 C 407.79996 147.215 408.29895 121.867996 425.03094 116 C 434.85095 117.550995 442.4179 130.93298 448.01895 138.08301 L 448.04193 138.07898 C 459.4489 137.62897 470.30396 140.52301 481.09692 143.73497 C 500.63696 140.962006 517.03394 129.989 534.28992 121.45299 C 534.23596 121.721985 533.95398 121.81297 533.78595 121.99397 C 516.80396 135.72798 514.4319 158.952 516.42993 180.42822 C 517.17297 191.57237 514.02393 203.67166 510.13098 215.08179 C 502.84595 233.67169 488.77692 253.26677 472.44794 252.26176 C 466.27496 252.0665 462.68893 248.57117 458.10095 244.83946 C 457.21094 252.39809 453.71295 259.14267 450.34094 265.82758 C 442.55396 280.64941 422.20496 287.18097 403.36292 303.00763 C 384.52216 318.83453 409.39194 375.35904 415.42194 385.65802 C 421.45096 395.95798 438.28192 399.72598 431.75095 409.02194 C 429.75296 412.09198 426.69794 413.19 423.43292 414.38098 Z" fill="black"/></g></g></svg>
+<svg id="motovun-jack" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 510 316" version="1.1">
+<path id="jack" fill="#000" d="m188.07,269.52c-6.934-7.687-17.358-18.936-24.884-26.052-1.7627-9.186-1.953-18.79-0.7782-26.808-2.9667,7.0407-6.7316,13.885-8.7551,21.296-0.82942,8.5127,12.044,27.195,20.044,29.547,4.2386-0.51944,9.9669,0.51622,13.379,2.9476,3.375,4.2129,4.4892,8.9771,2.2269,12.629-4.7359,6.709-25.219,6.668-34.599,2.499-10.656-4.735-36.405-37.982-40.386-62.882,10.591-20.029,26.02-37.475,33.826-59.283-15.643-14.084-25.766-17.74-24.518-50.87-16.742,3.1342-8.06,1.9681-26.07,3.3305-57.356-0.17549-107.8-39.065-79.394-99.506,1.847-3.579,3.604-6.833,6.735-5.279,2.513,1.247,2.152,6.249,0.88798,11.796-16.235,72.219,63.112,72.772,111.89,59.408,21.133-18.199,28.559-19.302,55.616-21.444,29.208-3.3281,64.312,12.058,82.148,12.561,17.836,0.50239,43.21-4.2708,58.785-3.2658,11.301,0.51708,26.642,2.557,37.546,5.4628-2.8376-14.489,1.976-26.752,6.6744-35.115,7.4757-13.307,2.4852-26.673,13.372-30.491,9.82,1.551,17.387,14.933,22.988,22.083l0.023-0.004c11.407-0.45001,22.262,2.444,33.055,5.656,19.54-2.773,62.301-43.558,53.193-22.282-9.1076,21.276-19.477,22.853-17.86,58.975,0.74304,11.144-2.406,23.243-6.299,34.654-7.285,18.59-20.293,38.185-36.622,37.18-6.173-0.19526-10.82-3.6906-15.408-7.4223-0.89001,7.5586-4.388,14.303-7.76,20.988-7.787,14.822-28.136,21.353-46.978,37.18-18.841,15.827,6.029,72.351,12.059,82.65,6.029,10.3,22.86,14.068,16.329,23.364-3.4916,4.373-7.6294,5.2695-12.75,5.9349-19.35-0.54698-27.861-0.49994-37.716-16.705-7.2602,0.46082-16.911-0.19693-18.858-0.29395-9.9719-0.38803-8.3745-9.863-10.129-14.869-2.8063-16.993,3.7136-34.074,3.5079-51.07-0.0728-6.0333-8.6103-27.389-11.66-35.024-31.823,5.2758-61.661,3.862-95.489-3.643-4.2964,17.748-17.067,42.589-6.5111,60.627,12.813,18.658,21.804,23.827,35.741,24.952,13.937,1.1241,17.084,16.859,13.712,22.479-5.978,5.8641-13.783,5.5816-21.6,5.949-7.0149-0.23599-13.285-2.13-19.536-5.051"/>
+</svg>
\ No newline at end of file