diff --git a/fonts/forkawesome-webfont.eot b/fonts/forkawesome-webfont.eot
index a2c03c681..1cfcefc35 100644
Binary files a/fonts/forkawesome-webfont.eot and b/fonts/forkawesome-webfont.eot differ
diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg
index 14fd52c6b..1eeb32853 100644
--- a/fonts/forkawesome-webfont.svg
+++ b/fonts/forkawesome-webfont.svg
@@ -5,11 +5,7 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-<<<<<<< HEAD
-Created by FontForge 20170925 at Tue Feb 20 18:27:20 2018
-=======
-Created by FontForge 20170925 at Tue Feb 20 20:25:21 2018
->>>>>>> svg-template
+Created by FontForge 20170925 at Tue Feb 20 20:33:21 2018
  By Julien Deswaef
 The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io
 </metadata>
@@ -23,11 +19,7 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/
     panose-1="2 0 5 3 0 0 0 0 0 0"
     ascent="1536"
     descent="-256"
-<<<<<<< HEAD
-    bbox="-0.470077 -264 2304.01 1536.25"
-=======
     bbox="-0.653061 -264 2304.01 1536.25"
->>>>>>> svg-template
     underline-thickness="89.6"
     underline-position="-179.2"
     unicode-range="U+0020-F2ED"
@@ -383,17 +375,10 @@ c-69 0 -132 -28 -178 -80c-40 -45 -64 -105 -64 -160v-413c72 -44 155 -67 242 -67c1
 c-25 6 -52 21 -52 43v680c0 18 14 38 38 38h877c30 0 30 -42 30 -55c0 -14 0 -55 -30 -55h-811v-483h1c56 59 153 121 210 145c71 30 151 46 231 46c79 0 156 -15 228 -46c70 -30 133 -72 187 -126s96 -116 126 -186c30 -73 46 -149 46 -229zM1355 1128
 c19 -17 6 -35 -13 -57c-12 -12 -25 -26 -39 -26c-6 0 -11 2 -16 7c-72 62 -137 104 -207 133c-87 38 -180 56 -276 56c-85 0 -178 -17 -262 -49c-26 -10 -40 24 -45 37c-6 16 -9 29 -8 38c2 10 7 17 16 20c82 36 194 57 299 57c109 0 216 -22 316 -64
 c92 -39 167 -87 235 -152z" />
-<<<<<<< HEAD
-    <glyph glyph-name="liberapay-square" unicode="&#xf2e8;" 
-d="M148 1408h1240c82 0 148 -66 148 -148v-1240c0 -82 -66 -148 -148 -148h-1240c-82 0 -148 66 -148 148v1240c0 82 66 148 148 148zM738 1153v0l-162 -25l-133 -555c-8 -33 -12 -63 -12 -92s6 -55 18 -77s32 -40 60 -53s68 -19 117 -19l31 128c-18 1 -32 5 -42 10
-s-17 11 -21 19s-6 18 -6 28s2 21 5 34zM987 904v1c-42 0 -80 -3 -116 -10s-68 -15 -96 -23l-173 -723h154l47 189c24 -4 48 -6 72 -6c49 0 94 9 135 26s76 40 106 71s53 67 70 109s25 89 25 140c0 31 -4 61 -13 88c-9 28 -22 51 -40 72s-42 37 -70 49s-62 17 -101 17z
-M968 774v0c33 0 56 -10 69 -31s19 -47 19 -77c0 -31 -4 -59 -13 -84s-20 -47 -36 -65s-35 -33 -57 -43s-47 -15 -74 -15c-17 0 -32 1 -44 4l73 305c20 4 41 6 63 6z" />
-=======
     <glyph glyph-name="liberapay-square" unicode="&#xf2e8;" horiz-adv-x="1533" 
 d="M148 1404h1236c82 0 149 -66 149 -148v-1236c0 -82 -67 -148 -149 -148h-1236c-82 0 -148 66 -148 148v1236c0 82 66 148 148 148zM736 1150v0l-161 -25l-133 -553c-8 -33 -12 -64 -12 -93s6 -54 18 -76s32 -40 60 -53s68 -19 117 -19l31 128c-18 1 -32 4 -42 9
 s-18 12 -22 20s-5 17 -5 27s1 23 4 35zM985 902v0c-42 0 -80 -3 -116 -10s-67 -14 -95 -22l-174 -722h155l47 189c24 -4 47 -6 71 -6c49 0 94 8 135 25s76 41 106 72s52 67 69 109s25 88 25 139c0 31 -4 61 -13 88s-22 51 -40 72c-18 20 -41 36 -69 48s-62 18 -101 18z
 M965 772v0c33 0 56 -11 69 -32s20 -46 20 -76c0 -31 -4 -59 -13 -84s-21 -47 -37 -65s-34 -32 -56 -42s-47 -15 -74 -15c-17 0 -32 1 -44 4l73 303c19 4 40 7 62 7z" />
->>>>>>> svg-template
     <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
 d="M960 864c159 0 288 -129 288 -288s-129 -288 -288 -288s-288 129 -288 288s129 288 288 288zM1664 1280c141 0 256 -115 256 -256v-896c0 -141 -115 -256 -256 -256h-1408c-141 0 -256 115 -256 256v896c0 141 115 256 256 256h224l51 136c25 66 103 120 173 120h512
 c70 0 148 -54 173 -120l51 -136h224zM960 128c247 0 448 201 448 448s-201 448 -448 448s-448 -201 -448 -448s201 -448 448 -448z" />
@@ -599,17 +584,10 @@ c0 0 -147 99 -211 79c-42 -106 -16 -184 -8 -204c-49 -54 -79 -122 -79 -206c0 -294
 c0 -64 1 -124 1 -143c0 -20 -14 -44 -53 -37c-305 102 -525 390 -525 729c0 424 344 768 768 768zM291 305c-2 -4 -8 -5 -13 -2c-6 3 -9 8 -7 12c2 3 7 4 13 2c6 -3 9 -8 7 -12zM322 271c-4 -4 -11 -2 -16 3c-5 6 -6 13 -2 16c4 4 11 2 16 -3c5 -6 6 -13 2 -16zM352 226
 c-4 -3 -12 0 -17 7s-5 15 0 18c5 4 13 1 17 -6c5 -7 5 -15 0 -19zM394 184c-4 -5 -13 -4 -20 3c-7 6 -9 15 -4 19c4 5 13 4 20 -3c6 -6 8 -15 4 -19zM451 159c-2 -6 -11 -9 -19 -6c-9 2 -15 9 -13 15s11 9 19 7c9 -3 15 -10 13 -16zM514 154c0 -6 -7 -11 -16 -11
 c-10 -1 -17 4 -17 11c0 6 7 11 16 11c9 1 17 -4 17 -11zM572 164c1 -6 -5 -12 -14 -14s-17 2 -18 8c-1 7 5 13 14 15c9 1 17 -3 18 -9z" />
-<<<<<<< HEAD
-    <glyph glyph-name="mastodon" unicode="&#xf2e1;" horiz-adv-x="1672" 
-d="M1636 462c-25 -126 -220 -265 -445 -292c-117 -14 -232 -27 -355 -21c-201 9 -360 48 -360 48c0 -20 2 -39 4 -56c26 -198 196 -209 358 -215c163 -6 309 40 309 40l6 -148s-114 -61 -317 -72c-112 -6 -251 2 -413 45c-351 93 -411 468 -421 848c-3 113 -1 220 -1 309
-c0 389 254 502 254 502c128 59 349 84 578 86h6c229 -2 450 -27 578 -86c0 0 254 -113 254 -502c0 0 4 -287 -35 -486zM1371 918c0 96 -24 173 -74 229c-51 57 -117 85 -199 85c-95 0 -168 -37 -216 -110l-46 -78l-47 78c-48 73 -120 110 -215 110c-82 0 -149 -28 -200 -85
-c-49 -57 -74 -133 -74 -229v-471h187v457c0 96 41 145 122 145c90 0 134 -58 134 -173v-250h185v250c0 115 45 173 135 173c81 0 122 -49 122 -145v-457h186v471v0z" />
-=======
     <glyph glyph-name="mastodon" unicode="&#xf2e1;" 
 d="M1503 425c-23 -116 -202 -243 -408 -268c-108 -13 -214 -25 -327 -20c-185 8 -330 44 -330 44c0 -18 1 -35 3 -51c24 -182 181 -193 329 -198c150 -5 284 37 284 37l6 -136s-105 -56 -292 -66c-103 -6 -230 3 -379 42c-323 85 -379 430 -388 779c-3 104 -1 201 -1 283
 c0 357 235 462 235 462c118 54 320 77 531 79h5c211 -2 413 -25 531 -79c0 0 234 -105 234 -462c0 0 3 -263 -33 -446zM1260 843c0 88 -22 160 -68 211c-47 52 -107 79 -183 79c-88 0 -154 -34 -198 -101l-43 -72l-43 72c-44 67 -110 101 -198 101c-76 0 -136 -27 -183 -79
 c-45 -52 -68 -123 -68 -211v-432h171v420c0 88 38 133 112 133c82 0 124 -54 124 -159v-229h170v229c0 105 42 159 124 159c74 0 112 -45 112 -133v-420h171v432v0z" />
->>>>>>> svg-template
     <glyph glyph-name="envelope-open" unicode="&#xf2b6;" horiz-adv-x="1792" 
 d="M1792 882v-978c0 -88 -72 -160 -160 -160h-1472c-88 0 -160 72 -160 160v978c0 9 4 18 11 24c105 92 106 103 628 484c63 46 174 146 257 146s195 -101 257 -146c522 -381 523 -392 628 -484c7 -6 11 -15 11 -24zM1228 297c156 113 265 192 345 252c14 10 17 30 6 44
 l-38 52c-11 14 -31 17 -45 6c-79 -58 -187 -138 -343 -250c-62 -45 -174 -145 -257 -145s-195 100 -257 145c-156 113 -264 192 -343 250c-14 11 -34 8 -45 -6l-38 -52c-11 -14 -8 -34 6 -44c80 -60 189 -139 345 -252c78 -56 201 -169 332 -169c132 0 258 115 332 169z" />
@@ -960,17 +938,10 @@ d="M1188 214c0 -25 -10 -50 -28 -68l-136 -136c-18 -18 -43 -28 -68 -28s-50 10 -68
 c18 18 43 28 68 28s50 -10 68 -28l294 -294l294 294c18 18 43 28 68 28s50 -10 68 -28l136 -136c18 -18 28 -43 28 -68s-10 -50 -28 -68l-294 -294l294 -294c18 -18 28 -43 28 -68z" />
     <glyph glyph-name="buysellads" unicode="&#xf20d;" 
 d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960c0 -158 -130 -288 -288 -288h-960c-158 0 -288 130 -288 288v960c0 158 130 288 288 288h960c158 0 288 -130 288 -288z" />
-<<<<<<< HEAD
-    <glyph glyph-name="diaspora" unicode="&#xf2e5;" 
-d="M976 133c-41 57 -108 151 -149 208c-40 56 -72 99 -74 99s-64 -84 -148 -199c-80 -110 -146 -200 -147 -200c-2 0 -287 202 -288 204c0 1 64 95 143 210s144 211 144 213c0 4 -25 13 -227 80c-125 42 -229 76 -230 77c-2 1 10 40 51 169c29 93 54 169 55 170
-s109 -34 241 -77s241 -79 242 -79s3 3 4 5s1 114 2 249s3 247 4 248c1 2 38 3 174 3c95 0 174 -1 175 -2c2 -1 5 -75 9 -242c7 -273 7 -277 11 -277c2 0 107 35 233 78s229 77 230 76c3 -3 106 -340 105 -341s-106 -37 -234 -80c-176 -60 -233 -79 -233 -82
-c0 -2 60 -92 137 -205c76 -111 137 -202 137 -203c-1 -2 -285 -212 -287 -212c-1 0 -37 50 -80 110z" />
-=======
     <glyph glyph-name="diaspora" unicode="&#xf2e5;" horiz-adv-x="1581" 
 d="M1005 -16c-42 59 -111 155 -153 214c-41 57 -75 102 -77 102s-66 -87 -152 -205c-82 -113 -150 -205 -151 -205c-2 0 -296 207 -297 209c0 1 65 99 147 217s149 217 149 219c0 4 -27 14 -234 83c-129 43 -235 78 -237 79s10 41 52 174c30 95 56 174 57 175
 s112 -35 248 -80s249 -81 250 -81s2 2 3 5s2 118 3 257s2 254 3 255c1 2 40 2 180 2c98 0 179 0 180 -1c2 -1 4 -78 8 -249c7 -281 9 -285 13 -285c2 0 109 36 239 80s236 79 237 78c3 -3 109 -350 108 -351s-109 -37 -241 -82c-181 -61 -240 -82 -240 -85
 c0 -2 62 -95 141 -211c78 -114 141 -208 141 -209c-1 -2 -293 -217 -295 -217c-1 0 -38 50 -82 112z" />
