diff --git a/core/images/close-button.tid b/core/images/close-button.tid
index d75f9ee09..da83fd5fb 100644
--- a/core/images/close-button.tid
+++ b/core/images/close-button.tid
@@ -1,4 +1,8 @@
 title: $:/core/images/close-button
 tags: $:/tags/Image
 
-<svg class="tc-image-close-button tc-image-button" viewBox="222 150 56 56" width="22pt" height="22pt"><path d="M 249.56668 185.88827 L 267.06757 203.38916 C 269.26427 205.58586 272.82582 205.58586 275.02252 203.38916 L 275.02252 203.38916 C 277.21922 201.19246 277.21922 197.63091 275.02252 195.43421 L 257.52163 177.93332 L 275.38916 160.06579 C 277.58586 157.86909 277.58586 154.30754 275.38916 152.11084 C 273.19246 149.91414 269.63091 149.91414 267.43421 152.11084 L 249.56668 169.97837 L 232.06579 152.47748 L 232.06579 152.47748 C 232.06579 152.47748 232.06579 152.47748 232.06579 152.47748 C 229.86909 150.28078 226.30754 150.28078 224.11084 152.47748 L 224.11084 152.47748 C 221.91414 154.674175 221.91414 158.23573 224.11084 160.43243 L 241.61173 177.93332 L 224.47748 195.06757 L 224.47748 195.06757 L 224.47748 195.06757 C 224.47748 195.06757 224.47748 195.06757 224.47748 195.06757 C 222.28078 197.26427 222.28078 200.82583 224.47748 203.02252 L 224.47748 203.02252 C 226.67418 205.21922 230.23573 205.21922 232.43243 203.02252 Z"/></svg>
+<svg class="tc-image-close-button tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+    <g fill-rule="evenodd">
+        <path d="M65.0864256,75.4091629 L14.9727349,125.522854 C11.8515951,128.643993 6.78104858,128.64922 3.65685425,125.525026 C0.539017023,122.407189 0.5336324,117.334539 3.65902635,114.209145 L53.7727171,64.0954544 L3.65902635,13.9817637 C0.537886594,10.8606239 0.532659916,5.79007744 3.65685425,2.6658831 C6.77469148,-0.451954124 11.8473409,-0.457338747 14.9727349,2.66805521 L65.0864256,52.7817459 L115.200116,2.66805521 C118.321256,-0.453084553 123.391803,-0.458311231 126.515997,2.6658831 C129.633834,5.78372033 129.639219,10.8563698 126.513825,13.9817637 L76.4001341,64.0954544 L126.513825,114.209145 C129.634965,117.330285 129.640191,122.400831 126.515997,125.525026 C123.39816,128.642863 118.32551,128.648248 115.200116,125.522854 L65.0864256,75.4091629 L65.0864256,75.4091629 Z"></path>
+    </g>
+</svg>
diff --git a/core/images/down-arrow.tid b/core/images/down-arrow.tid
index e67296a84..c60fd5a33 100644
--- a/core/images/down-arrow.tid
+++ b/core/images/down-arrow.tid
@@ -1,4 +1,6 @@
 title: $:/core/images/down-arrow
 tags: $:/tags/Image
 
-<svg class="tc-image-down-arrow tc-image-button" viewBox="63 152 64 64" width="22pt" height="22pt"><path d="M 98.001786 212.81802 L 123.45763 187.36218 C 125.21499 185.60482 125.21499 182.75557 123.45763 180.99821 C 121.70027 179.24086 118.85103 179.24086 117.09367 180.99821 L 94.819805 203.27208 L 72.54594 180.99821 C 70.788582 179.24086 67.93934 179.24086 66.18198 180.99821 C 64.42462 182.75557 64.42462 185.60482 66.18198 187.36218 L 91.637825 212.81802 C 93.395184 214.57538 96.244426 214.57538 98.001786 212.81802 Z"/></svg>
+<svg class="tc-image-down-arrow tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+    <path d="M109.35638,81.3533152 C107.923899,82.7869182 105.94502,83.6751442 103.759224,83.6751442 L24.5910645,83.6751442 C20.225873,83.6751442 16.6751442,80.1307318 16.6751442,75.7584775 C16.6751442,71.3951199 20.2192225,67.8418109 24.5910645,67.8418109 L95.8418109,67.8418109 L95.8418109,-3.40893546 C95.8418109,-7.77412698 99.3862233,-11.3248558 103.758478,-11.3248558 C108.121835,-11.3248558 111.675144,-7.78077754 111.675144,-3.40893546 L111.675144,75.7592239 C111.675144,77.9416955 110.789142,79.9205745 109.356651,81.3538862 Z" transform="translate(64.175144, 36.175144) rotate(45.000000) translate(-64.175144, -36.175144) "></path>
+</svg>
diff --git a/core/images/edit-button.tid b/core/images/edit-button.tid
index 28334b516..b983945fd 100644
--- a/core/images/edit-button.tid
+++ b/core/images/edit-button.tid
@@ -1,4 +1,9 @@
 title: $:/core/images/edit-button
 tags: $:/tags/Image
 