->>>>>>> svg-template
     <glyph glyph-name="fonticons" unicode="&#xf280;" 
 d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925c41 0 57 -15 56 -79l174 21c0 153 -105 181 -222 181c-174 0 -265 -70 -265 -240v-72h-96v-128h76
 c10 0 20 0 20 -8v-382c0 -19 -5 -25 -23 -27l-73 -7v-88h448v86l-149 14c-18 2 -11 5 -11 25v387h191l38 128h-231c-10 0 2 7 2 15v80c0 60 2 94 65 94zM1248 96v86l-54 9c-19 3 -10 5 -10 25v520h-275l-23 -101l83 -22c13 -4 23 -13 23 -27v-370c0 -19 -8 -23 -26 -25
@@ -1680,17 +1651,10 @@ c134 0 177 -171 235 -264c30 -47 64 -88 100 -129c29 -33 97 -119 145 -119h288c71 0
     <glyph glyph-name="vimeo" unicode="&#xf27d;" horiz-adv-x="1628" 
 d="M1627 1018c-7 -158 -118 -375 -332 -651c-222 -287 -408 -431 -562 -431c-95 0 -175 88 -240 263c-44 160 -88 321 -132 482c-48 175 -101 262 -157 262c-12 0 -54 -25 -127 -76l-77 98c80 71 159 143 238 212c106 94 187 141 241 146c127 12 204 -74 234 -259
 c31 -200 54 -325 66 -373c37 -166 76 -249 120 -249c34 0 85 53 154 161c68 108 104 190 109 246c9 93 -27 139 -109 139c-39 0 -79 -9 -121 -26c80 262 233 389 459 382c167 -5 246 -114 236 -326z" />
-<<<<<<< HEAD
-    <glyph glyph-name="mastodon-alt" unicode="&#xf2e2;" horiz-adv-x="1672" 
-d="M833 1536h6c229 -2 450 -27 578 -86c0 0 254 -113 254 -502c0 0 4 -287 -35 -486c-25 -126 -220 -265 -445 -292c-117 -14 -232 -27 -355 -21c-201 9 -360 48 -360 48c0 -20 2 -39 4 -56c26 -198 196 -209 358 -215c163 -6 309 40 309 40l6 -148s-114 -61 -317 -72
-c-112 -6 -251 2 -413 45c-351 93 -412 468 -421 848c-3 113 -1 220 -1 309c0 389 254 502 254 502c128 59 349 84 578 86v0zM381 917c-70 0 -126 -56 -126 -126s56 -126 126 -126s126 56 126 126s-56 126 -126 126zM836 917c-70 0 -126 -56 -126 -126s56 -126 126 -126
-s126 56 126 126s-56 126 -126 126zM1290 917c-70 0 -126 -56 -126 -126s56 -126 126 -126s126 56 126 126s-56 126 -126 126z" />
-=======
     <glyph glyph-name="mastodon-alt" unicode="&#xf2e2;" 
 d="M766 1408h5c211 -2 413 -25 531 -79c0 0 234 -105 234 -462c0 0 3 -263 -33 -446c-23 -116 -202 -243 -408 -268c-108 -13 -214 -25 -327 -20c-185 8 -330 45 -330 45c0 -18 1 -36 3 -52c24 -182 181 -193 329 -198c150 -5 284 37 284 37l6 -135s-105 -57 -292 -67
 c-103 -6 -230 3 -379 42c-323 85 -380 430 -388 779c-3 104 -1 201 -1 283c0 357 235 462 235 462c118 54 320 77 531 79v0zM350 839c-64 0 -115 -52 -115 -116s51 -115 115 -115s116 51 116 115s-52 116 -116 116v0zM768 839c-64 0 -116 -52 -116 -116s52 -115 116 -115
 s116 51 116 115s-52 116 -116 116v0zM1186 839c-64 0 -116 -52 -116 -116s52 -115 116 -115s115 51 115 115s-51 116 -115 116v0z" />
->>>>>>> svg-template
     <glyph glyph-name="ravelry" unicode="&#xf2d9;" horiz-adv-x="2080" 
 d="M1095 -197c-4 1 -7 2 -11 4c0 0 -329 193 -440 505c-37 6 -115 24 -175 37c87 -283 329 -499 626 -546zM454 409l168 -28c-57 171 -64 366 -64 366c-67 -65 -103 -154 -121 -224c3 -39 8 -77 17 -114zM564 1018c-31 -46 -56 -96 -77 -148c33 35 60 58 74 68
 c-2 30 3 80 3 80zM2001 584c0 436 -352 790 -784 790c-200 0 -382 -76 -521 -201c-21 -41 -35 -93 -45 -160c213 181 593 136 593 136c95 -4 84 -88 83 -114c-346 29 -516 -70 -684 -213c0 0 33 -320 109 -450c438 -20 771 218 771 218c42 30 79 33 87 -19
@@ -1715,17 +1679,10 @@ s128 -57 128 -128zM1408 640c0 353 -287 640 -640 640s-640 -287 -640 -640s287 -640
     <glyph glyph-name="file-image-o" unicode="&#xf1c5;" 
 d="M1468 1156c37 -37 68 -111 68 -164v-1152c0 -53 -43 -96 -96 -96h-1344c-53 0 -96 43 -96 96v1600c0 53 43 96 96 96h896c53 0 127 -31 164 -68zM1024 1400v-376h376c-6 17 -15 34 -22 41l-313 313c-7 7 -24 16 -41 22zM1408 -128v1024h-416c-53 0 -96 43 -96 96v416
 h-768v-1536h1280zM1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512c-106 0 -192 86 -192 192s86 192 192 192s192 -86 192 -192s-86 -192 -192 -192z" />
-<<<<<<< HEAD
-    <glyph glyph-name="liberapay" unicode="&#xf2e9;" horiz-adv-x="1200" 
-d="M472 1412v0l-224 -925c-4 -19 -6 -37 -7 -53s3 -31 9 -43s17 -23 33 -30c16 -8 37 -12 65 -14l-48 -198c-76 0 -136 10 -179 30s-75 47 -94 81s-28 74 -27 118s7 92 19 142l204 854zM856 1030v0c60 0 112 -10 155 -28s79 -42 107 -74s49 -69 62 -111s20 -88 20 -136v0
-c0 -78 -13 -150 -39 -215s-62 -121 -107 -168c-46 -47 -99 -84 -163 -110s-134 -39 -209 -39c-36 0 -73 4 -109 10l-72 -291h-238l267 1112c43 13 92 24 147 34s115 16 179 16zM826 829v0c-34 0 -67 -4 -97 -10l-112 -468c18 -4 40 -6 67 -6c42 0 80 7 114 23s64 37 88 65
-s43 62 56 101s20 82 20 129c0 46 -10 86 -30 118s-56 48 -106 48z" />
-=======
     <glyph glyph-name="liberapay" unicode="&#xf2e9;" horiz-adv-x="1191" 
 d="M468 1404v0l-222 -918c-4 -19 -6 -37 -7 -53s3 -30 9 -42s18 -23 33 -30s36 -12 64 -14l-48 -196c-75 0 -134 9 -177 29s-74 47 -93 81s-28 73 -27 117s6 91 18 141l203 847zM849 1025v0c60 0 111 -9 154 -27s78 -44 106 -75s49 -68 62 -110s20 -86 20 -134h-1
 c0 -78 -12 -149 -38 -213s-61 -120 -106 -167s-99 -83 -162 -109s-133 -39 -207 -39c-36 0 -72 3 -108 9l-72 -288h-236l265 1103c42 13 91 24 146 34s113 16 177 16zM819 825v0c-34 0 -66 -3 -96 -9l-111 -464c18 -4 40 -7 67 -7c41 0 79 8 113 23s63 37 87 65
 s43 61 56 100s20 81 20 128c0 46 -11 84 -31 116s-55 48 -105 48z" />
->>>>>>> svg-template
     <glyph glyph-name="calculator" unicode="&#xf1ec;" horiz-adv-x="1664" 
 d="M384 0c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM768 0c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM384 384c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM1152 0
 c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM768 384c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM384 768c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM1152 384
@@ -1828,17 +1785,10 @@ d="M493 1053c22 0 39 18 39 39s-17 39 -39 39c-21 0 -38 -18 -38 -39s17 -39 38 -39z
 c0 56 46 102 103 102zM1163 850v-666c0 -61 -49 -110 -109 -110h-75v-227c0 -57 -46 -103 -103 -103s-103 46 -103 103v227h-138v-227c0 -57 -46 -103 -103 -103c-56 0 -102 46 -102 103l-1 227h-74c-61 0 -110 49 -110 110v666h918zM931 1255c140 -72 235 -210 235 -369
 h-925c0 159 95 297 236 369l-71 131c-4 7 -2 16 5 20c7 3 16 1 20 -6l72 -132c61 27 129 42 201 42s140 -15 201 -42l72 132c4 7 13 9 20 6c7 -4 9 -13 5 -20zM1408 767v-430c0 -57 -46 -103 -103 -103c-56 0 -102 46 -102 103v430c0 57 46 102 102 102
 c57 0 103 -45 103 -102z" />
-<<<<<<< HEAD
-    <glyph glyph-name="hubzilla" unicode="&#xf2eb;" 
-d="M1306 1341c83 -41 160 -119 200 -205c16 -38 33 -76 30 -165c-3 -80 -9 -112 -34 -165c-66 -141 -197 -235 -345 -245l-80 -5l-28 -112c-24 -93 -26 -124 -26 -124c27 -28 88 -46 113 -112c35 -67 31 -163 -13 -218c-73 -90 -182 -117 -277 -67c-87 46 -132 158 -105 257
-c6 25 -1 33 -105 101l-113 74l-41 -33c-196 -157 -483 -18 -482 234c0 163 129 289 295 288c83 0 133 -19 195 -75l45 -41l101 51l102 50l-11 36c-15 53 -11 170 7 230c21 71 84 161 145 205c124 91 293 107 427 41v0zM561 423l226 -156s69 58 162 66l57 246
-s-178 57 -229 183l-209 -99s49 -124 -7 -240v0z" />
-=======
     <glyph glyph-name="hubzilla" unicode="&#xf2eb;" horiz-adv-x="1587" 
 d="M1349 1363c86 -43 165 -125 207 -213c16 -40 34 -78 30 -170c-3 -83 -8 -115 -34 -170c-68 -146 -203 -243 -356 -253l-83 -6l-29 -115c-24 -96 -27 -129 -27 -129c28 -29 91 -47 117 -115c36 -69 32 -168 -14 -225c-75 -93 -187 -121 -286 -70c-90 47 -136 164 -108 266
 c7 26 -2 34 -109 104l-116 77l-43 -35c-203 -162 -499 -19 -498 242c0 168 133 299 304 298c86 0 138 -20 202 -78l47 -42l104 53l105 51l-11 37c-16 55 -12 176 7 238c21 74 87 166 150 212c128 94 302 111 441 43v0zM580 413l233 -160s71 60 167 68l60 254
 s-185 59 -237 189l-217 -102s52 -128 -6 -248v-1z" />
->>>>>>> svg-template
     <glyph glyph-name="stack-exchange" unicode="&#xf18d;" horiz-adv-x="1238" 
 d="M1238 283v-66c0 -113 -88 -204 -196 -204h-57l-260 -269v269h-529c-108 0 -196 91 -196 204v66h1238zM1238 609v-255h-1238v255h1238zM1238 937v-255h-1238v255h1238zM1238 1077v-67h-1238v67c0 112 88 203 196 203h846c108 0 196 -91 196 -203z" />
     <glyph glyph-name="twitch" unicode="&#xf1e8;" horiz-adv-x="1592" 