-<svg class="tc-image-edit-button tc-image-button" viewBox="244 193 20 22" width="20pt" height="22pt"><path d="M 257.33334 196.80951 L 245.90476 207.2857 L 244 212.0476 L 248.7619 210.14284 L 260.19048 199.66665 Z M 259.2381 194.90475 L 258.28566 195.85716 L 261.14284 198.71428 L 262.09522 197.76187 Z M 261.14286 193 L 260.19042 193.95241 L 263.04762 196.80953 L 264 195.85714 Z M 244 213.72882 C 244 213.72882 247.4281 215.43353 250.8572 213.7288 C 254.28599 212.02405 261.14284 214.86531 261.14284 214.86531 L 261.14284 213.72884 C 261.14284 213.72884 254.28577 210.88755 250.8572 212.5923 C 247.42858 214.29712 244 212.59228 244 212.59228 Z"/></svg>
+<svg class="tc-image-edit-button tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+    <g fill-rule="evenodd">
+        <path d="M116.870058,45.3431458 L108.870058,45.3431458 L108.870058,45.3431458 L108.870058,61.3431458 L116.870058,61.3431458 L116.870058,45.3431458 Z M124.870058,45.3431458 L127.649881,45.3431458 C132.066101,45.3431458 135.656854,48.9248678 135.656854,53.3431458 C135.656854,57.7524334 132.07201,61.3431458 127.649881,61.3431458 L124.870058,61.3431458 L124.870058,45.3431458 Z M100.870058,45.3431458 L15.6638275,45.3431458 C15.5064377,45.3431458 15.3501085,45.3476943 15.1949638,45.3566664 L15.1949638,45.3566664 C15.0628002,45.3477039 14.928279,45.3431458 14.7913977,45.3431458 C6.68160973,45.3431458 -8.34314575,53.3431458 -8.34314575,53.3431458 C-8.34314575,53.3431458 6.85614548,61.3431458 14.7913977,61.3431458 C14.9266533,61.3431458 15.0596543,61.3384973 15.190398,61.3293588 C15.3470529,61.3385075 15.5049057,61.3431458 15.6638275,61.3431458 L100.870058,61.3431458 L100.870058,45.3431458 L100.870058,45.3431458 Z" transform="translate(63.656854, 53.343146) rotate(-45.000000) translate(-63.656854, -53.343146) "></path>
+        <path d="M35.1714596,124.189544 C41.9594858,123.613403 49.068777,121.917633 58.85987,118.842282 C60.6854386,118.268877 62.4306907,117.705515 65.1957709,116.802278 C81.1962861,111.575575 87.0734839,109.994907 93.9414474,109.655721 C102.29855,109.242993 107.795169,111.785371 111.520478,118.355045 C112.610163,120.276732 115.051363,120.951203 116.97305,119.861518 C118.894737,118.771832 119.569207,116.330633 118.479522,114.408946 C113.146151,105.003414 104.734907,101.112919 93.5468356,101.66546 C85.6716631,102.054388 79.4899908,103.716944 62.7116783,109.197722 C59.9734132,110.092199 58.2519873,110.64787 56.4625698,111.20992 C37.002649,117.322218 25.6914684,118.282267 16.8654804,112.957098 C14.9739614,111.815848 12.5154166,112.424061 11.3741667,114.31558 C10.2329168,116.207099 10.84113,118.665644 12.7326489,119.806894 C19.0655164,123.627836 26.4866335,124.926678 35.1714596,124.189544 Z"></path>
+    </g>
+</svg>
diff --git a/core/images/export-button.tid b/core/images/export-button.tid
index f9ebba265..79f7cb777 100644
--- a/core/images/export-button.tid
+++ b/core/images/export-button.tid
@@ -3,8 +3,7 @@ tags: $:/tags/Image
 
 <svg class="tc-image-export-button tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
     <g fill-rule="evenodd">