@@ -2011,34 +1961,6 @@ d="M459 -256c-103 0 -192 70 -217 170l-101 401c-8 35 -13 72 -13 108c0 23 0 45 -5
 c123 -14 212 -118 212 -241c0 -19 -3 -39 -7 -59l-123 -512c80 60 138 118 243 118c139 0 255 -113 255 -253c0 -84 -41 -162 -107 -212l-507 -380c-44 -33 -98 -51 -153 -51h-694zM1104 1408c-51 0 -96 -36 -108 -86l-164 -682h-127l-145 602c-12 50 -57 86 -108 86
 c-64 0 -112 -51 -112 -113c0 -10 1 -19 3 -28l132 -547h-26l-99 408c-12 49 -57 88 -109 88c-62 0 -113 -50 -113 -112c0 -9 1 -18 3 -26l116 -478c14 -58 4 -116 19 -174l100 -401c11 -43 49 -73 93 -73h694c27 0 54 9 76 26l507 379c34 26 56 67 56 110
 c0 70 -58 125 -127 125c-28 0 -55 -9 -77 -26l-307 -230v227c0 8 129 538 139 581c2 9 4 19 4 29c0 62 -47 115 -111 115c-52 0 -97 -36 -109 -86l-116 -482h-26l150 624c2 9 3 19 3 28c0 63 -46 116 -111 116z" />
-<<<<<<< HEAD
-    <glyph glyph-name="scuttlebutt" unicode="&#xf2ea;" horiz-adv-x="1713" 
-d="M762 -126c-31 4 -114 29 -131 39c-5 3 -13 9 -17 15l-8 10l-7 -4c-14 -9 -14 -9 -151 60c-70 36 -134 68 -141 71c-21 10 -30 25 -45 74c-5 17 -6 19 -12 21c-18 7 -84 50 -121 78c-27 21 -67 60 -71 70c-10 26 -31 91 -37 112c-18 60 -21 89 -21 179c0 60 0 68 4 76
-c5 11 24 29 46 43c29 19 129 68 193 96l8 4l-5 9c-3 5 -15 23 -28 41l-24 33l-10 1c-21 1 -29 3 -49 16s-21 12 -39 40c-57 87 -91 164 -95 206c-4 46 23 130 52 161c9 9 17 15 28 21c16 8 17 9 40 9c19 0 26 -2 36 -6c27 -11 44 -29 49 -50c2 -11 2 -17 -1 -43
-c-9 -69 -2 -127 20 -163c4 -6 16 -19 28 -29c19 -17 38 -37 38 -43c0 -7 4 -1 11 15c9 23 70 138 78 148l6 8l-2 26c-8 86 -9 112 -1 138c5 18 17 33 32 39c26 12 96 17 121 9c15 -5 28 -14 35 -26c5 -7 6 -12 7 -27l1 -19l53 8c71 11 95 17 116 25c26 10 38 13 57 13
-c29 0 44 -6 104 -37c137 -72 176 -97 219 -139c24 -23 29 -32 50 -74c17 -34 19 -37 38 -57l20 -21l23 6c28 8 37 8 49 2c10 -5 22 -21 22 -29c0 -2 4 -9 9 -16c7 -10 24 -35 39 -59l12 4c13 5 27 6 38 1c4 -2 17 -10 28 -19c11 -8 20 -15 21 -15s13 -8 26 -16
-c13 -9 27 -17 32 -18s13 -5 19 -8c13 -8 27 -11 64 -14c15 -1 32 -3 36 -4c18 -5 46 -31 55 -51c8 -18 5 -44 -9 -66c-4 -6 -18 -20 -30 -32s-23 -24 -24 -27s0 -24 3 -47c8 -67 4 -101 -13 -127c-8 -12 -28 -26 -58 -40c-13 -6 -25 -14 -28 -16s-8 -13 -12 -25
-c-9 -26 -17 -45 -26 -55c-8 -10 -10 -16 -13 -56c-4 -54 -10 -71 -37 -99c-20 -21 -37 -30 -70 -40c-11 -3 -49 -16 -85 -28s-66 -22 -68 -22s-6 -5 -9 -11c-14 -25 -34 -48 -64 -75c-48 -43 -115 -84 -162 -98c-9 -3 -17 -7 -25 -14c-43 -38 -87 -56 -154 -62
-c-28 -2 -42 -3 -63 0zM821 -66c13 1 32 4 42 6c18 4 50 17 50 20c0 1 -10 7 -21 13s-38 21 -57 35c-70 48 -117 95 -124 122c-9 35 -9 157 1 321c2 29 3 53 2 54c-3 3 -131 99 -131 99c-2 -2 -20 -148 -25 -210c-5 -54 -6 -145 -3 -171c3 -21 9 -46 31 -105
-c24 -66 45 -109 64 -139l9 -14l25 -9c44 -15 83 -24 104 -24c5 0 20 1 33 2zM560 26c-15 35 -29 70 -47 123c-14 40 -14 45 -16 70c-6 75 3 213 25 366c4 29 7 55 7 57c0 3 -11 12 -33 28c-30 22 -50 33 -58 33c-5 0 -83 -101 -120 -154c-34 -49 -63 -103 -68 -122
-c-2 -10 42 -189 64 -259c16 -52 -1 -39 137 -109l120 -60s-5 12 -11 27zM990 8c27 8 80 39 113 64c21 16 46 38 45 39c-1 0 -24 -2 -51 -6c-28 -4 -59 -7 -69 -7c-45 0 -82 18 -99 48c-8 14 -22 51 -31 82c-7 24 -8 31 -9 65c-2 30 -3 42 -7 58c-6 22 -18 49 -26 56
-c-9 8 -49 36 -58 40c-5 2 -13 7 -18 10l-8 6l-2 -11c-4 -31 -6 -124 -6 -206c0 -108 -2 -99 22 -123c49 -49 156 -117 186 -118c4 0 12 1 18 3zM1089 192c27 4 58 9 70 11c31 6 93 24 139 41c22 8 49 17 61 20c39 11 52 20 56 44c1 8 1 8 -4 7c-48 -15 -87 -21 -143 -23
-c-94 -4 -149 7 -227 45c-23 12 -57 34 -74 48c-5 4 -8 6 -8 6s2 -12 5 -26c5 -20 7 -33 8 -62c2 -39 6 -57 22 -97c6 -14 7 -17 13 -19c12 -4 32 -2 82 5zM232 242c-1 2 -9 37 -19 78s-20 77 -21 79c-4 8 -2 31 4 49c18 54 75 142 164 253c11 13 19 25 19 26
-c0 3 -41 25 -54 28c-7 2 -19 6 -26 9c-13 5 -14 5 -22 1c-4 -2 -28 -14 -53 -25c-76 -34 -139 -67 -160 -83l-7 -6l1 -72c1 -78 3 -88 17 -138c6 -20 26 -78 36 -105c3 -8 33 -36 58 -55c20 -15 62 -43 64 -43c0 0 0 2 -1 4v0zM1309 382c32 4 65 11 87 20c16 7 40 20 47 27
-c5 5 13 17 11 19c0 0 -11 0 -23 -1c-44 -4 -93 -5 -119 -2c-33 3 -56 10 -87 26c-59 30 -105 72 -127 117c-11 23 -13 31 -13 52c0 63 43 117 184 229c22 17 40 32 41 33c0 1 -7 15 -17 30l-18 28l-12 2c-11 2 -12 1 -43 -9c-41 -14 -52 -16 -104 -22c-23 -2 -49 -7 -56 -9
-c-17 -5 -39 -20 -56 -38c-19 -20 -76 -93 -91 -117c-19 -30 -19 -33 -11 -52c4 -9 13 -27 20 -41s16 -33 20 -43c6 -16 9 -26 23 -89c7 -34 14 -48 32 -68c31 -34 76 -60 132 -80c49 -17 105 -20 180 -12zM891 490c0 0 -1 6 -3 12s-6 26 -10 44c-8 42 -14 58 -29 86
-c-16 31 -34 71 -37 83c-3 14 1 37 9 58c10 24 35 62 74 112c54 68 87 98 126 115c19 8 40 13 80 17c18 2 35 4 38 5c5 1 5 1 -2 9c-11 13 -23 33 -36 62c-10 22 -16 31 -26 42c-29 31 -63 54 -150 100c-35 18 -68 36 -73 39c-14 9 -37 17 -47 17c-5 0 -18 -4 -30 -9
-c-25 -10 -61 -17 -144 -30c-29 -5 -54 -9 -55 -9c-3 -3 -2 -38 1 -62c7 -50 24 -108 42 -142c9 -18 11 -29 5 -39c-5 -8 -28 -28 -35 -31c-9 -4 -12 -26 -11 -73c0 -33 1 -37 7 -56c9 -29 13 -67 12 -106l-1 -33l87 -65c112 -85 133 -100 152 -111c9 -5 25 -15 35 -22
-c16 -12 21 -15 21 -13zM1396 531c61 4 103 13 147 31l26 11l1 13c1 12 -3 47 -5 49c0 1 -5 -1 -9 -3c-22 -12 -54 -16 -75 -9c-34 12 -72 52 -86 90c-5 13 -5 18 -4 34s1 21 7 34c8 18 25 39 39 51c6 5 11 9 11 10s-3 3 -7 4c-4 2 -14 9 -22 15l-14 11l-19 -17
-c-10 -9 -37 -31 -61 -50c-70 -56 -84 -68 -114 -99c-24 -24 -29 -32 -36 -46c-7 -13 -6 -18 -4 -28c10 -26 41 -58 79 -78c44 -24 68 -28 146 -23zM1536 719c27 16 75 54 63 49c-2 -1 -9 -2 -16 -3c-15 -1 -29 5 -39 17c-6 8 -7 9 -14 7c-18 -5 -44 -24 -52 -37
-c-4 -7 -5 -9 -2 -15c2 -4 9 -12 15 -19c11 -11 12 -11 20 -10c5 1 16 5 25 11zM526 808c-4 36 -5 39 -38 113c-9 21 -11 21 -17 21c-8 0 -16 5 -23 12c-3 3 -13 28 -23 55c-13 36 -19 48 -20 46c-4 -5 -28 -58 -34 -73c-10 -27 -14 -42 -20 -89c-4 -26 -6 -48 -6 -50
-c0 -3 4 -5 14 -8c8 -2 18 -6 23 -9s15 -8 21 -12s16 -9 21 -12s24 -11 41 -17c23 -8 35 -14 47 -22l16 -11l1 11c0 6 -1 27 -3 45zM210 972c12 6 28 21 28 26c0 1 -12 11 -25 23c-40 34 -55 64 -66 125c-5 27 -5 80 0 114c4 24 3 26 -1 28c-14 9 -30 10 -43 3
-c-9 -4 -10 -7 -21 -30c-22 -47 -28 -86 -19 -114c10 -32 40 -90 75 -146c26 -42 40 -47 72 -29zM520 1010c20 5 28 8 37 14c2 2 1 6 -5 22c-12 30 -22 69 -28 103c-7 36 -8 79 -4 124c3 27 2 70 -1 73c-5 5 -72 0 -79 -6c-4 -4 -6 -29 -3 -63c-2 -41 16 -98 14 -133
-c-2 -25 0 -33 22 -94c14 -40 17 -45 21 -45c2 0 14 2 26 5z" />
-    <glyph glyph-name="social-home" unicode="&#xf2ec;" horiz-adv-x="1284" 
-d="M424 860h416v-536h-416v536v0zM907 553h294v-575h-294v575zM78 324v0v536h275v-536h-275zM842 -22h-762l1 281h761v-281v0zM909 860h294v-240h-294v240zM1253 1046v0c17 -4 31 -19 31 -38c0 -22 -81 -80 -81 -80h-1123s-75 52 -79 71c-4 18 5 37 22 45l539 252
-c14 8 84 8 96 0z" />
-=======
     <glyph glyph-name="scuttlebutt" unicode="&#xf2ea;" horiz-adv-x="1709" 
 d="M760 -126c-31 4 -114 28 -131 38c-5 3 -12 10 -16 16l-8 10l-7 -5c-14 -9 -14 -9 -151 60c-70 36 -134 68 -141 71c-21 10 -30 25 -45 74c-5 17 -6 19 -12 21c-18 7 -84 50 -121 78c-27 21 -66 60 -70 70c-10 25 -31 91 -37 112c-18 60 -21 88 -21 178c0 60 0 68 4 76
 c5 11 24 29 46 43c29 19 128 68 192 96l8 4l-4 8c-3 5 -16 24 -29 42l-24 33h-10c-21 1 -28 3 -48 16s-21 13 -39 41c-56 87 -91 163 -95 205c-4 46 23 129 52 160c9 9 17 16 28 22c16 8 17 8 40 8c19 0 25 -1 35 -5c27 -11 44 -29 49 -50c2 -11 2 -17 -1 -43