-        <path d="M41.7315603,46.6092727 L19.0549112,69.0259341 C17.537419,70.5260283 17.537419,72.9581738 19.0549112,74.458268 L41.7315603,96.8749294 C43.2490525,98.3750235 45.709406,98.3750235 47.2268982,96.8749294 C47.9556265,96.1545559 48.3650205,95.1775235 48.3650205,94.1587625 L48.3650205,87.107064 C48.3650205,84.9856107 50.1047541,83.2658232 52.2508118,83.2658232 L64.8796336,83.2658232 C67.0256914,83.2658232 68.7654249,81.5460357 68.7654249,79.4245825 L68.7654249,64.0596196 C68.7654249,61.9381664 67.0256914,60.2183789 64.8796336,60.2183789 L64.8796336,60.2183789 L52.2508118,60.2183789 C50.1047541,60.2183789 48.3650205,58.4985914 48.3650205,56.3771381 L48.3650205,49.3254396 C48.3650205,47.2039864 46.625287,45.4841989 44.4792292,45.4841989 C43.4486526,45.4841989 42.4602886,45.8888992 41.7315603,46.6092727 L41.7315603,46.6092727 Z"></path>
-        <path d="M18.0832079,55.9999998 L18.0832079,5.5 C18.0832079,2.46243388 20.5456418,0 23.5832079,0 L73.3832079,0 C74.8484379,0 76.2531002,0.584654954 77.2856139,1.62427715 L110.485614,35.0528486 C111.508913,36.0831928 112.083208,37.4764177 112.083208,38.9285714 L112.083208,122.5 C112.083208,125.537566 109.620774,128 106.583208,128 L23.5832079,128 C20.5456418,128 18.0832079,125.537566 18.0832079,122.5 L18.0832079,87.000002 L33.0832079,102.000003 L33.0832079,110 L95.0832079,110 L95.0832079,47.4474394 L71.6609857,47.4474394 C69.0453038,47.4474394 66.9248746,45.3102326 66.9248746,42.6738544 L66.9248746,18 L33.0832079,18 L33.0832079,41 L18.0832079,55.9999998 Z"></path>
-        <path d="M106.083208,44.9285714 C110.974093,44.9285714 113.432107,39.0230699 109.985614,35.5528486 L76.7856139,2.12427715 C73.3262993,-1.3588537 67.3832079,1.09092089 67.3832079,6 L67.3832079,39.4285714 C67.3832079,42.4661376 69.8456418,44.9285714 72.8832079,44.9285714 L106.083208,44.9285714 Z"></path>
+        <path d="M56,27.745166 L47.0344555,36.7107105 C43.9098032,39.8353628 38.8399231,39.8399231 35.7157288,36.7157288 C32.5978915,33.5978915 32.5937812,28.5239678 35.720747,25.397002 L58.3381275,2.77962151 C59.90129,1.21645896 61.9512803,0.43415482 64.0009527,0.433793628 L63.9957983,0.435311721 C66.0459741,0.43458988 68.0975534,1.21530243 69.6618725,2.77962151 L92.279253,25.397002 C95.4039053,28.5216543 95.4084656,33.5915344 92.2842712,36.7157288 C89.166434,39.833566 84.0925103,39.8376763 80.9655445,36.7107105 L72,27.745166 L72,89.0007542 C72,93.4118951 68.418278,97 64,97 C59.5907123,97 56,93.4186157 56,89.0007542 L56,27.745166 Z"></path>
+        <path d="M2.34316247,50.3424095 C0.895437396,51.7898905 0,53.7899102 0,56.0000511 L0,120 C0,122.207976 0.896743507,124.207034 2.34653329,125.656855 C3.79537104,127.10457 5.79536436,128 8,128 C8.00116233,128 8.0023246,128 8.00348646,127.999999 C8.00464867,128 8.00581094,128 8.00697327,128 L119.993027,128 C122.205254,128 124.207939,127.101378 125.657096,125.651198 L125.656838,125.65759 C127.104563,124.210109 128,122.21009 128,119.999949 L128,56.0000511 C128,51.5817449 124.409288,48 120,48 C119.998817,48 119.997634,48.0000003 119.996452,48.0000008 C119.995269,48.0000003 119.994086,48 119.992903,48 L88.0070969,48 C83.5848994,48 80,51.5907123 80,56 C80,60.418278 83.5881712,64 88.0070969,64 L112,64 L112,112 L16,112 L16,112 L16,64 L39.9929031,64 C44.4151006,64 48,60.4092877 48,56 C48,51.581722 44.4118288,48 39.9929031,48 L8.00709688,48 C5.79481532,48 3.7920823,48.8986387 2.34289945,50.3488427 Z"></path>
     </g>
 </svg>