@@ -2065,7 +1987,6 @@ c-2 -25 0 -32 22 -93c14 -39 16 -45 20 -45c2 0 15 2 27 5z" />
     <glyph glyph-name="social-home" unicode="&#xf2ec;" horiz-adv-x="1486" 
 d="M491 894h482v-621h-482v621v0zM1050 538h341v-666h-341v666zM91 273v0v620h318v-620h-318zM975 -128h-882v326h882v-326v0zM1053 894h340v-279h-340v279zM1452 1109v0c20 -5 34 -22 34 -44c0 -26 -93 -93 -93 -93h-1300s-87 62 -92 83s5 42 25 51l624 292
 c16 9 99 9 112 0z" />
->>>>>>> svg-template
     <glyph glyph-name="leanpub" unicode="&#xf212;" horiz-adv-x="2048" 
 d="M1893 1144l155 -1272c-93 0 -173 19 -257 57c-125 57 -255 91 -393 91c-142 0 -273 -47 -374 -148c-101 101 -232 148 -374 148c-138 0 -268 -34 -393 -91c-81 -36 -163 -57 -252 -57h-5l155 1272c143 81 317 127 482 127c135 0 274 -28 387 -106c113 78 252 106 387 106
 c165 0 339 -46 482 -127zM1398 157c190 0 320 -51 492 -122l-124 1021c-112 51 -245 78 -368 78c-140 0 -271 -44 -374 -141c-103 97 -234 141 -374 141c-123 0 -256 -27 -368 -78l-124 -1021c172 71 302 122 492 122c137 0 258 -35 374 -108c116 73 237 108 374 108z
@@ -2227,13 +2148,8 @@ d="M1165 397l102 102c25 25 25 65 0 90l-454 454c-25 25 -65 25 -90 0l-454 -454c-25
     <glyph glyph-name="opencart" unicode="&#xf23d;" horiz-adv-x="2304" 
 d="M1524 -25c0 -91 -73 -164 -164 -164s-165 73 -165 164s74 165 165 165s164 -74 164 -165zM775 -25c0 -91 -74 -164 -165 -164s-164 73 -164 164s73 165 164 165s165 -74 165 -165zM0 1469c295 -311 572 -357 1660 -357s610 -242 -62 -842c213 370 945 698 -255 680
 c-1151 -17 -1219 333 -1343 519z" />
-<<<<<<< HEAD
-    <glyph glyph-name="artstation" unicode="&#xf2ed;" 
-d="M603 1228v0h267c52 0 113 -37 137 -83l504 -880c16 -24 25 -53 25 -84c0 -35 -7 -53 -31 -94l-123 -214zM475 1009l349 -606h-697zM0 183v0h951l179 -311h-862c-53 0 -114 39 -138 86v0z" />
-=======
     <glyph glyph-name="artstation" unicode="&#xf2ed;" horiz-adv-x="1533" 
 d="M601 1277v0h267c51 0 112 -37 136 -83l504 -878c16 -24 25 -53 25 -84c0 -35 -7 -53 -31 -94l-123 -213zM474 1058l348 -604h-695zM0 233v0h949l178 -309h-859c-53 0 -114 38 -138 85h-1z" />
->>>>>>> svg-template
     <glyph glyph-name="thumbs-up" unicode="&#xf164;" horiz-adv-x="1600" 
 d="M256 192c0 35 -29 64 -64 64c-36 0 -64 -29 -64 -64c0 -36 28 -64 64 -64c35 0 64 28 64 64zM416 704v-640c0 -35 -29 -64 -64 -64h-288c-35 0 -64 29 -64 64v640c0 35 29 64 64 64h288c35 0 64 -29 64 -64zM1600 704c0 -53 -21 -110 -55 -149c11 -32 15 -62 15 -76
 c2 -50 -13 -97 -43 -137c11 -37 11 -77 0 -117c-10 -37 -29 -70 -54 -94c6 -75 -11 -136 -49 -181c-43 -51 -109 -77 -197 -78h-129c-143 0 -278 47 -386 84c-63 22 -123 43 -158 44c-34 1 -64 29 -64 64v641c0 33 28 61 61 64c37 3 133 122 177 180c36 46 70 89 101 120
@@ -2330,17 +2246,10 @@ c-14 -76 -69 -430 -85 -530c-1 -7 -4 -10 -12 -10h-295c-30 0 -52 26 -48 55l232 147
     <glyph glyph-name="child" unicode="&#xf1ae;" horiz-adv-x="1152" 
 d="M1124 988l-292 -292v-824c0 -62 -50 -112 -112 -112s-112 50 -112 112v384h-64v-384c0 -62 -50 -112 -112 -112s-112 50 -112 112v824l-292 292c-37 38 -37 98 0 136c38 37 98 37 136 0l228 -228h368l228 228c38 37 98 37 136 0c37 -38 37 -98 0 -136zM800 1152
 c0 -124 -100 -224 -224 -224s-224 100 -224 224s100 224 224 224s224 -100 224 -224z" />
-<<<<<<< HEAD
-    <glyph glyph-name="fork-awesome" unicode="&#xf2e3;" 
-d="M768 1408c424 0 768 -344 768 -768v-1v-2c0 -7 -1 -18 -1 -25v-2c-15 -389 -318 -705 -702 -737v2c-22 -2 -43 -3 -65 -3c-18 0 -48 1 -66 3v-2c-384 33 -686 347 -701 736v3c0 7 -1 18 -1 25v2v0v1c0 424 344 768 768 768zM541 1078v0c-25 -253 -66 -517 -41 -704
-s146 -156 182 -351c5 -29 10 -60 14 -90c20 -2 52 -3 72 -3v0v0c20 0 52 1 72 3c4 30 8 61 13 90c36 195 157 164 182 351s-15 451 -40 704h-42c-6 -215 -13 -400 -19 -615c-1 -82 -108 -88 -108 -1c-11 211 -29 405 -40 616h-37c-11 -211 -29 -405 -40 -616
-c0 -87 -106 -81 -107 1c-6 215 -14 400 -20 615h-41z" />
-=======
     <glyph glyph-name="fork-awesome" unicode="&#xf2e3;" horiz-adv-x="1533" 
 d="M766 1404v0c423 0 767 -343 767 -766v-1v-2c0 -8 -1 -17 -1 -25v-2c-14 -388 -318 -703 -701 -735v1c-18 -2 -47 -2 -65 -2s-47 1 -65 3v-2c-383 32 -685 347 -700 735v2c0 8 -1 17 -1 25v2v1c0 423 343 766 766 766zM594 1085h-66c-35 -251 -54 -525 -29 -712
 s145 -157 181 -351c5 -29 10 -59 14 -89c20 -2 52 -4 72 -4s52 2 72 4c4 30 9 60 14 89c36 194 156 164 181 351s6 456 -28 712h-65c3 -190 12 -430 -8 -640c-8 -89 -103 -87 -108 0c-13 208 -15 428 -26 639h-64c-11 -211 -18 -431 -26 -643c-3 -82 -100 -81 -108 0
 c-19 208 -10 453 -6 644z" />
->>>>>>> svg-template
     <glyph glyph-name="angle-double-up" unicode="&#xf102;" horiz-adv-x="998" 
 d="M998 224c0 -8 -4 -17 -10 -23l-50 -50c-6 -6 -14 -10 -23 -10c-8 0 -17 4 -23 10l-393 393l-393 -393c-6 -6 -15 -10 -23 -10s-17 4 -23 10l-50 50c-6 6 -10 15 -10 23s4 17 10 23l466 466c6 6 15 10 23 10s17 -4 23 -10l466 -466c6 -6 10 -15 10 -23zM998 608
 c0 -8 -4 -17 -10 -23l-50 -50c-6 -6 -14 -10 -23 -10c-8 0 -17 4 -23 10l-393 393l-393 -393c-6 -6 -15 -10 -23 -10s-17 4 -23 10l-50 50c-6 6 -10 15 -10 23s4 17 10 23l466 466c6 6 15 10 23 10s17 -4 23 -10l466 -466c6 -6 10 -15 10 -23z" />
diff --git a/fonts/forkawesome-webfont.ttf b/fonts/forkawesome-webfont.ttf
index d3f432542..8ada16b44 100644
Binary files a/fonts/forkawesome-webfont.ttf and b/fonts/forkawesome-webfont.ttf differ
diff --git a/fonts/forkawesome-webfont.woff b/fonts/forkawesome-webfont.woff
index 9dbbd1de0..4fbeb6671 100644
Binary files a/fonts/forkawesome-webfont.woff and b/fonts/forkawesome-webfont.woff differ
diff --git a/fonts/forkawesome-webfont.woff2 b/fonts/forkawesome-webfont.woff2
index 5bed7aa58..71e9ad65f 100644
Binary files a/fonts/forkawesome-webfont.woff2 and b/fonts/forkawesome-webfont.woff2 differ
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot
index a2c03c681..1cfcefc35 100644
Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot and b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot differ
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg
index 14fd52c6b..1eeb32853 100644
--- a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg
+++ b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg
@@ -5,11 +5,7 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-<<<<<<< HEAD
-Created by FontForge 20170925 at Tue Feb 20 18:27:20 2018
-=======
-Created by FontForge 20170925 at Tue Feb 20 20:25:21 2018
->>>>>>> svg-template
+Created by FontForge 20170925 at Tue Feb 20 20:33:21 2018
  By Julien Deswaef
 The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io
 </metadata>
@@ -23,11 +19,7 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/
     panose-1="2 0 5 3 0 0 0 0 0 0"
     ascent="1536"
     descent="-256"
-<<<<<<< HEAD
-    bbox="-0.470077 -264 2304.01 1536.25"
-=======
     bbox="-0.653061 -264 2304.01 1536.25"
->>>>>>> svg-template
     underline-thickness="89.6"
     underline-position="-179.2"
     unicode-range="U+0020-F2ED"
@@ -383,17 +375,10 @@ c-69 0 -132 -28 -178 -80c-40 -45 -64 -105 -64 -160v-413c72 -44 155 -67 242 -67c1
 c-25 6 -52 21 -52 43v680c0 18 14 38 38 38h877c30 0 30 -42 30 -55c0 -14 0 -55 -30 -55h-811v-483h1c56 59 153 121 210 145c71 30 151 46 231 46c79 0 156 -15 228 -46c70 -30 133 -72 187 -126s96 -116 126 -186c30 -73 46 -149 46 -229zM1355 1128
 c19 -17 6 -35 -13 -57c-12 -12 -25 -26 -39 -26c-6 0 -11 2 -16 7c-72 62 -137 104 -207 133c-87 38 -180 56 -276 56c-85 0 -178 -17 -262 -49c-26 -10 -40 24 -45 37c-6 16 -9 29 -8 38c2 10 7 17 16 20c82 36 194 57 299 57c109 0 216 -22 316 -64
 c92 -39 167 -87 235 -152z" />
-<<<<<<< HEAD
-    <glyph glyph-name="liberapay-square" unicode="&#xf2e8;" 
-d="M148 1408h1240c82 0 148 -66 148 -148v-1240c0 -82 -66 -148 -148 -148h-1240c-82 0 -148 66 -148 148v1240c0 82 66 148 148 148zM738 1153v0l-162 -25l-133 -555c-8 -33 -12 -63 -12 -92s6 -55 18 -77s32 -40 60 -53s68 -19 117 -19l31 128c-18 1 -32 5 -42 10
-s-17 11 -21 19s-6 18 -6 28s2 21 5 34zM987 904v1c-42 0 -80 -3 -116 -10s-68 -15 -96 -23l-173 -723h154l47 189c24 -4 48 -6 72 -6c49 0 94 9 135 26s76 40 106 71s53 67 70 109s25 89 25 140c0 31 -4 61 -13 88c-9 28 -22 51 -40 72s-42 37 -70 49s-62 17 -101 17z
-M968 774v0c33 0 56 -10 69 -31s19 -47 19 -77c0 -31 -4 -59 -13 -84s-20 -47 -36 -65s-35 -33 -57 -43s-47 -15 -74 -15c-17 0 -32 1 -44 4l73 305c20 4 41 6 63 6z" />
-=======
     <glyph glyph-name="liberapay-square" unicode="&#xf2e8;" horiz-adv-x="1533" 
 d="M148 1404h1236c82 0 149 -66 149 -148v-1236c0 -82 -67 -148 -149 -148h-1236c-82 0 -148 66 -148 148v1236c0 82 66 148 148 148zM736 1150v0l-161 -25l-133 -553c-8 -33 -12 -64 -12 -93s6 -54 18 -76s32 -40 60 -53s68 -19 117 -19l31 128c-18 1 -32 4 -42 9
 s-18 12 -22 20s-5 17 -5 27s1 23 4 35zM985 902v0c-42 0 -80 -3 -116 -10s-67 -14 -95 -22l-174 -722h155l47 189c24 -4 47 -6 71 -6c49 0 94 8 135 25s76 41 106 72s52 67 69 109s25 88 25 139c0 31 -4 61 -13 88s-22 51 -40 72c-18 20 -41 36 -69 48s-62 18 -101 18z
 M965 772v0c33 0 56 -11 69 -32s20 -46 20 -76c0 -31 -4 -59 -13 -84s-21 -47 -37 -65s-34 -32 -56 -42s-47 -15 -74 -15c-17 0 -32 1 -44 4l73 303c19 4 40 7 62 7z" />