diff --git a/core/images/info-button.tid b/core/images/info-button.tid
index f19df45bc..14c7f0991 100644
--- a/core/images/info-button.tid
+++ b/core/images/info-button.tid
@@ -1,4 +1,8 @@
 title: $:/core/images/info-button
 tags: $:/tags/Image
 
-<svg class="tc-image-info-button tc-image-button" viewBox="294 150 58 58" width="22pt" height="22pt"><path d="M 342.76236 158.98764 C 331.77887 148.0041 313.97113 148.0041 302.98764 158.98764 C 292.0041 169.97113 292.0041 187.77887 302.98764 198.76236 C 313.97113 209.7459 331.77887 209.7459 342.76236 198.76236 C 353.7459 187.77887 353.7459 169.97113 342.76236 158.98764 M 326.5425 157.5 L 326.5425 157.5 C 327.72545 157.5 328.72201 157.91022 329.5337 158.73088 C 330.34465 159.55157 330.75 160.54402 330.75 161.7075 C 330.75 162.87172 330.33979 163.86316 329.51911 164.68385 C 328.69842 165.5045 327.70674 165.91501 326.5425 165.91501 C 325.39801 165.91501 324.4153 165.5045 323.5946 164.68385 C 322.77393 163.86316 322.36372 162.87172 322.36372 161.7075 C 322.36372 160.54402 322.76906 159.55157 323.58 158.73088 C 324.39171 157.91022 325.3793 157.5 326.5425 157.5 Z M 327.80211 190.47259 C 324.91945 195.49132 321.85778 198 318.61462 198 C 317.37452 198 316.38691 197.65158 315.65186 196.9555 C 314.9176 196.25866 314.54943 195.37617 314.54943 194.30782 C 314.54943 193.60202 314.71223 192.70572 315.03629 191.61813 L 319.0151 177.93651 C 319.39685 176.61922 319.58735 175.62754 319.58735 174.95991 C 319.58735 174.53996 319.40582 174.16692 319.04356 173.84286 C 318.68052 173.51905 318.18469 173.35701 317.55527 173.35701 C 317.26861 173.35701 316.92506 173.36677 316.5246 173.38548 L 316.89661 172.2407 L 326.59967 170.66627 L 328.31744 170.66627 L 322.44986 191.01638 C 322.12503 192.18064 321.963 192.94337 321.963 193.30666 C 321.963 193.51588 322.04862 193.71121 322.2204 193.89273 C 322.39218 194.07425 322.5737 194.16554 322.7642 194.16477 C 323.08903 194.16554 323.4131 194.02221 323.73792 193.73559 C 324.59605 193.02976 325.6267 191.75142 326.82838 189.90008 Z"/></svg>
+<svg class="tc-image-info-button tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+    <g fill-rule="evenodd">
+	    <path d="M64,128 C99.346224,128 128,99.346224 128,64 C128,28.653776 99.346224,0 64,0 C28.653776,0 0,28.653776 0,64 C0,99.346224 28.653776,128 64,128 Z M64,38 C68.418278,38 72,34.418278 72,30 C72,25.581722 68.418278,22 64,22 C59.581722,22 56,25.581722 56,30 C56,34.418278 59.581722,38 64,38 Z M64,44 C59.581722,44 56,47.578055 56,52.0085154 L56,99.9914846 C56,104.414466 59.5907123,108 64,108 C68.418278,108 72,104.421945 72,99.9914846 L72,52.0085154 C72,47.5855345 68.4092877,44 64,44 Z"></path>
+    </g>
+</svg>
diff --git a/core/images/new-button.tid b/core/images/new-button.tid
index 758496661..64466e9e7 100644
--- a/core/images/new-button.tid
+++ b/core/images/new-button.tid
@@ -1,4 +1,8 @@
 title: $:/core/images/new-button
 tags: $:/tags/Image
 
-<svg class="tc-image-new-button tc-image-button" viewBox="83 81 50 50" width="22pt" height="22pt"><path d="M 101.25 112.5 L 101.25 127.5 C 101.25 127.5 101.25 127.5 101.25 127.5 L 101.25 127.5 C 101.25 129.156855 102.593146 130.5 104.25 130.5 L 111.75 130.5 C 113.406854 130.5 114.75 129.156854 114.75 127.5 L 114.75 112.5 L 129.75 112.5 C 131.406854 112.5 132.75 111.156854 132.75 109.5 L 132.75 102 C 132.75 100.343146 131.406854 99 129.75 99 L 114.75 99 L 114.75 84 C 114.75 82.343146 113.406854 81 111.75 81 L 104.25 81 C 104.25 81 104.25 81 104.25 81 C 102.593146 81 101.25 82.343146 101.25 84 L 101.25 99 L 86.25 99 C 86.25 99 86.25 99 86.25 99 C 84.593146 99 83.25 100.343146 83.25 102 L 83.25 109.5 C 83.25 109.5 83.25 109.5 83.25 109.5 L 83.25 109.5 C 83.25 111.156855 84.593146 112.5 86.25 112.5 Z"/></svg>
+<svg class="tc-image-new-button tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+    <g fill-rule="evenodd">
+        <path d="M56,72 L8.00697327,72 C3.59075293,72 0,68.418278 0,64 C0,59.5907123 3.58484404,56 8.00697327,56 L56,56 L56,8.00697327 C56,3.59075293 59.581722,0 64,0 C68.4092877,0 72,3.58484404 72,8.00697327 L72,56 L119.993027,56 C124.409247,56 128,59.581722 128,64 C128,68.4092877 124.415156,72 119.993027,72 L72,72 L72,119.993027 C72,124.409247 68.418278,128 64,128 C59.5907123,128 56,124.415156 56,119.993027 L56,72 L56,72 Z"></path>
+    </g>
+</svg>
diff --git a/core/images/options-button.tid b/core/images/options-button.tid
index cd2f4193e..e9caa12fe 100644
--- a/core/images/options-button.tid
+++ b/core/images/options-button.tid
@@ -1,8 +1,11 @@
 title: $:/core/images/options-button
 tags: $:/tags/Image
 