->>>>>>> svg-template
     <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
 d="M960 864c159 0 288 -129 288 -288s-129 -288 -288 -288s-288 129 -288 288s129 288 288 288zM1664 1280c141 0 256 -115 256 -256v-896c0 -141 -115 -256 -256 -256h-1408c-141 0 -256 115 -256 256v896c0 141 115 256 256 256h224l51 136c25 66 103 120 173 120h512
 c70 0 148 -54 173 -120l51 -136h224zM960 128c247 0 448 201 448 448s-201 448 -448 448s-448 -201 -448 -448s201 -448 448 -448z" />
@@ -599,17 +584,10 @@ c0 0 -147 99 -211 79c-42 -106 -16 -184 -8 -204c-49 -54 -79 -122 -79 -206c0 -294
 c0 -64 1 -124 1 -143c0 -20 -14 -44 -53 -37c-305 102 -525 390 -525 729c0 424 344 768 768 768zM291 305c-2 -4 -8 -5 -13 -2c-6 3 -9 8 -7 12c2 3 7 4 13 2c6 -3 9 -8 7 -12zM322 271c-4 -4 -11 -2 -16 3c-5 6 -6 13 -2 16c4 4 11 2 16 -3c5 -6 6 -13 2 -16zM352 226
 c-4 -3 -12 0 -17 7s-5 15 0 18c5 4 13 1 17 -6c5 -7 5 -15 0 -19zM394 184c-4 -5 -13 -4 -20 3c-7 6 -9 15 -4 19c4 5 13 4 20 -3c6 -6 8 -15 4 -19zM451 159c-2 -6 -11 -9 -19 -6c-9 2 -15 9 -13 15s11 9 19 7c9 -3 15 -10 13 -16zM514 154c0 -6 -7 -11 -16 -11
 c-10 -1 -17 4 -17 11c0 6 7 11 16 11c9 1 17 -4 17 -11zM572 164c1 -6 -5 -12 -14 -14s-17 2 -18 8c-1 7 5 13 14 15c9 1 17 -3 18 -9z" />
-<<<<<<< HEAD
-    <glyph glyph-name="mastodon" unicode="&#xf2e1;" horiz-adv-x="1672" 
-d="M1636 462c-25 -126 -220 -265 -445 -292c-117 -14 -232 -27 -355 -21c-201 9 -360 48 -360 48c0 -20 2 -39 4 -56c26 -198 196 -209 358 -215c163 -6 309 40 309 40l6 -148s-114 -61 -317 -72c-112 -6 -251 2 -413 45c-351 93 -411 468 -421 848c-3 113 -1 220 -1 309
-c0 389 254 502 254 502c128 59 349 84 578 86h6c229 -2 450 -27 578 -86c0 0 254 -113 254 -502c0 0 4 -287 -35 -486zM1371 918c0 96 -24 173 -74 229c-51 57 -117 85 -199 85c-95 0 -168 -37 -216 -110l-46 -78l-47 78c-48 73 -120 110 -215 110c-82 0 -149 -28 -200 -85
-c-49 -57 -74 -133 -74 -229v-471h187v457c0 96 41 145 122 145c90 0 134 -58 134 -173v-250h185v250c0 115 45 173 135 173c81 0 122 -49 122 -145v-457h186v471v0z" />
-=======
     <glyph glyph-name="mastodon" unicode="&#xf2e1;" 
 d="M1503 425c-23 -116 -202 -243 -408 -268c-108 -13 -214 -25 -327 -20c-185 8 -330 44 -330 44c0 -18 1 -35 3 -51c24 -182 181 -193 329 -198c150 -5 284 37 284 37l6 -136s-105 -56 -292 -66c-103 -6 -230 3 -379 42c-323 85 -379 430 -388 779c-3 104 -1 201 -1 283
 c0 357 235 462 235 462c118 54 320 77 531 79h5c211 -2 413 -25 531 -79c0 0 234 -105 234 -462c0 0 3 -263 -33 -446zM1260 843c0 88 -22 160 -68 211c-47 52 -107 79 -183 79c-88 0 -154 -34 -198 -101l-43 -72l-43 72c-44 67 -110 101 -198 101c-76 0 -136 -27 -183 -79
 c-45 -52 -68 -123 -68 -211v-432h171v420c0 88 38 133 112 133c82 0 124 -54 124 -159v-229h170v229c0 105 42 159 124 159c74 0 112 -45 112 -133v-420h171v432v0z" />
->>>>>>> svg-template
     <glyph glyph-name="envelope-open" unicode="&#xf2b6;" horiz-adv-x="1792" 
 d="M1792 882v-978c0 -88 -72 -160 -160 -160h-1472c-88 0 -160 72 -160 160v978c0 9 4 18 11 24c105 92 106 103 628 484c63 46 174 146 257 146s195 -101 257 -146c522 -381 523 -392 628 -484c7 -6 11 -15 11 -24zM1228 297c156 113 265 192 345 252c14 10 17 30 6 44
 l-38 52c-11 14 -31 17 -45 6c-79 -58 -187 -138 -343 -250c-62 -45 -174 -145 -257 -145s-195 100 -257 145c-156 113 -264 192 -343 250c-14 11 -34 8 -45 -6l-38 -52c-11 -14 -8 -34 6 -44c80 -60 189 -139 345 -252c78 -56 201 -169 332 -169c132 0 258 115 332 169z" />
@@ -960,17 +938,10 @@ d="M1188 214c0 -25 -10 -50 -28 -68l-136 -136c-18 -18 -43 -28 -68 -28s-50 10 -68
 c18 18 43 28 68 28s50 -10 68 -28l294 -294l294 294c18 18 43 28 68 28s50 -10 68 -28l136 -136c18 -18 28 -43 28 -68s-10 -50 -28 -68l-294 -294l294 -294c18 -18 28 -43 28 -68z" />
     <glyph glyph-name="buysellads" unicode="&#xf20d;" 
 d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960c0 -158 -130 -288 -288 -288h-960c-158 0 -288 130 -288 288v960c0 158 130 288 288 288h960c158 0 288 -130 288 -288z" />
-<<<<<<< HEAD
-    <glyph glyph-name="diaspora" unicode="&#xf2e5;" 
-d="M976 133c-41 57 -108 151 -149 208c-40 56 -72 99 -74 99s-64 -84 -148 -199c-80 -110 -146 -200 -147 -200c-2 0 -287 202 -288 204c0 1 64 95 143 210s144 211 144 213c0 4 -25 13 -227 80c-125 42 -229 76 -230 77c-2 1 10 40 51 169c29 93 54 169 55 170
-s109 -34 241 -77s241 -79 242 -79s3 3 4 5s1 114 2 249s3 247 4 248c1 2 38 3 174 3c95 0 174 -1 175 -2c2 -1 5 -75 9 -242c7 -273 7 -277 11 -277c2 0 107 35 233 78s229 77 230 76c3 -3 106 -340 105 -341s-106 -37 -234 -80c-176 -60 -233 -79 -233 -82
-c0 -2 60 -92 137 -205c76 -111 137 -202 137 -203c-1 -2 -285 -212 -287 -212c-1 0 -37 50 -80 110z" />
-=======
     <glyph glyph-name="diaspora" unicode="&#xf2e5;" horiz-adv-x="1581" 
 d="M1005 -16c-42 59 -111 155 -153 214c-41 57 -75 102 -77 102s-66 -87 -152 -205c-82 -113 -150 -205 -151 -205c-2 0 -296 207 -297 209c0 1 65 99 147 217s149 217 149 219c0 4 -27 14 -234 83c-129 43 -235 78 -237 79s10 41 52 174c30 95 56 174 57 175
 s112 -35 248 -80s249 -81 250 -81s2 2 3 5s2 118 3 257s2 254 3 255c1 2 40 2 180 2c98 0 179 0 180 -1c2 -1 4 -78 8 -249c7 -281 9 -285 13 -285c2 0 109 36 239 80s236 79 237 78c3 -3 109 -350 108 -351s-109 -37 -241 -82c-181 -61 -240 -82 -240 -85
 c0 -2 62 -95 141 -211c78 -114 141 -208 141 -209c-1 -2 -293 -217 -295 -217c-1 0 -38 50 -82 112z" />
->>>>>>> svg-template
     <glyph glyph-name="fonticons" unicode="&#xf280;" 
 d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925c41 0 57 -15 56 -79l174 21c0 153 -105 181 -222 181c-174 0 -265 -70 -265 -240v-72h-96v-128h76
 c10 0 20 0 20 -8v-382c0 -19 -5 -25 -23 -27l-73 -7v-88h448v86l-149 14c-18 2 -11 5 -11 25v387h191l38 128h-231c-10 0 2 7 2 15v80c0 60 2 94 65 94zM1248 96v86l-54 9c-19 3 -10 5 -10 25v520h-275l-23 -101l83 -22c13 -4 23 -13 23 -27v-370c0 -19 -8 -23 -26 -25
@@ -1680,17 +1651,10 @@ c134 0 177 -171 235 -264c30 -47 64 -88 100 -129c29 -33 97 -119 145 -119h288c71 0
     <glyph glyph-name="vimeo" unicode="&#xf27d;" horiz-adv-x="1628" 
 d="M1627 1018c-7 -158 -118 -375 -332 -651c-222 -287 -408 -431 -562 -431c-95 0 -175 88 -240 263c-44 160 -88 321 -132 482c-48 175 -101 262 -157 262c-12 0 -54 -25 -127 -76l-77 98c80 71 159 143 238 212c106 94 187 141 241 146c127 12 204 -74 234 -259
 c31 -200 54 -325 66 -373c37 -166 76 -249 120 -249c34 0 85 53 154 161c68 108 104 190 109 246c9 93 -27 139 -109 139c-39 0 -79 -9 -121 -26c80 262 233 389 459 382c167 -5 246 -114 236 -326z" />
-<<<<<<< HEAD
-    <glyph glyph-name="mastodon-alt" unicode="&#xf2e2;" horiz-adv-x="1672" 
-d="M833 1536h6c229 -2 450 -27 578 -86c0 0 254 -113 254 -502c0 0 4 -287 -35 -486c-25 -126 -220 -265 -445 -292c-117 -14 -232 -27 -355 -21c-201 9 -360 48 -360 48c0 -20 2 -39 4 -56c26 -198 196 -209 358 -215c163 -6 309 40 309 40l6 -148s-114 -61 -317 -72
-c-112 -6 -251 2 -413 45c-351 93 -412 468 -421 848c-3 113 -1 220 -1 309c0 389 254 502 254 502c128 59 349 84 578 86v0zM381 917c-70 0 -126 -56 -126 -126s56 -126 126 -126s126 56 126 126s-56 126 -126 126zM836 917c-70 0 -126 -56 -126 -126s56 -126 126 -126
-s126 56 126 126s-56 126 -126 126zM1290 917c-70 0 -126 -56 -126 -126s56 -126 126 -126s126 56 126 126s-56 126 -126 126z" />
-=======
     <glyph glyph-name="mastodon-alt" unicode="&#xf2e2;" 
 d="M766 1408h5c211 -2 413 -25 531 -79c0 0 234 -105 234 -462c0 0 3 -263 -33 -446c-23 -116 -202 -243 -408 -268c-108 -13 -214 -25 -327 -20c-185 8 -330 45 -330 45c0 -18 1 -36 3 -52c24 -182 181 -193 329 -198c150 -5 284 37 284 37l6 -135s-105 -57 -292 -67
 c-103 -6 -230 3 -379 42c-323 85 -380 430 -388 779c-3 104 -1 201 -1 283c0 357 235 462 235 462c118 54 320 77 531 79v0zM350 839c-64 0 -115 -52 -115 -116s51 -115 115 -115s116 51 116 115s-52 116 -116 116v0zM768 839c-64 0 -116 -52 -116 -116s52 -115 116 -115
 s116 51 116 115s-52 116 -116 116v0zM1186 839c-64 0 -116 -52 -116 -116s52 -115 116 -115s115 51 115 115s-51 116 -115 116v0z" />