-<svg class="tc-image-options-button tc-image-button" width="128px" height="128px" viewBox="0 0 128 128">
-    <g fill-rule="evenodd">
-        <path d="M83.7158408,27.0926388 C83.7158408,27.0926388 78.7509694,24.7495918 76.1564909,23.9643158 L76.1564909,6.8672111 C76.1564909,3.07455514 73.0772662,0 69.2869248,0 L58.7133217,0 C54.9193651,0 51.8437556,3.08385542 51.8437556,6.8672111 L51.8437556,23.9643158 C49.2492771,24.7495918 46.7162956,25.7922903 44.2844247,27.0926388 L32.1965299,15.0046421 C29.5150685,12.3231581 25.1639437,12.3267416 22.4837303,15.0069364 L15.0069601,22.483655 C12.3241904,25.1664061 12.3297365,29.5215534 15.0046608,32.1964619 L27.0927287,44.2844586 C25.7925123,46.7162145 24.7496995,49.2491947 23.9644231,51.8436908 L6.86724183,51.8436908 C3.0745689,51.8436908 0,54.9229187 0,58.7132641 L0,69.2868781 C0,73.0808387 3.08386922,76.1564514 6.86724183,76.1564514 L23.9644231,76.1564514 C24.7496995,78.7509286 25.7925123,81.2839278 27.0927287,83.7157974 L15.0046608,95.8036994 C12.323161,98.4851624 12.3267468,102.83629 15.0069601,105.516506 L22.4837303,112.993282 C25.1665,115.676054 29.521644,115.670505 32.1965299,112.995576 L44.2844247,100.907484 C46.7162956,102.207966 49.2492771,103.250664 51.8437556,104.035826 L51.8437556,121.13283 C51.8437556,124.925463 54.9229803,128 58.7133217,128 L69.2869248,128 C73.0808814,128 76.1564909,124.916163 76.1564909,121.13283 L76.1564909,104.035826 C78.7509694,103.250664 81.2839699,102.207966 83.7158408,100.907484 L95.8037356,112.995576 C98.4851969,115.677081 102.836289,115.673498 105.516461,112.993282 L112.993118,105.516506 C115.675846,102.833734 115.670299,98.478587 112.995413,95.8036994 L100.907518,83.7157974 C102.207753,81.2839278 103.250433,78.7509286 104.035842,76.1564514 L121.132834,76.1564514 C124.925465,76.1564514 128,73.0772235 128,69.2868781 L128,58.7132641 C128,54.9193035 124.916165,51.8436908 121.132834,51.8436908 L104.035842,51.8436908 C103.250433,49.2491947 102.207753,46.7162145 100.907518,44.2844586 L112.995413,32.1964619 C115.676874,29.5149779 115.67329,25.1638497 112.993118,22.483655 L105.516461,15.0069364 C102.833732,12.3241853 98.4786215,12.3297336 95.8037356,15.0046421 L83.7158408,27.0926388 Z M77.9246471,50.0754324 C85.6148612,57.7658285 85.6148612,70.2341051 77.9246471,77.9244822 C70.2342432,85.6149162 57.765942,85.6149162 50.075538,77.9244822 C42.3850771,70.2341051 42.3850771,57.7658285 50.075538,50.0754324 C57.765942,42.3851123 70.2342432,42.3851123 77.9246471,50.0754324 L77.9246471,50.0754324 Z"></path>
+<svg class="tc-image-options-button tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd" transform="translate(-23.000000, -23.000000)">
+        <path d="M87,127 C109.09139,127 127,109.09139 127,87 C127,64.90861 109.09139,47 87,47 C64.90861,47 47,64.90861 47,87 C47,109.09139 64.90861,127 87,127 Z M87,111 C100.254834,111 111,100.254834 111,87 C111,73.745166 100.254834,63 87,63 C73.745166,63 63,73.745166 63,87 C63,100.254834 73.745166,111 87,111 Z"></path>
+        <path d="M118.99846,79 C114.581032,79 111,82.5907123 111,87 L111,87 C111,91.418278 114.584935,95 118.99846,95 L143.00154,95 C147.418968,95 151,91.4092877 151,87 L151,87 C151,82.581722 147.415065,79 143.00154,79 L118.99846,79 Z M87,111 C82.581722,111 79,114.584935 79,118.99846 L79,143.00154 C79,147.418968 82.5907123,151 87,151 L87,151 C91.418278,151 95,147.415065 95,143.00154 L95,118.99846 C95,114.581032 91.4092877,111 87,111 L87,111 Z M30.9984599,79 C26.5810325,79 23,82.5907123 23,87 L23,87 C23,91.418278 26.5849353,95 30.9984599,95 L55.0015401,95 C59.4189675,95 63,91.4092877 63,87 L63,87 C63,82.581722 59.4150647,79 55.0015401,79 L30.9984599,79 Z M87,23 C82.581722,23 79,26.5849353 79,30.9984599 L79,55.0015401 C79,59.4189675 82.5907123,63 87,63 L87,63 C91.418278,63 95,59.4150647 95,55.0015401 L95,30.9984599 C95,26.5810325 91.4092877,23 87,23 L87,23 Z"></path>
+        <path d="M118.99846,79 C114.581032,79 111,82.5907123 111,87 L111,87 C111,91.418278 114.584935,95 118.99846,95 L143.00154,95 C147.418968,95 151,91.4092877 151,87 L151,87 C151,82.581722 147.415065,79 143.00154,79 L118.99846,79 Z M87,111 C82.581722,111 79,114.584935 79,118.99846 L79,143.00154 C79,147.418968 82.5907123,151 87,151 L87,151 C91.418278,151 95,147.415065 95,143.00154 L95,118.99846 C95,114.581032 91.4092877,111 87,111 L87,111 Z M30.9984599,79 C26.5810325,79 23,82.5907123 23,87 L23,87 C23,91.418278 26.5849353,95 30.9984599,95 L55.0015401,95 C59.4189675,95 63,91.4092877 63,87 L63,87 C63,82.581722 59.4150647,79 55.0015401,79 L30.9984599,79 Z M87,23 C82.581722,23 79,26.5849353 79,30.9984599 L79,55.0015401 C79,59.4189675 82.5907123,63 87,63 L87,63 C91.418278,63 95,59.4150647 95,55.0015401 L95,30.9984599 C95,26.5810325 91.4092877,23 87,23 L87,23 Z" transform="translate(87.000000, 87.000000) rotate(-60.000000) translate(-87.000000, -87.000000) "></path>
+        <path d="M118.99846,79 C114.581032,79 111,82.5907123 111,87 L111,87 C111,91.418278 114.584935,95 118.99846,95 L143.00154,95 C147.418968,95 151,91.4092877 151,87 L151,87 C151,82.581722 147.415065,79 143.00154,79 L118.99846,79 Z M87,111 C82.581722,111 79,114.584935 79,118.99846 L79,143.00154 C79,147.418968 82.5907123,151 87,151 L87,151 C91.418278,151 95,147.415065 95,143.00154 L95,118.99846 C95,114.581032 91.4092877,111 87,111 L87,111 Z M30.9984599,79 C26.5810325,79 23,82.5907123 23,87 L23,87 C23,91.418278 26.5849353,95 30.9984599,95 L55.0015401,95 C59.4189675,95 63,91.4092877 63,87 L63,87 C63,82.581722 59.4150647,79 55.0015401,79 L30.9984599,79 Z M87,23 C82.581722,23 79,26.5849353 79,30.9984599 L79,55.0015401 C79,59.4189675 82.5907123,63 87,63 L87,63 C91.418278,63 95,59.4150647 95,55.0015401 L95,30.9984599 C95,26.5810325 91.4092877,23 87,23 L87,23 Z" transform="translate(87.000000, 87.000000) rotate(-30.000000) translate(-87.000000, -87.000000) "></path>
     </g>
 </svg>