->>>>>>> svg-template
     <glyph glyph-name="ravelry" unicode="&#xf2d9;" horiz-adv-x="2080" 
 d="M1095 -197c-4 1 -7 2 -11 4c0 0 -329 193 -440 505c-37 6 -115 24 -175 37c87 -283 329 -499 626 -546zM454 409l168 -28c-57 171 -64 366 -64 366c-67 -65 -103 -154 -121 -224c3 -39 8 -77 17 -114zM564 1018c-31 -46 -56 -96 -77 -148c33 35 60 58 74 68
 c-2 30 3 80 3 80zM2001 584c0 436 -352 790 -784 790c-200 0 -382 -76 -521 -201c-21 -41 -35 -93 -45 -160c213 181 593 136 593 136c95 -4 84 -88 83 -114c-346 29 -516 -70 -684 -213c0 0 33 -320 109 -450c438 -20 771 218 771 218c42 30 79 33 87 -19
@@ -1715,17 +1679,10 @@ s128 -57 128 -128zM1408 640c0 353 -287 640 -640 640s-640 -287 -640 -640s287 -640
     <glyph glyph-name="file-image-o" unicode="&#xf1c5;" 
 d="M1468 1156c37 -37 68 -111 68 -164v-1152c0 -53 -43 -96 -96 -96h-1344c-53 0 -96 43 -96 96v1600c0 53 43 96 96 96h896c53 0 127 -31 164 -68zM1024 1400v-376h376c-6 17 -15 34 -22 41l-313 313c-7 7 -24 16 -41 22zM1408 -128v1024h-416c-53 0 -96 43 -96 96v416
 h-768v-1536h1280zM1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512c-106 0 -192 86 -192 192s86 192 192 192s192 -86 192 -192s-86 -192 -192 -192z" />
-<<<<<<< HEAD
-    <glyph glyph-name="liberapay" unicode="&#xf2e9;" horiz-adv-x="1200" 
-d="M472 1412v0l-224 -925c-4 -19 -6 -37 -7 -53s3 -31 9 -43s17 -23 33 -30c16 -8 37 -12 65 -14l-48 -198c-76 0 -136 10 -179 30s-75 47 -94 81s-28 74 -27 118s7 92 19 142l204 854zM856 1030v0c60 0 112 -10 155 -28s79 -42 107 -74s49 -69 62 -111s20 -88 20 -136v0
-c0 -78 -13 -150 -39 -215s-62 -121 -107 -168c-46 -47 -99 -84 -163 -110s-134 -39 -209 -39c-36 0 -73 4 -109 10l-72 -291h-238l267 1112c43 13 92 24 147 34s115 16 179 16zM826 829v0c-34 0 -67 -4 -97 -10l-112 -468c18 -4 40 -6 67 -6c42 0 80 7 114 23s64 37 88 65
-s43 62 56 101s20 82 20 129c0 46 -10 86 -30 118s-56 48 -106 48z" />
-=======
     <glyph glyph-name="liberapay" unicode="&#xf2e9;" horiz-adv-x="1191" 
 d="M468 1404v0l-222 -918c-4 -19 -6 -37 -7 -53s3 -30 9 -42s18 -23 33 -30s36 -12 64 -14l-48 -196c-75 0 -134 9 -177 29s-74 47 -93 81s-28 73 -27 117s6 91 18 141l203 847zM849 1025v0c60 0 111 -9 154 -27s78 -44 106 -75s49 -68 62 -110s20 -86 20 -134h-1
 c0 -78 -12 -149 -38 -213s-61 -120 -106 -167s-99 -83 -162 -109s-133 -39 -207 -39c-36 0 -72 3 -108 9l-72 -288h-236l265 1103c42 13 91 24 146 34s113 16 177 16zM819 825v0c-34 0 -66 -3 -96 -9l-111 -464c18 -4 40 -7 67 -7c41 0 79 8 113 23s63 37 87 65
 s43 61 56 100s20 81 20 128c0 46 -11 84 -31 116s-55 48 -105 48z" />
->>>>>>> svg-template
     <glyph glyph-name="calculator" unicode="&#xf1ec;" horiz-adv-x="1664" 
 d="M384 0c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM768 0c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM384 384c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM1152 0
 c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM768 384c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM384 768c0 71 -57 128 -128 128s-128 -57 -128 -128s57 -128 128 -128s128 57 128 128zM1152 384
@@ -1828,17 +1785,10 @@ d="M493 1053c22 0 39 18 39 39s-17 39 -39 39c-21 0 -38 -18 -38 -39s17 -39 38 -39z
 c0 56 46 102 103 102zM1163 850v-666c0 -61 -49 -110 -109 -110h-75v-227c0 -57 -46 -103 -103 -103s-103 46 -103 103v227h-138v-227c0 -57 -46 -103 -103 -103c-56 0 -102 46 -102 103l-1 227h-74c-61 0 -110 49 -110 110v666h918zM931 1255c140 -72 235 -210 235 -369
 h-925c0 159 95 297 236 369l-71 131c-4 7 -2 16 5 20c7 3 16 1 20 -6l72 -132c61 27 129 42 201 42s140 -15 201 -42l72 132c4 7 13 9 20 6c7 -4 9 -13 5 -20zM1408 767v-430c0 -57 -46 -103 -103 -103c-56 0 -102 46 -102 103v430c0 57 46 102 102 102
 c57 0 103 -45 103 -102z" />
-<<<<<<< HEAD
-    <glyph glyph-name="hubzilla" unicode="&#xf2eb;" 
-d="M1306 1341c83 -41 160 -119 200 -205c16 -38 33 -76 30 -165c-3 -80 -9 -112 -34 -165c-66 -141 -197 -235 -345 -245l-80 -5l-28 -112c-24 -93 -26 -124 -26 -124c27 -28 88 -46 113 -112c35 -67 31 -163 -13 -218c-73 -90 -182 -117 -277 -67c-87 46 -132 158 -105 257
-c6 25 -1 33 -105 101l-113 74l-41 -33c-196 -157 -483 -18 -482 234c0 163 129 289 295 288c83 0 133 -19 195 -75l45 -41l101 51l102 50l-11 36c-15 53 -11 170 7 230c21 71 84 161 145 205c124 91 293 107 427 41v0zM561 423l226 -156s69 58 162 66l57 246
-s-178 57 -229 183l-209 -99s49 -124 -7 -240v0z" />
-=======
     <glyph glyph-name="hubzilla" unicode="&#xf2eb;" horiz-adv-x="1587" 
 d="M1349 1363c86 -43 165 -125 207 -213c16 -40 34 -78 30 -170c-3 -83 -8 -115 -34 -170c-68 -146 -203 -243 -356 -253l-83 -6l-29 -115c-24 -96 -27 -129 -27 -129c28 -29 91 -47 117 -115c36 -69 32 -168 -14 -225c-75 -93 -187 -121 -286 -70c-90 47 -136 164 -108 266
 c7 26 -2 34 -109 104l-116 77l-43 -35c-203 -162 -499 -19 -498 242c0 168 133 299 304 298c86 0 138 -20 202 -78l47 -42l104 53l105 51l-11 37c-16 55 -12 176 7 238c21 74 87 166 150 212c128 94 302 111 441 43v0zM580 413l233 -160s71 60 167 68l60 254
 s-185 59 -237 189l-217 -102s52 -128 -6 -248v-1z" />
->>>>>>> svg-template
     <glyph glyph-name="stack-exchange" unicode="&#xf18d;" horiz-adv-x="1238" 
 d="M1238 283v-66c0 -113 -88 -204 -196 -204h-57l-260 -269v269h-529c-108 0 -196 91 -196 204v66h1238zM1238 609v-255h-1238v255h1238zM1238 937v-255h-1238v255h1238zM1238 1077v-67h-1238v67c0 112 88 203 196 203h846c108 0 196 -91 196 -203z" />
     <glyph glyph-name="twitch" unicode="&#xf1e8;" horiz-adv-x="1592" 
@@ -2011,34 +1961,6 @@ d="M459 -256c-103 0 -192 70 -217 170l-101 401c-8 35 -13 72 -13 108c0 23 0 45 -5
 c123 -14 212 -118 212 -241c0 -19 -3 -39 -7 -59l-123 -512c80 60 138 118 243 118c139 0 255 -113 255 -253c0 -84 -41 -162 -107 -212l-507 -380c-44 -33 -98 -51 -153 -51h-694zM1104 1408c-51 0 -96 -36 -108 -86l-164 -682h-127l-145 602c-12 50 -57 86 -108 86
 c-64 0 -112 -51 -112 -113c0 -10 1 -19 3 -28l132 -547h-26l-99 408c-12 49 -57 88 -109 88c-62 0 -113 -50 -113 -112c0 -9 1 -18 3 -26l116 -478c14 -58 4 -116 19 -174l100 -401c11 -43 49 -73 93 -73h694c27 0 54 9 76 26l507 379c34 26 56 67 56 110
 c0 70 -58 125 -127 125c-28 0 -55 -9 -77 -26l-307 -230v227c0 8 129 538 139 581c2 9 4 19 4 29c0 62 -47 115 -111 115c-52 0 -97 -36 -109 -86l-116 -482h-26l150 624c2 9 3 19 3 28c0 63 -46 116 -111 116z" />