diff --git a/core/images/right-arrow.tid b/core/images/right-arrow.tid
index 4627076e0..14095b3b1 100644
--- a/core/images/right-arrow.tid
+++ b/core/images/right-arrow.tid
@@ -1,4 +1,6 @@
 title: $:/core/images/right-arrow
 tags: $:/tags/Image
 
-<svg class="tc-image-right-arrow tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128"><path d="M72.7982405,98.6541105 L127.184015,43.9832042 C130.938662,40.2089635 130.938662,34.0896964 127.184015,30.3154557 C123.429583,26.5412364 117.342116,26.5412364 113.587684,30.3154557 L66.0000107,78.152522 L18.4123803,30.3154557 C14.6578195,26.5412364 8.57048132,26.5412364 4.81592057,30.3154557 C1.06135981,34.0896964 1.06135981,40.2089635 4.81592057,43.9832042 L59.2017595,98.6541105 C62.9563202,102.428351 69.0436798,102.428351 72.7982405,98.6541126 L72.7982405,98.6541105 Z" transform="translate(66.000000, 64.484791) rotate(-90.000000) translate(-66.000000, -64.484791) "/></svg>
\ No newline at end of file
+<svg class="tc-image-right-arrow tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <path d="M80.3563798,109.353315 C78.9238993,110.786918 76.9450203,111.675144 74.7592239,111.675144 L-4.40893546,111.675144 C-8.77412698,111.675144 -12.3248558,108.130732 -12.3248558,103.758478 C-12.3248558,99.3951199 -8.78077754,95.8418109 -4.40893546,95.8418109 L66.8418109,95.8418109 L66.8418109,24.5910645 C66.8418109,20.225873 70.3862233,16.6751442 74.7584775,16.6751442 C79.1218352,16.6751442 82.6751442,20.2192225 82.6751442,24.5910645 L82.6751442,103.759224 C82.6751442,105.941695 81.7891419,107.920575 80.3566508,109.353886 Z" transform="translate(35.175144, 64.175144) rotate(-45.000000) translate(-35.175144, -64.175144) "></path>
+</svg>
\ No newline at end of file
diff --git a/core/images/save-button.tid b/core/images/save-button.tid
index b79a23acd..c538b8291 100644
--- a/core/images/save-button.tid
+++ b/core/images/save-button.tid
@@ -1,4 +1,9 @@
 title: $:/core/images/save-button
 tags: $:/tags/Image
 