-<<<<<<< HEAD
-    <glyph glyph-name="scuttlebutt" unicode="&#xf2ea;" horiz-adv-x="1713" 
-d="M762 -126c-31 4 -114 29 -131 39c-5 3 -13 9 -17 15l-8 10l-7 -4c-14 -9 -14 -9 -151 60c-70 36 -134 68 -141 71c-21 10 -30 25 -45 74c-5 17 -6 19 -12 21c-18 7 -84 50 -121 78c-27 21 -67 60 -71 70c-10 26 -31 91 -37 112c-18 60 -21 89 -21 179c0 60 0 68 4 76
-c5 11 24 29 46 43c29 19 129 68 193 96l8 4l-5 9c-3 5 -15 23 -28 41l-24 33l-10 1c-21 1 -29 3 -49 16s-21 12 -39 40c-57 87 -91 164 -95 206c-4 46 23 130 52 161c9 9 17 15 28 21c16 8 17 9 40 9c19 0 26 -2 36 -6c27 -11 44 -29 49 -50c2 -11 2 -17 -1 -43
-c-9 -69 -2 -127 20 -163c4 -6 16 -19 28 -29c19 -17 38 -37 38 -43c0 -7 4 -1 11 15c9 23 70 138 78 148l6 8l-2 26c-8 86 -9 112 -1 138c5 18 17 33 32 39c26 12 96 17 121 9c15 -5 28 -14 35 -26c5 -7 6 -12 7 -27l1 -19l53 8c71 11 95 17 116 25c26 10 38 13 57 13
-c29 0 44 -6 104 -37c137 -72 176 -97 219 -139c24 -23 29 -32 50 -74c17 -34 19 -37 38 -57l20 -21l23 6c28 8 37 8 49 2c10 -5 22 -21 22 -29c0 -2 4 -9 9 -16c7 -10 24 -35 39 -59l12 4c13 5 27 6 38 1c4 -2 17 -10 28 -19c11 -8 20 -15 21 -15s13 -8 26 -16
-c13 -9 27 -17 32 -18s13 -5 19 -8c13 -8 27 -11 64 -14c15 -1 32 -3 36 -4c18 -5 46 -31 55 -51c8 -18 5 -44 -9 -66c-4 -6 -18 -20 -30 -32s-23 -24 -24 -27s0 -24 3 -47c8 -67 4 -101 -13 -127c-8 -12 -28 -26 -58 -40c-13 -6 -25 -14 -28 -16s-8 -13 -12 -25
-c-9 -26 -17 -45 -26 -55c-8 -10 -10 -16 -13 -56c-4 -54 -10 -71 -37 -99c-20 -21 -37 -30 -70 -40c-11 -3 -49 -16 -85 -28s-66 -22 -68 -22s-6 -5 -9 -11c-14 -25 -34 -48 -64 -75c-48 -43 -115 -84 -162 -98c-9 -3 -17 -7 -25 -14c-43 -38 -87 -56 -154 -62
-c-28 -2 -42 -3 -63 0zM821 -66c13 1 32 4 42 6c18 4 50 17 50 20c0 1 -10 7 -21 13s-38 21 -57 35c-70 48 -117 95 -124 122c-9 35 -9 157 1 321c2 29 3 53 2 54c-3 3 -131 99 -131 99c-2 -2 -20 -148 -25 -210c-5 -54 -6 -145 -3 -171c3 -21 9 -46 31 -105
-c24 -66 45 -109 64 -139l9 -14l25 -9c44 -15 83 -24 104 -24c5 0 20 1 33 2zM560 26c-15 35 -29 70 -47 123c-14 40 -14 45 -16 70c-6 75 3 213 25 366c4 29 7 55 7 57c0 3 -11 12 -33 28c-30 22 -50 33 -58 33c-5 0 -83 -101 -120 -154c-34 -49 -63 -103 -68 -122
-c-2 -10 42 -189 64 -259c16 -52 -1 -39 137 -109l120 -60s-5 12 -11 27zM990 8c27 8 80 39 113 64c21 16 46 38 45 39c-1 0 -24 -2 -51 -6c-28 -4 -59 -7 -69 -7c-45 0 -82 18 -99 48c-8 14 -22 51 -31 82c-7 24 -8 31 -9 65c-2 30 -3 42 -7 58c-6 22 -18 49 -26 56
-c-9 8 -49 36 -58 40c-5 2 -13 7 -18 10l-8 6l-2 -11c-4 -31 -6 -124 -6 -206c0 -108 -2 -99 22 -123c49 -49 156 -117 186 -118c4 0 12 1 18 3zM1089 192c27 4 58 9 70 11c31 6 93 24 139 41c22 8 49 17 61 20c39 11 52 20 56 44c1 8 1 8 -4 7c-48 -15 -87 -21 -143 -23
-c-94 -4 -149 7 -227 45c-23 12 -57 34 -74 48c-5 4 -8 6 -8 6s2 -12 5 -26c5 -20 7 -33 8 -62c2 -39 6 -57 22 -97c6 -14 7 -17 13 -19c12 -4 32 -2 82 5zM232 242c-1 2 -9 37 -19 78s-20 77 -21 79c-4 8 -2 31 4 49c18 54 75 142 164 253c11 13 19 25 19 26
-c0 3 -41 25 -54 28c-7 2 -19 6 -26 9c-13 5 -14 5 -22 1c-4 -2 -28 -14 -53 -25c-76 -34 -139 -67 -160 -83l-7 -6l1 -72c1 -78 3 -88 17 -138c6 -20 26 -78 36 -105c3 -8 33 -36 58 -55c20 -15 62 -43 64 -43c0 0 0 2 -1 4v0zM1309 382c32 4 65 11 87 20c16 7 40 20 47 27
-c5 5 13 17 11 19c0 0 -11 0 -23 -1c-44 -4 -93 -5 -119 -2c-33 3 -56 10 -87 26c-59 30 -105 72 -127 117c-11 23 -13 31 -13 52c0 63 43 117 184 229c22 17 40 32 41 33c0 1 -7 15 -17 30l-18 28l-12 2c-11 2 -12 1 -43 -9c-41 -14 -52 -16 -104 -22c-23 -2 -49 -7 -56 -9
-c-17 -5 -39 -20 -56 -38c-19 -20 -76 -93 -91 -117c-19 -30 -19 -33 -11 -52c4 -9 13 -27 20 -41s16 -33 20 -43c6 -16 9 -26 23 -89c7 -34 14 -48 32 -68c31 -34 76 -60 132 -80c49 -17 105 -20 180 -12zM891 490c0 0 -1 6 -3 12s-6 26 -10 44c-8 42 -14 58 -29 86
-c-16 31 -34 71 -37 83c-3 14 1 37 9 58c10 24 35 62 74 112c54 68 87 98 126 115c19 8 40 13 80 17c18 2 35 4 38 5c5 1 5 1 -2 9c-11 13 -23 33 -36 62c-10 22 -16 31 -26 42c-29 31 -63 54 -150 100c-35 18 -68 36 -73 39c-14 9 -37 17 -47 17c-5 0 -18 -4 -30 -9
-c-25 -10 -61 -17 -144 -30c-29 -5 -54 -9 -55 -9c-3 -3 -2 -38 1 -62c7 -50 24 -108 42 -142c9 -18 11 -29 5 -39c-5 -8 -28 -28 -35 -31c-9 -4 -12 -26 -11 -73c0 -33 1 -37 7 -56c9 -29 13 -67 12 -106l-1 -33l87 -65c112 -85 133 -100 152 -111c9 -5 25 -15 35 -22
-c16 -12 21 -15 21 -13zM1396 531c61 4 103 13 147 31l26 11l1 13c1 12 -3 47 -5 49c0 1 -5 -1 -9 -3c-22 -12 -54 -16 -75 -9c-34 12 -72 52 -86 90c-5 13 -5 18 -4 34s1 21 7 34c8 18 25 39 39 51c6 5 11 9 11 10s-3 3 -7 4c-4 2 -14 9 -22 15l-14 11l-19 -17
-c-10 -9 -37 -31 -61 -50c-70 -56 -84 -68 -114 -99c-24 -24 -29 -32 -36 -46c-7 -13 -6 -18 -4 -28c10 -26 41 -58 79 -78c44 -24 68 -28 146 -23zM1536 719c27 16 75 54 63 49c-2 -1 -9 -2 -16 -3c-15 -1 -29 5 -39 17c-6 8 -7 9 -14 7c-18 -5 -44 -24 -52 -37
-c-4 -7 -5 -9 -2 -15c2 -4 9 -12 15 -19c11 -11 12 -11 20 -10c5 1 16 5 25 11zM526 808c-4 36 -5 39 -38 113c-9 21 -11 21 -17 21c-8 0 -16 5 -23 12c-3 3 -13 28 -23 55c-13 36 -19 48 -20 46c-4 -5 -28 -58 -34 -73c-10 -27 -14 -42 -20 -89c-4 -26 -6 -48 -6 -50
-c0 -3 4 -5 14 -8c8 -2 18 -6 23 -9s15 -8 21 -12s16 -9 21 -12s24 -11 41 -17c23 -8 35 -14 47 -22l16 -11l1 11c0 6 -1 27 -3 45zM210 972c12 6 28 21 28 26c0 1 -12 11 -25 23c-40 34 -55 64 -66 125c-5 27 -5 80 0 114c4 24 3 26 -1 28c-14 9 -30 10 -43 3
-c-9 -4 -10 -7 -21 -30c-22 -47 -28 -86 -19 -114c10 -32 40 -90 75 -146c26 -42 40 -47 72 -29zM520 1010c20 5 28 8 37 14c2 2 1 6 -5 22c-12 30 -22 69 -28 103c-7 36 -8 79 -4 124c3 27 2 70 -1 73c-5 5 -72 0 -79 -6c-4 -4 -6 -29 -3 -63c-2 -41 16 -98 14 -133
-c-2 -25 0 -33 22 -94c14 -40 17 -45 21 -45c2 0 14 2 26 5z" />
-    <glyph glyph-name="social-home" unicode="&#xf2ec;" horiz-adv-x="1284" 
-d="M424 860h416v-536h-416v536v0zM907 553h294v-575h-294v575zM78 324v0v536h275v-536h-275zM842 -22h-762l1 281h761v-281v0zM909 860h294v-240h-294v240zM1253 1046v0c17 -4 31 -19 31 -38c0 -22 -81 -80 -81 -80h-1123s-75 52 -79 71c-4 18 5 37 22 45l539 252
-c14 8 84 8 96 0z" />
-=======
     <glyph glyph-name="scuttlebutt" unicode="&#xf2ea;" horiz-adv-x="1709" 
 d="M760 -126c-31 4 -114 28 -131 38c-5 3 -12 10 -16 16l-8 10l-7 -5c-14 -9 -14 -9 -151 60c-70 36 -134 68 -141 71c-21 10 -30 25 -45 74c-5 17 -6 19 -12 21c-18 7 -84 50 -121 78c-27 21 -66 60 -70 70c-10 25 -31 91 -37 112c-18 60 -21 88 -21 178c0 60 0 68 4 76
 c5 11 24 29 46 43c29 19 128 68 192 96l8 4l-4 8c-3 5 -16 24 -29 42l-24 33h-10c-21 1 -28 3 -48 16s-21 13 -39 41c-56 87 -91 163 -95 205c-4 46 23 129 52 160c9 9 17 16 28 22c16 8 17 8 40 8c19 0 25 -1 35 -5c27 -11 44 -29 49 -50c2 -11 2 -17 -1 -43
@@ -2065,7 +1987,6 @@ c-2 -25 0 -32 22 -93c14 -39 16 -45 20 -45c2 0 15 2 27 5z" />
     <glyph glyph-name="social-home" unicode="&#xf2ec;" horiz-adv-x="1486" 
 d="M491 894h482v-621h-482v621v0zM1050 538h341v-666h-341v666zM91 273v0v620h318v-620h-318zM975 -128h-882v326h882v-326v0zM1053 894h340v-279h-340v279zM1452 1109v0c20 -5 34 -22 34 -44c0 -26 -93 -93 -93 -93h-1300s-87 62 -92 83s5 42 25 51l624 292
 c16 9 99 9 112 0z" />
->>>>>>> svg-template
     <glyph glyph-name="leanpub" unicode="&#xf212;" horiz-adv-x="2048" 
 d="M1893 1144l155 -1272c-93 0 -173 19 -257 57c-125 57 -255 91 -393 91c-142 0 -273 -47 -374 -148c-101 101 -232 148 -374 148c-138 0 -268 -34 -393 -91c-81 -36 -163 -57 -252 -57h-5l155 1272c143 81 317 127 482 127c135 0 274 -28 387 -106c113 78 252 106 387 106
 c165 0 339 -46 482 -127zM1398 157c190 0 320 -51 492 -122l-124 1021c-112 51 -245 78 -368 78c-140 0 -271 -44 -374 -141c-103 97 -234 141 -374 141c-123 0 -256 -27 -368 -78l-124 -1021c172 71 302 122 492 122c137 0 258 -35 374 -108c116 73 237 108 374 108z
@@ -2227,13 +2148,8 @@ d="M1165 397l102 102c25 25 25 65 0 90l-454 454c-25 25 -65 25 -90 0l-454 -454c-25
     <glyph glyph-name="opencart" unicode="&#xf23d;" horiz-adv-x="2304" 
 d="M1524 -25c0 -91 -73 -164 -164 -164s-165 73 -165 164s74 165 165 165s164 -74 164 -165zM775 -25c0 -91 -74 -164 -165 -164s-164 73 -164 164s73 165 164 165s165 -74 165 -165zM0 1469c295 -311 572 -357 1660 -357s610 -242 -62 -842c213 370 945 698 -255 680
 c-1151 -17 -1219 333 -1343 519z" />
-<<<<<<< HEAD
-    <glyph glyph-name="artstation" unicode="&#xf2ed;" 
-d="M603 1228v0h267c52 0 113 -37 137 -83l504 -880c16 -24 25 -53 25 -84c0 -35 -7 -53 -31 -94l-123 -214zM475 1009l349 -606h-697zM0 183v0h951l179 -311h-862c-53 0 -114 39 -138 86v0z" />
-=======
     <glyph glyph-name="artstation" unicode="&#xf2ed;" horiz-adv-x="1533" 
 d="M601 1277v0h267c51 0 112 -37 136 -83l504 -878c16 -24 25 -53 25 -84c0 -35 -7 -53 -31 -94l-123 -213zM474 1058l348 -604h-695zM0 233v0h949l178 -309h-859c-53 0 -114 38 -138 85h-1z" />
->>>>>>> svg-template
     <glyph glyph-name="thumbs-up" unicode="&#xf164;" horiz-adv-x="1600" 
 d="M256 192c0 35 -29 64 -64 64c-36 0 -64 -29 -64 -64c0 -36 28 -64 64 -64c35 0 64 28 64 64zM416 704v-640c0 -35 -29 -64 -64 -64h-288c-35 0 -64 29 -64 64v640c0 35 29 64 64 64h288c35 0 64 -29 64 -64zM1600 704c0 -53 -21 -110 -55 -149c11 -32 15 -62 15 -76
 c2 -50 -13 -97 -43 -137c11 -37 11 -77 0 -117c-10 -37 -29 -70 -54 -94c6 -75 -11 -136 -49 -181c-43 -51 -109 -77 -197 -78h-129c-143 0 -278 47 -386 84c-63 22 -123 43 -158 44c-34 1 -64 29 -64 64v641c0 33 28 61 61 64c37 3 133 122 177 180c36 46 70 89 101 120