-<svg class="tc-image-save-button tc-image-button" viewBox="4 512 64 60" width="22pt" height="21pt"><path d="M 13.5 537.75 L 11.5 537.75 C 11.5 537.75 11.5 537.75 11.5 537.75 C 7.6340064 537.75 4.4999994 540.884 4.5 544.75 L 4.5 564.5 L 4.5 564.5 C 4.5 564.5 4.5 564.5 4.5 564.5 L 4.5 564.5 C 4.5000006 568.366 7.634007 571.5 11.5 571.5 L 60.5 571.5 C 64.365993 571.5 67.5 568.366 67.5 564.5 L 67.5 544.75 C 67.5 540.884 64.365993 537.75 60.5 537.75 L 58.5 537.75 L 49.5 546.75 L 50 546.75 C 52.20914 546.75 54 548.54086 54 550.75 L 54 556.25 C 54 558.45914 52.20914 560.25 50 560.25 L 36 560.25 L 22 560.25 C 19.790861 560.25 18 558.45914 18 556.25 L 18 556.25 C 18 556.25 18 556.25 18 556.25 L 18 550.75 C 18 548.54086 19.790861 546.75 22 546.75 C 22 546.75 22 546.75 22 546.75 L 22.5 546.75 Z"/><path d="M 16.37132 533.87132 L 33.87868 551.37868 C 35.050253 552.55025 36.949747 552.55025 38.12132 551.37868 L 55.62868 533.87132 C 56.800252 532.69975 56.800252 530.80025 55.62868 529.62868 C 55.06607 529.06607 54.30301 528.75 53.50736 528.75 L 48 528.75 C 46.343146 528.75 45 527.40685 45 525.75 L 45 516 C 45 514.34315 43.656854 513 42 513 L 30 513 C 28.343146 513 27 514.34315 27 516 L 27 525.75 C 27 527.40685 25.656854 528.75 24 528.75 L 18.492641 528.75 C 16.835786 528.75 15.492641 530.09315 15.492641 531.75 C 15.492641 532.54565 15.808711 533.3087 16.37132 533.87132 Z"/></svg>
+<svg class="tc-image-save-button tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+    <g fill-rule="evenodd">
+        <path d="M123.710695,40.9167222 C126.480869,48.0776101 128,55.861399 128,64 C128,99.346224 99.346224,128 64,128 C28.653776,128 0,99.346224 0,64 C0,28.653776 28.653776,0 64,0 C79.4762643,0 93.6695151,5.49323385 104.736317,14.6362661 L93.3538167,26.0187663 C85.238752,19.7378486 75.0558867,16 64,16 C37.490332,16 16,37.490332 16,64 C16,90.509668 37.490332,112 64,112 C90.509668,112 112,90.509668 112,64 C112,60.4746049 111.619942,57.0379772 110.898563,53.7288543 L123.710695,40.9167222 Z"></path>
+        <path d="M27.01829,58.0614456 L27.01829,26.0756394 C27.01829,21.6567137 30.600012,18.0685425 35.01829,18.0685425 C39.4275777,18.0685425 43.01829,21.6534419 43.01829,26.0756394 L43.01829,50.0685425 L121.108978,50.0685425 C125.53492,50.0685425 129.118795,53.6502645 129.118795,58.0685425 C129.118795,62.4778302 125.532678,66.0685425 121.108978,66.0685425 L35.0281066,66.0685425 C32.8135,66.0685425 30.8097214,65.1717877 29.3602574,63.7221854 C27.9169287,62.2764602 27.01829,60.2737272 27.01829,58.0614456 Z" transform="translate(78.068542, 42.068542) rotate(-45.000000) translate(-78.068542, -42.068542) "></path>
+    </g>
+</svg>
diff --git a/core/wiki/config/PageControlButtons.multids b/core/wiki/config/PageControlButtons.multids
index 3b0d9a591..8f394eb25 100644
--- a/core/wiki/config/PageControlButtons.multids
+++ b/core/wiki/config/PageControlButtons.multids
@@ -3,6 +3,7 @@ title: $:/config/PageControlButtons/Visibility/$:/
 core/ui/Buttons/advanced-search: hide
 core/ui/Buttons/close-all: hide
 core/ui/Buttons/encryption: hide
+core/ui/Buttons/export-page: hide
 core/ui/Buttons/full-screen: hide
 core/ui/Buttons/home: hide
 core/ui/Buttons/refresh: hide
diff --git a/core/wiki/config/ViewToolbarButtons.multids b/core/wiki/config/ViewToolbarButtons.multids
index ea350af20..add4ad8f9 100644
--- a/core/wiki/config/ViewToolbarButtons.multids
+++ b/core/wiki/config/ViewToolbarButtons.multids
@@ -2,6 +2,7 @@ title: $:/config/ViewToolbarButtons/Visibility/$:/
 
 core/ui/Buttons/clone: hide
 core/ui/Buttons/close-others: hide
+core/ui/Buttons/export-tiddler: hide
 core/ui/Buttons/info: hide
 core/ui/Buttons/more-tiddler-actions: show
 core/ui/Buttons/new-here: hide