@@ -2330,17 +2246,10 @@ c-14 -76 -69 -430 -85 -530c-1 -7 -4 -10 -12 -10h-295c-30 0 -52 26 -48 55l232 147
     <glyph glyph-name="child" unicode="&#xf1ae;" horiz-adv-x="1152" 
 d="M1124 988l-292 -292v-824c0 -62 -50 -112 -112 -112s-112 50 -112 112v384h-64v-384c0 -62 -50 -112 -112 -112s-112 50 -112 112v824l-292 292c-37 38 -37 98 0 136c38 37 98 37 136 0l228 -228h368l228 228c38 37 98 37 136 0c37 -38 37 -98 0 -136zM800 1152
 c0 -124 -100 -224 -224 -224s-224 100 -224 224s100 224 224 224s224 -100 224 -224z" />
-<<<<<<< HEAD
-    <glyph glyph-name="fork-awesome" unicode="&#xf2e3;" 
-d="M768 1408c424 0 768 -344 768 -768v-1v-2c0 -7 -1 -18 -1 -25v-2c-15 -389 -318 -705 -702 -737v2c-22 -2 -43 -3 -65 -3c-18 0 -48 1 -66 3v-2c-384 33 -686 347 -701 736v3c0 7 -1 18 -1 25v2v0v1c0 424 344 768 768 768zM541 1078v0c-25 -253 -66 -517 -41 -704
-s146 -156 182 -351c5 -29 10 -60 14 -90c20 -2 52 -3 72 -3v0v0c20 0 52 1 72 3c4 30 8 61 13 90c36 195 157 164 182 351s-15 451 -40 704h-42c-6 -215 -13 -400 -19 -615c-1 -82 -108 -88 -108 -1c-11 211 -29 405 -40 616h-37c-11 -211 -29 -405 -40 -616
-c0 -87 -106 -81 -107 1c-6 215 -14 400 -20 615h-41z" />
-=======
     <glyph glyph-name="fork-awesome" unicode="&#xf2e3;" horiz-adv-x="1533" 
 d="M766 1404v0c423 0 767 -343 767 -766v-1v-2c0 -8 -1 -17 -1 -25v-2c-14 -388 -318 -703 -701 -735v1c-18 -2 -47 -2 -65 -2s-47 1 -65 3v-2c-383 32 -685 347 -700 735v2c0 8 -1 17 -1 25v2v1c0 423 343 766 766 766zM594 1085h-66c-35 -251 -54 -525 -29 -712
 s145 -157 181 -351c5 -29 10 -59 14 -89c20 -2 52 -4 72 -4s52 2 72 4c4 30 9 60 14 89c36 194 156 164 181 351s6 456 -28 712h-65c3 -190 12 -430 -8 -640c-8 -89 -103 -87 -108 0c-13 208 -15 428 -26 639h-64c-11 -211 -18 -431 -26 -643c-3 -82 -100 -81 -108 0
 c-19 208 -10 453 -6 644z" />
->>>>>>> svg-template
     <glyph glyph-name="angle-double-up" unicode="&#xf102;" horiz-adv-x="998" 
 d="M998 224c0 -8 -4 -17 -10 -23l-50 -50c-6 -6 -14 -10 -23 -10c-8 0 -17 4 -23 10l-393 393l-393 -393c-6 -6 -15 -10 -23 -10s-17 4 -23 10l-50 50c-6 6 -10 15 -10 23s4 17 10 23l466 466c6 6 15 10 23 10s17 -4 23 -10l466 -466c6 -6 10 -15 10 -23zM998 608
 c0 -8 -4 -17 -10 -23l-50 -50c-6 -6 -14 -10 -23 -10c-8 0 -17 4 -23 10l-393 393l-393 -393c-6 -6 -15 -10 -23 -10s-17 4 -23 10l-50 50c-6 6 -10 15 -10 23s4 17 10 23l466 466c6 6 15 10 23 10s17 -4 23 -10l466 -466c6 -6 10 -15 10 -23z" />
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf
index d3f432542..8ada16b44 100644
Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf and b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf differ
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff
index 9dbbd1de0..4fbeb6671 100644
Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff and b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff differ
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2 b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2
index 5bed7aa58..71e9ad65f 100644
Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2 and b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2 differ
diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json
index 8b738114b..82a74c448 100644
--- a/src/icons/.fontcustom-manifest.json
+++ b/src/icons/.fontcustom-manifest.json
@@ -1,7 +1,7 @@
 {
   "checksum": {
-    "previous": "ab0ed2a3e3520062c4b23af863122cd698499316364d27fd291a976bb3a6502e",
-    "current": "ab0ed2a3e3520062c4b23af863122cd698499316364d27fd291a976bb3a6502e"
+    "previous": "0f3ddd83f70e423706d83c2b59e162fe96e01a4da890c1f437d79613dbb6946f",
+    "current": "0f3ddd83f70e423706d83c2b59e162fe96e01a4da890c1f437d79613dbb6946f"
   },
   "fonts": [
     "forkawesome/forkawesome.ttf",
@@ -2786,4 +2786,4 @@
     "forkawesome/forkawesome.css",
     "forkawesome/forkawesome-preview.html"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/icons/svg/mastodon-alt.svg b/src/icons/svg/mastodon-alt.svg
index c1577e08f..65ebcca0c 100644
--- a/src/icons/svg/mastodon-alt.svg
+++ b/src/icons/svg/mastodon-alt.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="1536" height="1792" viewBox="0 0 1536.0001 1792">
-    <path d="M765.571 128h5.17c210.52 1.722 413.144 24.512 531.149 78.71 0 0 234.051 104.703 234.051 461.92 0 0 2.933 263.564-32.644 446.547-22.589 116.16-202.226 243.279-408.552 267.918-107.6 12.839-213.506 24.646-326.471 19.463-184.73-8.464-330.505-44.096-330.505-44.096 0 17.984 1.108 35.11 3.326 51.122 24.017 182.31 180.775 193.224 329.272 198.315 149.864 5.13 283.317-36.941 283.317-36.941l6.156 135.49s-104.822 56.283-291.567 66.636c-102.975 5.66-230.833-2.586-379.76-42.004C65.525 1645.592 9.978 1301.304 1.48 951.961-1.103 848.241.48 750.431.48 668.631c0-357.218 234.05-461.92 234.05-461.92 118.006-54.2 320.519-76.99 531.038-78.712zM350.367 696.77c-63.977 0-115.836 51.875-115.836 115.848 0 63.975 51.86 115.847 115.836 115.847 63.983 0 115.847-51.872 115.847-115.847 0-63.976-51.864-115.847-115.847-115.847zm417.629 0c-63.974 0-115.846 51.875-115.846 115.848 0 63.975 51.873 115.847 115.846 115.847 63.977 0 115.848-51.872 115.848-115.847 0-63.976-51.873-115.847-115.848-115.847zm417.626 0c-63.974 0-115.847 51.875-115.847 115.848 0 63.975 51.873 115.847 115.848 115.847s115.832-51.872 115.832-115.847c0-63.976-51.857-115.847-115.832-115.847z"/>
+    <path d="M765.571 128h5.17c210.52 1.722 413.144 24.512 531.149 78.71 0 0 234.051 104.703 234.051 461.92 0 0 2.933 263.564-32.644 446.547-22.589 116.16-202.226 243.279-408.552 267.918-107.6 12.839-213.506 24.646-326.471 19.463-184.73-8.464-330.505-44.096-330.505-44.096 0 17.984 1.108 35.11 3.326 51.122 24.017 182.31 180.775 193.224 329.272 198.315 149.864 5.13 283.317-36.941 283.317-36.941l6.156 135.49s-104.822 56.283-291.567 66.636c-102.975 5.66-230.833-2.586-379.76-42.004C65.525 1645.592 9.978 1301.304 1.48 951.961c-2.583-103.72-1-201.53-1-283.33 0-357.218 234.05-461.92 234.05-461.92 118.006-54.2 320.519-76.99 531.038-78.712zM350.367 696.77c-63.977 0-115.836 51.875-115.836 115.848 0 63.975 51.86 115.847 115.836 115.847 63.983 0 115.847-51.872 115.847-115.847 0-63.976-51.864-115.847-115.847-115.847zm417.629 0c-63.974 0-115.846 51.875-115.846 115.848 0 63.975 51.873 115.847 115.846 115.847 63.977 0 115.848-51.872 115.848-115.847 0-63.976-51.873-115.847-115.848-115.847zm417.626 0c-63.974 0-115.847 51.875-115.847 115.848 0 63.975 51.873 115.847 115.848 115.847s115.832-51.872 115.832-115.847c0-63.976-51.857-115.847-115.832-115.847z"/>
 </svg>
diff --git a/src/icons/svg/mastodon.svg b/src/icons/svg/mastodon.svg
index 57fa478e8..13b9032b6 100644
--- a/src/icons/svg/mastodon.svg
+++ b/src/icons/svg/mastodon.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="1536" height="1792" viewBox="0 0 1536.0001 1792">
-    <path d="M1503.302 1111.386c-22.579 116.159-202.224 243.284-408.55 267.921-107.588 12.837-213.519 24.636-326.476 19.455-184.728-8.463-330.494-44.092-330.494-44.092 0 17.983 1.11 35.106 3.328 51.12 24.015 182.308 180.772 193.228 329.261 198.32 149.872 5.127 283.321-36.951 283.321-36.951l6.157 135.491s-104.827 56.293-291.574 66.646c-102.974 5.66-230.836-2.59-379.759-42.009C65.529 1641.797 10.219 1297.502 1.482 948.17-1.11 844.449.485 746.646.49 664.847c.01-357.216 234.049-461.923 234.049-461.923 118.011-54.199 320.512-76.99 531.033-78.71h5.173c210.52 1.721 413.152 24.511 531.157 78.71 0 0 234.04 104.706 234.04 461.923 0 0 2.935 263.556-32.64 446.539zm-243.429-418.827c0-88.4-21.711-159.35-67.71-210.618-46.63-51.972-107.687-78.613-183.47-78.613-87.699 0-154.104 33.703-198.002 101.121L768 576l-42.683-71.55C681.41 437.03 615.004 403.326 527.314 403.326c-75.792 0-136.849 26.642-183.47 78.614-45.21 51.973-67.718 122.219-67.718 210.618v432.53h171.359V705.273c0-88.498 37.234-133.415 111.713-133.415 82.35 0 123.63 53.283 123.63 158.646v229.788h170.35V730.505c0-105.363 41.272-158.646 123.62-158.646 74.478 0 111.715 44.917 111.715 133.415v419.816h171.358v-432.53z"/>
+    <path d="M1503.302 1111.386c-22.579 116.159-202.224 243.284-408.55 267.921-107.588 12.837-213.519 24.636-326.476 19.455-184.728-8.463-330.494-44.092-330.494-44.092 0 17.983 1.11 35.106 3.328 51.12 24.015 182.308 180.772 193.228 329.261 198.32 149.872 5.127 283.321-36.951 283.321-36.951l6.157 135.491s-104.827 56.293-291.574 66.646c-102.974 5.66-230.836-2.59-379.759-42.009C65.529 1641.797 10.219 1297.502 1.482 948.17-1.11 844.449.485 746.646.49 664.847.5 307.631 234.539 202.924 234.539 202.924c118.011-54.199 320.512-76.99 531.033-78.71h5.173c210.52 1.721 413.152 24.511 531.157 78.71 0 0 234.04 104.706 234.04 461.923 0 0 2.935 263.556-32.64 446.539zm-243.429-418.827c0-88.4-21.711-159.35-67.71-210.618-46.63-51.972-107.687-78.613-183.47-78.613-87.699 0-154.104 33.703-198.002 101.121L768 576l-42.683-71.55c-43.907-67.42-110.313-101.124-198.003-101.124-75.792 0-136.849 26.642-183.47 78.614-45.21 51.973-67.718 122.219-67.718 210.618v432.53h171.359V705.273c0-88.498 37.234-133.415 111.713-133.415 82.35 0 123.63 53.283 123.63 158.646v229.788h170.35V730.505c0-105.363 41.272-158.646 123.62-158.646 74.478 0 111.715 44.917 111.715 133.415v419.816h171.358V692.56z"/>
 </svg>