diff --git a/static/favicon/android-icon-144x144.png b/static/favicon/android-icon-144x144.png
index b81bfd32..ac270527 100644
Binary files a/static/favicon/android-icon-144x144.png and b/static/favicon/android-icon-144x144.png differ
diff --git a/static/favicon/android-icon-192x192.png b/static/favicon/android-icon-192x192.png
index 114626ff..1d63a76e 100644
Binary files a/static/favicon/android-icon-192x192.png and b/static/favicon/android-icon-192x192.png differ
diff --git a/static/favicon/android-icon-36x36.png b/static/favicon/android-icon-36x36.png
index d7e0f175..615d1cff 100644
Binary files a/static/favicon/android-icon-36x36.png and b/static/favicon/android-icon-36x36.png differ
diff --git a/static/favicon/android-icon-48x48.png b/static/favicon/android-icon-48x48.png
index 81d959eb..9d24aba6 100644
Binary files a/static/favicon/android-icon-48x48.png and b/static/favicon/android-icon-48x48.png differ
diff --git a/static/favicon/android-icon-512x512.png b/static/favicon/android-icon-512x512.png
index d8450b42..38f7675b 100644
Binary files a/static/favicon/android-icon-512x512.png and b/static/favicon/android-icon-512x512.png differ
diff --git a/static/favicon/android-icon-72x72.png b/static/favicon/android-icon-72x72.png
index 1168b833..10e68015 100644
Binary files a/static/favicon/android-icon-72x72.png and b/static/favicon/android-icon-72x72.png differ
diff --git a/static/favicon/android-icon-96x96.png b/static/favicon/android-icon-96x96.png
index 2b990b96..7c567cde 100644
Binary files a/static/favicon/android-icon-96x96.png and b/static/favicon/android-icon-96x96.png differ
diff --git a/static/favicon/apple-icon-114x114.png b/static/favicon/apple-icon-114x114.png
index c891b861..47b1e01a 100644
Binary files a/static/favicon/apple-icon-114x114.png and b/static/favicon/apple-icon-114x114.png differ
diff --git a/static/favicon/apple-icon-120x120.png b/static/favicon/apple-icon-120x120.png
index 55cd95fd..1a1d5ed5 100644
Binary files a/static/favicon/apple-icon-120x120.png and b/static/favicon/apple-icon-120x120.png differ
diff --git a/static/favicon/apple-icon-144x144.png b/static/favicon/apple-icon-144x144.png
index b81bfd32..ac270527 100644
Binary files a/static/favicon/apple-icon-144x144.png and b/static/favicon/apple-icon-144x144.png differ
diff --git a/static/favicon/apple-icon-152x152.png b/static/favicon/apple-icon-152x152.png
index b6502be0..b237ab5a 100644
Binary files a/static/favicon/apple-icon-152x152.png and b/static/favicon/apple-icon-152x152.png differ
diff --git a/static/favicon/apple-icon-180x180.png b/static/favicon/apple-icon-180x180.png
index 77ba82e0..210cb297 100644
Binary files a/static/favicon/apple-icon-180x180.png and b/static/favicon/apple-icon-180x180.png differ
diff --git a/static/favicon/apple-icon-57x57.png b/static/favicon/apple-icon-57x57.png
index 238f795c..1db88954 100644
Binary files a/static/favicon/apple-icon-57x57.png and b/static/favicon/apple-icon-57x57.png differ
diff --git a/static/favicon/apple-icon-60x60.png b/static/favicon/apple-icon-60x60.png
index 5f606cc0..01147e65 100644
Binary files a/static/favicon/apple-icon-60x60.png and b/static/favicon/apple-icon-60x60.png differ
diff --git a/static/favicon/apple-icon-72x72.png b/static/favicon/apple-icon-72x72.png
index 1168b833..10e68015 100644
Binary files a/static/favicon/apple-icon-72x72.png and b/static/favicon/apple-icon-72x72.png differ
diff --git a/static/favicon/apple-icon-76x76.png b/static/favicon/apple-icon-76x76.png
index 675dd6e2..51e5a72d 100644
Binary files a/static/favicon/apple-icon-76x76.png and b/static/favicon/apple-icon-76x76.png differ
diff --git a/static/favicon/apple-icon-precomposed.png b/static/favicon/apple-icon-precomposed.png
index ed2a8c52..1d63a76e 100644
Binary files a/static/favicon/apple-icon-precomposed.png and b/static/favicon/apple-icon-precomposed.png differ
diff --git a/static/favicon/apple-icon.png b/static/favicon/apple-icon.png
index ed2a8c52..1d63a76e 100644
Binary files a/static/favicon/apple-icon.png and b/static/favicon/apple-icon.png differ
diff --git a/static/favicon/favicon-16x16.png b/static/favicon/favicon-16x16.png
index 6f4d1429..6a87133b 100644
Binary files a/static/favicon/favicon-16x16.png and b/static/favicon/favicon-16x16.png differ
diff --git a/static/favicon/favicon-32x32.png b/static/favicon/favicon-32x32.png
index 027ec686..31a53406 100644
Binary files a/static/favicon/favicon-32x32.png and b/static/favicon/favicon-32x32.png differ
diff --git a/static/favicon/favicon-96x96.png b/static/favicon/favicon-96x96.png
index 2b990b96..7c567cde 100644
Binary files a/static/favicon/favicon-96x96.png and b/static/favicon/favicon-96x96.png differ
diff --git a/static/favicon/ms-icon-144x144.png b/static/favicon/ms-icon-144x144.png
index b81bfd32..ac270527 100644
Binary files a/static/favicon/ms-icon-144x144.png and b/static/favicon/ms-icon-144x144.png differ
diff --git a/static/favicon/ms-icon-150x150.png b/static/favicon/ms-icon-150x150.png
index 9254e225..a558b648 100644
Binary files a/static/favicon/ms-icon-150x150.png and b/static/favicon/ms-icon-150x150.png differ
diff --git a/static/favicon/ms-icon-310x310.png b/static/favicon/ms-icon-310x310.png
index 68ababe3..3e046077 100644
Binary files a/static/favicon/ms-icon-310x310.png and b/static/favicon/ms-icon-310x310.png differ
diff --git a/static/favicon/ms-icon-70x70.png b/static/favicon/ms-icon-70x70.png
index f5419099..f9dbceb6 100644
Binary files a/static/favicon/ms-icon-70x70.png and b/static/favicon/ms-icon-70x70.png differ
diff --git a/static/images/Androcur100.jpg b/static/images/Androcur100.jpg
index b3c37090..286d2a60 100644
Binary files a/static/images/Androcur100.jpg and b/static/images/Androcur100.jpg differ
diff --git a/static/images/Androcur50.jpg b/static/images/Androcur50.jpg
index 9a87b048..875309fe 100644
Binary files a/static/images/Androcur50.jpg and b/static/images/Androcur50.jpg differ
diff --git a/static/images/Bicalutamide.svg b/static/images/Bicalutamide.svg
index b5b80b2c..5a2b34ce 100644
--- a/static/images/Bicalutamide.svg
+++ b/static/images/Bicalutamide.svg
@@ -1,75 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 696.9 251.1" style="enable-background:new 0 0 696.9 251.1;" xml:space="preserve">
-<g>
-	<rect x="134.1" y="113.9" width="2.4" height="45.6"/>
-	<rect x="171.8" y="169.7" transform="matrix(0.8661 -0.4998 0.4998 0.8661 -59.3742 120.1304)" width="45.6" height="2.4"/>
-	<rect x="193.4" y="79.6" transform="matrix(0.5004 -0.8658 0.8658 0.5004 8.4969 219.6575)" width="2.4" height="45.6"/>
-	<rect x="33.9" y="193.7" transform="matrix(0.8662 -0.4997 0.4997 0.8662 -90.2924 52.6473)" width="38.5" height="2.4"/>
-	<rect x="44.3" y="211.7" transform="matrix(0.8661 -0.4998 0.4998 0.8661 -97.8989 60.2543)" width="38.5" height="2.4"/>
-	<path d="M257.5,87.6l-32.8,18.9l-49.1-28.3l-0.8-0.5l-0.8,0.5l-49.1,28.3L76.7,78.6l17-29.5L91.6,48l-17,29.5L36.7,55.5l-1.2,2.1
-		l37.9,21.9L57,108l2.1,1.2l16.4-28.5l48.2,27.9v56.2l-49.3,28.5l-33.4,19.3l1.2,2.1l33.4-19.3l49.3-28.5l49.3,28.5l0,0l0.6,0.3
-		l0.6-0.3l0,0l48.2-27.8l0,0l2.3-1.3v-0.7v-2v-54.9l32.8-18.9L257.5,87.6z M223.5,164.8l-47.6,27.5l0,0l-1.1,0.7l-1.1-0.7l0,0
-		l-47.6-27.5v-56.2l47.6-27.5l0,0l1.1-0.6l1.1,0.6l0,0l47.6,27.5v54.9V164.8z"/>
-	<polygon points="457.5,87.2 424.2,106.5 423.1,105.8 423.1,105.9 376,78.6 404.2,29.8 402.1,28.6 374.3,76.7 357.1,46.7 355,47.9 
-		372.7,78.6 324.5,106.5 323.3,105.8 323.3,105.9 291.7,87.6 290.5,89.6 318.1,105.6 318.1,144 320.5,144 320.5,107 323.7,108.8 
-		324.4,109.3 326.8,107.9 326.8,107.9 328.5,107 328.5,144 330.9,144 330.9,105.6 374.3,80.5 423.6,108.9 423.6,108.9 424.2,109.3 
-		424.8,108.9 424.8,108.9 424.8,108.9 426.6,107.9 426.6,107.9 458.7,89.3 	"/>
-	<rect x="533.2" y="113.9" width="2.4" height="45.6"/>
-	<rect x="570.8" y="169.7" transform="matrix(0.8654 -0.501 0.501 0.8654 -5.7427 320.4311)" width="45.6" height="2.4"/>
-	<path d="M625,109.9v-2v-0.7l-0.6-0.3l0,0l-49.8-28.8l-0.7-0.4l-0.6,0.3l0,0l-0.1,0.1l-1.7,0.9l0,0L524,106.5l-32.6-18.8l-1.2,2.1
-		l32.6,18.8v54.9v2v0.7l0.6,0.3l0,0l0.2,0.1l1.6,0.9l0,0l46.4,26.8l0,0l1.5,0.9l0.2,0.1l0,0l0.6,0.3l0.6-0.3l0,0l49.3-28.5l34.7,20
-		l1.2-2.1l-34.7-20V109.9z M525.2,108.6l48.7-28.1l1.1,0.6l0,0l46.4,26.8l0,0l1.2,0.7v1.3v54.9L575,192.3l0,0l-1.1,0.7l-48.7-28.1
-		v-1.3V108.6z"/>
-	<rect x="592.4" y="79.7" transform="matrix(0.5008 -0.8656 0.8656 0.5008 207.6756 564.9991)" width="2.4" height="45.6"/>
-	<rect x="485.3" y="55.4" transform="matrix(0.4998 -0.8661 0.8661 0.4998 197.6162 455.3708)" width="15.5" height="2.4"/>
-	<rect x="476.4" y="50.2" transform="matrix(0.4998 -0.8661 0.8661 0.4998 197.6222 445.0199)" width="15.4" height="2.4"/>
-	<rect x="453.9" y="48.9" transform="matrix(0.8665 -0.4992 0.4992 0.8665 32.5642 234.7245)" width="2.4" height="15.1"/>
-	<rect x="462.9" y="43.8" transform="matrix(0.8665 -0.4992 0.4992 0.8665 36.342 238.5285)" width="2.4" height="15.1"/>
-	<polygon points="19.9,51.1 32.7,51.1 32.7,47.8 19.9,47.8 19.9,38.9 34.2,38.9 34.2,35.5 16.1,35.5 16.1,64.1 19.9,64.1 	"/>
-	<polygon points="98.6,30 111.5,30 111.5,26.6 98.6,26.6 98.6,17.8 112.9,17.8 112.9,14.4 94.8,14.4 94.8,43 98.6,43 	"/>
-	<polygon points="55.3,117.6 55.3,114.2 37.2,114.2 37.2,142.8 41,142.8 41,129.8 53.9,129.8 53.9,126.4 41,126.4 41,117.6 	"/>
-	<polygon points="32.5,230.6 32.5,230.6 18.1,208.3 14.2,208.3 14.2,236.9 17.8,236.9 17.8,214.6 17.9,214.6 32.3,236.9 36.1,236.9 
-		36.1,208.3 32.5,208.3 	"/>
-	<polygon points="282,86.6 281.9,86.6 267.5,64.3 263.6,64.3 263.6,92.9 267.2,92.9 267.2,70.6 267.3,70.6 281.7,92.9 285.6,92.9 
-		285.6,64.3 282,64.3 	"/>
-	<polygon points="267.5,46.8 281.6,46.8 281.6,60.3 285.4,60.3 285.4,31.6 281.6,31.6 281.6,43.4 267.5,43.4 267.5,31.6 263.7,31.6 
-		263.7,60.3 267.5,60.3 	"/>
-	<path d="M331.5,152.2c-3.1-1.8-7-1.8-7-1.8c-3.9,0-7,1.8-7,1.8c-3.1,1.8-4.9,5.2-4.9,5.2c-1.8,3.4-1.8,7.8-1.8,7.8
-		c0,4.3,1.8,7.7,1.8,7.7c1.8,3.4,4.9,5.2,4.9,5.2c3.1,1.8,7,1.8,7,1.8c3.9,0,7-1.8,7-1.8c3.1-1.8,4.9-5.2,4.9-5.2
-		c1.8-3.4,1.8-7.8,1.8-7.8c0-4.5-1.8-7.8-1.8-7.8C334.6,154.1,331.5,152.2,331.5,152.2z M333,171.5c-1.2,2.6-3.4,4-3.4,4
-		c-2.2,1.4-5.1,1.4-5.1,1.4c-2.8,0-5-1.4-5-1.4c-2.2-1.4-3.5-4-3.5-4c-1.2-2.6-1.2-6.1-1.2-6.1c0-3.6,1.2-6.3,1.2-6.3
-		c1.2-2.6,3.4-4,3.4-4c2.2-1.4,5.1-1.4,5.1-1.4c2.9,0,5.1,1.4,5.1,1.4c2.2,1.4,3.4,4,3.4,4c1.2,2.6,1.2,6.2,1.2,6.2
-		C334.3,168.9,333,171.5,333,171.5z"/>
-	<path d="M338.5,41.9c3.1,1.8,7,1.8,7,1.8c3.9,0,7-1.8,7-1.8c3.1-1.8,4.9-5.2,4.9-5.2c1.8-3.4,1.8-7.8,1.8-7.8
-		c0-4.5-1.8-7.8-1.8-7.8c-1.8-3.3-4.9-5.2-4.9-5.2c-3.1-1.8-7-1.8-7-1.8c-3.9,0-7,1.8-7,1.8c-3.1,1.8-4.9,5.2-4.9,5.2
-		c-1.8,3.4-1.8,7.8-1.8,7.8c0,4.3,1.8,7.7,1.8,7.7C335.4,40,338.5,41.9,338.5,41.9z M337,22.8c1.2-2.6,3.4-4,3.4-4
-		c2.2-1.4,5.1-1.4,5.1-1.4c2.9,0,5.1,1.4,5.1,1.4c2.2,1.4,3.4,4,3.4,4c1.2,2.6,1.2,6.2,1.2,6.2c0,3.6-1.3,6.2-1.3,6.2
-		c-1.2,2.6-3.4,4-3.4,4c-2.2,1.4-5.1,1.4-5.1,1.4c-2.8,0-5-1.4-5-1.4c-2.2-1.4-3.5-4-3.5-4c-1.2-2.6-1.2-6.1-1.2-6.1
-		C335.8,25.4,337,22.8,337,22.8z"/>
-	<polygon points="310,29.8 324.1,29.8 324.1,43.3 327.9,43.3 327.9,14.6 324.1,14.6 324.1,26.4 310,26.4 310,14.6 306.2,14.6 
-		306.2,43.3 310,43.3 	"/>
-	<path d="M481,78.4c-2.3-1.1-6.1-2-6.1-2c-2.8-0.6-4.3-1.1-4.3-1.1c-1.5-0.6-2.2-1.4-2.2-1.4c-0.7-0.8-0.7-2.2-0.7-2.2
-		c0-1.4,0.8-2.4,0.8-2.4c0.8-1,2.2-1.5,2.2-1.5c1.4-0.6,3.3-0.6,3.3-0.6c2.8,0,4.5,1.4,4.5,1.4c1.7,1.3,2.3,4.4,2.3,4.4h0.1l3.7-0.8
-		c-0.4-2.6-1.7-4.4-1.7-4.4c-1.4-1.8-3.6-2.8-3.6-2.8c-2.3-1-5.2-1-5.2-1c-2.8,0-5,1-5,1c-2.2,1-3.5,2.8-3.5,2.8
-		c-1.3,1.7-1.3,3.9-1.3,3.9c0,2,0.6,3.4,0.6,3.4c0.6,1.4,2.3,2.6,2.3,2.6c1.7,1.1,4.7,1.9,4.7,1.9c0.6,0.2,2.3,0.6,2.3,0.6
-		c2.8,0.6,4.2,1.1,4.2,1.1c1.8,0.6,2.6,1.6,2.6,1.6c0.9,1,0.9,2.8,0.9,2.8c0,1.3-1,2.4-1,2.4c-0.9,1.1-2.5,1.7-2.5,1.7
-		c-1.6,0.6-3.5,0.6-3.5,0.6c-3.6,0-5.6-1.8-5.6-1.8c-2-1.8-2.4-5.3-2.4-5.3l-3.8,0.9c0.7,4.6,3.8,7,3.8,7c3.1,2.4,8.2,2.4,8.2,2.4
-		c3,0,5.4-1.1,5.4-1.1c2.4-1.1,3.7-3.1,3.7-3.1c1.4-2,1.4-4.4,1.4-4.4c0-2.4-1-4-1-4C483.2,79.4,481,78.4,481,78.4z"/>
-	<polygon points="682.7,182.9 682.7,179.5 664.6,179.5 664.6,208.1 668.4,208.1 668.4,195.1 681.2,195.1 681.2,191.8 668.4,191.8 
-		668.4,182.9 	"/>
-	<path d="M495.9,41.9c3.1,1.8,7,1.8,7,1.8c3.9,0,7-1.8,7-1.8c3.1-1.8,4.9-5.2,4.9-5.2c1.8-3.4,1.8-7.8,1.8-7.8
-		c0-4.5-1.8-7.8-1.8-7.8c-1.8-3.3-4.9-5.2-4.9-5.2c-3.1-1.8-7-1.8-7-1.8c-3.9,0-7,1.8-7,1.8c-3.1,1.8-4.9,5.2-4.9,5.2
-		c-1.8,3.4-1.8,7.8-1.8,7.8c0,4.3,1.8,7.7,1.8,7.7C492.8,40,495.9,41.9,495.9,41.9z M494.4,22.8c1.2-2.6,3.4-4,3.4-4
-		c2.2-1.4,5.1-1.4,5.1-1.4c2.9,0,5.1,1.4,5.1,1.4c2.2,1.4,3.4,4,3.4,4c1.2,2.6,1.2,6.2,1.2,6.2c0,3.6-1.2,6.2-1.2,6.2
-		c-1.3,2.6-3.5,4-3.5,4c-2.2,1.4-5.1,1.4-5.1,1.4c-2.8,0-5-1.4-5-1.4c-2.2-1.4-3.5-4-3.5-4c-1.2-2.6-1.2-6.1-1.2-6.1
-		C493.1,25.4,494.4,22.8,494.4,22.8z"/>
-	<path d="M438.3,41.9c3.1,1.8,7,1.8,7,1.8c3.9,0,7-1.8,7-1.8c3.1-1.8,4.9-5.2,4.9-5.2C459,33.4,459,29,459,29c0-4.5-1.8-7.8-1.8-7.8
-		c-1.8-3.3-4.9-5.2-4.9-5.2c-3.1-1.8-7-1.8-7-1.8c-3.9,0-7,1.8-7,1.8c-3.1,1.8-4.9,5.2-4.9,5.2c-1.8,3.4-1.8,7.8-1.8,7.8
-		c0,4.3,1.8,7.7,1.8,7.7C435.2,40,438.3,41.9,438.3,41.9z M436.8,22.8c1.2-2.6,3.4-4,3.4-4c2.2-1.4,5.1-1.4,5.1-1.4
-		c2.9,0,5.1,1.4,5.1,1.4c2.2,1.4,3.4,4,3.4,4c1.2,2.6,1.2,6.2,1.2,6.2c0,3.6-1.2,6.2-1.2,6.2c-1.3,2.6-3.5,4-3.5,4
-		c-2.2,1.4-5.1,1.4-5.1,1.4c-2.8,0-5-1.4-5-1.4c-2.2-1.4-3.5-4-3.5-4c-1.2-2.6-1.2-6.1-1.2-6.1C435.5,25.4,436.8,22.8,436.8,22.8z"
-		/>
-</g>
-</svg>
+<svg enable-background="new 0 0 696.9 251.1" viewBox="0 0 696.9 251.1" xmlns="http://www.w3.org/2000/svg"><path d="m134.1 113.9h2.4v45.6h-2.4z"/><path d="m171.8 169.7h45.6v2.4h-45.6z" transform="matrix(.8661 -.4998 .4998 .8661 -59.3742 120.1304)"/><path d="m193.4 79.6h2.4v45.6h-2.4z" transform="matrix(.5004 -.8658 .8658 .5004 8.4969 219.6575)"/><path d="m33.9 193.7h38.5v2.4h-38.5z" transform="matrix(.8662 -.4997 .4997 .8662 -90.2924 52.6473)"/><path d="m44.3 211.7h38.5v2.4h-38.5z" transform="matrix(.8661 -.4998 .4998 .8661 -97.8989 60.2543)"/><path d="m257.5 87.6-32.8 18.9-49.1-28.3-.8-.5-.8.5-49.1 28.3-48.2-27.9 17-29.5-2.1-1.1-17 29.5-37.9-22-1.2 2.1 37.9 21.9-16.4 28.5 2.1 1.2 16.4-28.5 48.2 27.9v56.2l-49.3 28.5-33.4 19.3 1.2 2.1 33.4-19.3 49.3-28.5 49.3 28.5.6.3.6-.3 48.2-27.8 2.3-1.3v-.7-2-54.9l32.8-18.9zm-34 77.2-47.6 27.5-1.1.7-1.1-.7-47.6-27.5v-56.2l47.6-27.5 1.1-.6 1.1.6 47.6 27.5v54.9z"/><path d="m457.5 87.2-33.3 19.3-1.1-.7v.1l-47.1-27.3 28.2-48.8-2.1-1.2-27.8 48.1-17.2-30-2.1 1.2 17.7 30.7-48.2 27.9-1.2-.7v.1l-31.6-18.3-1.2 2 27.6 16v38.4h2.4v-37l3.2 1.8.7.5 2.4-1.4 1.7-.9v37h2.4v-38.4l43.4-25.1 49.3 28.4.6.4.6-.4 1.8-1 32.1-18.6z"/><path d="m533.2 113.9h2.4v45.6h-2.4z"/><path d="m570.8 169.7h45.6v2.4h-45.6z" transform="matrix(.8654 -.501 .501 .8654 -5.7427 320.4311)"/><path d="m625 109.9v-2-.7l-.6-.3-49.8-28.8-.7-.4-.6.3-.1.1-1.7.9-47.5 27.5-32.6-18.8-1.2 2.1 32.6 18.8v54.9 2 .7l.6.3.2.1 1.6.9 46.4 26.8 1.5.9.2.1.6.3.6-.3 49.3-28.5 34.7 20 1.2-2.1-34.7-20zm-99.8-1.3 48.7-28.1 1.1.6 46.4 26.8 1.2.7v1.3 54.9l-47.6 27.5-1.1.7-48.7-28.1v-1.3z"/><path d="m592.4 79.7h2.4v45.6h-2.4z" transform="matrix(.5008 -.8656 .8656 .5008 207.6756 564.9991)"/><path d="m485.3 55.4h15.5v2.4h-15.5z" transform="matrix(.4998 -.8661 .8661 .4998 197.6162 455.3708)"/><path d="m476.4 50.2h15.4v2.4h-15.4z" transform="matrix(.4998 -.8661 .8661 .4998 197.6222 445.0199)"/><path d="m453.9 48.9h2.4v15.1h-2.4z" transform="matrix(.8665 -.4992 .4992 .8665 32.5642 234.7245)"/><path d="m462.9 43.8h2.4v15.1h-2.4z" transform="matrix(.8665 -.4992 .4992 .8665 36.342 238.5285)"/><path d="m19.9 51.1h12.8v-3.3h-12.8v-8.9h14.3v-3.4h-18.1v28.6h3.8z"/><path d="m98.6 30h12.9v-3.4h-12.9v-8.8h14.3v-3.4h-18.1v28.6h3.8z"/><path d="m55.3 117.6v-3.4h-18.1v28.6h3.8v-13h12.9v-3.4h-12.9v-8.8z"/><path d="m32.5 230.6-14.4-22.3h-3.9v28.6h3.6v-22.3h.1l14.4 22.3h3.8v-28.6h-3.6z"/><path d="m282 86.6h-.1l-14.4-22.3h-3.9v28.6h3.6v-22.3h.1l14.4 22.3h3.9v-28.6h-3.6z"/><path d="m267.5 46.8h14.1v13.5h3.8v-28.7h-3.8v11.8h-14.1v-11.8h-3.8v28.7h3.8z"/><path d="m331.5 152.2c-3.1-1.8-7-1.8-7-1.8-3.9 0-7 1.8-7 1.8-3.1 1.8-4.9 5.2-4.9 5.2-1.8 3.4-1.8 7.8-1.8 7.8 0 4.3 1.8 7.7 1.8 7.7 1.8 3.4 4.9 5.2 4.9 5.2 3.1 1.8 7 1.8 7 1.8 3.9 0 7-1.8 7-1.8 3.1-1.8 4.9-5.2 4.9-5.2 1.8-3.4 1.8-7.8 1.8-7.8 0-4.5-1.8-7.8-1.8-7.8-1.8-3.2-4.9-5.1-4.9-5.1zm1.5 19.3c-1.2 2.6-3.4 4-3.4 4-2.2 1.4-5.1 1.4-5.1 1.4-2.8 0-5-1.4-5-1.4-2.2-1.4-3.5-4-3.5-4-1.2-2.6-1.2-6.1-1.2-6.1 0-3.6 1.2-6.3 1.2-6.3 1.2-2.6 3.4-4 3.4-4 2.2-1.4 5.1-1.4 5.1-1.4 2.9 0 5.1 1.4 5.1 1.4 2.2 1.4 3.4 4 3.4 4 1.2 2.6 1.2 6.2 1.2 6.2.1 3.6-1.2 6.2-1.2 6.2z"/><path d="m338.5 41.9c3.1 1.8 7 1.8 7 1.8 3.9 0 7-1.8 7-1.8 3.1-1.8 4.9-5.2 4.9-5.2 1.8-3.4 1.8-7.8 1.8-7.8 0-4.5-1.8-7.8-1.8-7.8-1.8-3.3-4.9-5.2-4.9-5.2-3.1-1.8-7-1.8-7-1.8-3.9 0-7 1.8-7 1.8-3.1 1.8-4.9 5.2-4.9 5.2-1.8 3.4-1.8 7.8-1.8 7.8 0 4.3 1.8 7.7 1.8 7.7 1.8 3.4 4.9 5.3 4.9 5.3zm-1.5-19.1c1.2-2.6 3.4-4 3.4-4 2.2-1.4 5.1-1.4 5.1-1.4 2.9 0 5.1 1.4 5.1 1.4 2.2 1.4 3.4 4 3.4 4 1.2 2.6 1.2 6.2 1.2 6.2 0 3.6-1.3 6.2-1.3 6.2-1.2 2.6-3.4 4-3.4 4-2.2 1.4-5.1 1.4-5.1 1.4-2.8 0-5-1.4-5-1.4-2.2-1.4-3.5-4-3.5-4-1.2-2.6-1.2-6.1-1.2-6.1.1-3.7 1.3-6.3 1.3-6.3z"/><path d="m310 29.8h14.1v13.5h3.8v-28.7h-3.8v11.8h-14.1v-11.8h-3.8v28.7h3.8z"/><path d="m481 78.4c-2.3-1.1-6.1-2-6.1-2-2.8-.6-4.3-1.1-4.3-1.1-1.5-.6-2.2-1.4-2.2-1.4-.7-.8-.7-2.2-.7-2.2 0-1.4.8-2.4.8-2.4.8-1 2.2-1.5 2.2-1.5 1.4-.6 3.3-.6 3.3-.6 2.8 0 4.5 1.4 4.5 1.4 1.7 1.3 2.3 4.4 2.3 4.4h.1l3.7-.8c-.4-2.6-1.7-4.4-1.7-4.4-1.4-1.8-3.6-2.8-3.6-2.8-2.3-1-5.2-1-5.2-1-2.8 0-5 1-5 1-2.2 1-3.5 2.8-3.5 2.8-1.3 1.7-1.3 3.9-1.3 3.9 0 2 .6 3.4.6 3.4.6 1.4 2.3 2.6 2.3 2.6 1.7 1.1 4.7 1.9 4.7 1.9.6.2 2.3.6 2.3.6 2.8.6 4.2 1.1 4.2 1.1 1.8.6 2.6 1.6 2.6 1.6.9 1 .9 2.8.9 2.8 0 1.3-1 2.4-1 2.4-.9 1.1-2.5 1.7-2.5 1.7-1.6.6-3.5.6-3.5.6-3.6 0-5.6-1.8-5.6-1.8-2-1.8-2.4-5.3-2.4-5.3l-3.8.9c.7 4.6 3.8 7 3.8 7 3.1 2.4 8.2 2.4 8.2 2.4 3 0 5.4-1.1 5.4-1.1 2.4-1.1 3.7-3.1 3.7-3.1 1.4-2 1.4-4.4 1.4-4.4 0-2.4-1-4-1-4-1.4-1.6-3.6-2.6-3.6-2.6z"/><path d="m682.7 182.9v-3.4h-18.1v28.6h3.8v-13h12.8v-3.3h-12.8v-8.9z"/><path d="m495.9 41.9c3.1 1.8 7 1.8 7 1.8 3.9 0 7-1.8 7-1.8 3.1-1.8 4.9-5.2 4.9-5.2 1.8-3.4 1.8-7.8 1.8-7.8 0-4.5-1.8-7.8-1.8-7.8-1.8-3.3-4.9-5.2-4.9-5.2-3.1-1.8-7-1.8-7-1.8-3.9 0-7 1.8-7 1.8-3.1 1.8-4.9 5.2-4.9 5.2-1.8 3.4-1.8 7.8-1.8 7.8 0 4.3 1.8 7.7 1.8 7.7 1.8 3.4 4.9 5.3 4.9 5.3zm-1.5-19.1c1.2-2.6 3.4-4 3.4-4 2.2-1.4 5.1-1.4 5.1-1.4 2.9 0 5.1 1.4 5.1 1.4 2.2 1.4 3.4 4 3.4 4 1.2 2.6 1.2 6.2 1.2 6.2 0 3.6-1.2 6.2-1.2 6.2-1.3 2.6-3.5 4-3.5 4-2.2 1.4-5.1 1.4-5.1 1.4-2.8 0-5-1.4-5-1.4-2.2-1.4-3.5-4-3.5-4-1.2-2.6-1.2-6.1-1.2-6.1 0-3.7 1.3-6.3 1.3-6.3z"/><path d="m438.3 41.9c3.1 1.8 7 1.8 7 1.8 3.9 0 7-1.8 7-1.8 3.1-1.8 4.9-5.2 4.9-5.2 1.8-3.3 1.8-7.7 1.8-7.7 0-4.5-1.8-7.8-1.8-7.8-1.8-3.3-4.9-5.2-4.9-5.2-3.1-1.8-7-1.8-7-1.8-3.9 0-7 1.8-7 1.8-3.1 1.8-4.9 5.2-4.9 5.2-1.8 3.4-1.8 7.8-1.8 7.8 0 4.3 1.8 7.7 1.8 7.7 1.8 3.3 4.9 5.2 4.9 5.2zm-1.5-19.1c1.2-2.6 3.4-4 3.4-4 2.2-1.4 5.1-1.4 5.1-1.4 2.9 0 5.1 1.4 5.1 1.4 2.2 1.4 3.4 4 3.4 4 1.2 2.6 1.2 6.2 1.2 6.2 0 3.6-1.2 6.2-1.2 6.2-1.3 2.6-3.5 4-3.5 4-2.2 1.4-5.1 1.4-5.1 1.4-2.8 0-5-1.4-5-1.4-2.2-1.4-3.5-4-3.5-4-1.2-2.6-1.2-6.1-1.2-6.1 0-3.7 1.3-6.3 1.3-6.3z"/></svg>
\ No newline at end of file
diff --git a/static/images/CPA.png b/static/images/CPA.png
index 293f19c7..4b7ec066 100644
Binary files a/static/images/CPA.png and b/static/images/CPA.png differ
diff --git a/static/images/CPA.svg b/static/images/CPA.svg
index 12b0cf05..d34bcd44 100644
--- a/static/images/CPA.svg
+++ b/static/images/CPA.svg
@@ -1,96 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="537.761px" height="390.104px" viewBox="0 0 537.761 390.104" enable-background="new 0 0 537.761 390.104"
-	 xml:space="preserve">
-<g>
-	<rect x="139.969" y="263.16" transform="matrix(0.4996 0.8663 -0.8663 0.4996 318.3788 20.8207)" width="2.4" height="45.628"/>
-	<rect x="239.735" y="263.16" transform="matrix(-0.4996 -0.8663 0.8663 -0.4996 113.5642 637.553)" width="2.4" height="45.628"/>
-	<path d="M376.871,118.29l-6.734-53.039l25.327-22.804l-1.606-1.783l-24.692,22.233l-8.752-2.842l28.113-25.313l-1.606-1.783
-		l-29.143,26.24l-48.438-15.727l-0.742,2.282l48.656,15.798l16.988,56.422l-51.956,16.881l4.659-55.902h-12l4.618,55.417
-		l-47.902-27.656l-0.599-0.346l-0.599,0.346l-49.883,28.8l-0.601,0.345v0.694v2l0,0l0,54.907l-47.301,27.309l4.618-55.416h-12
-		l4.618,55.416l-47.219-27.262l4.718-36.995h-12l4.514,35.396l-47.797-27.596l-1.8-1.041v2.081v2l0,0l0,53.2l-29.24-22.103
-		l-6,10.392l35.24,14.896v50.136l-34.213,19.753l1.199,2.079l33.014-19.061v1.907v2l-0.001,0.693l0.602,0.347l3.383,1.953
-		l-33.013,19.06l1.199,2.079l34.214-19.753l42.368,24.461l0,0l1.732,1l0.599,0.346l0.599-0.346l1.732-1l0,0l47.552-27.454
-		l48.683,28.107v35.175h2.4v-35.175l47.55-27.453l0,0l1.732-1l0.601-0.345v-0.694v-2v-54.907l48.82-28.187l54.272,17.634
-		l0.828,0.271l0.514-0.706l1.176-1.618l0,0l32.681-44.981l0.513-0.706l-0.513-0.706L376.871,118.29z M322.143,193.281v-55.856
-		l53.123-17.26l32.169,44.277l0,0l0.663,0.912l-0.663,0.912l0,0l-32.169,44.277L322.143,193.281z M269.574,220.709l-47.197-27.249
-		l0-56.214l47.551-27.453l0,0l1.133-0.654l1.133,0.654l0,0l47.55,27.453v56.214l-47.197,27.249l4.514-35.396h-12L269.574,220.709z
-		 M72.728,220.875l0-53.443l46.283,26.722L72.728,220.875z M72.728,223.646l48.683-28.107l48.683,28.107v56.214l-48.683,28.107
-		L73.86,280.514l0,0l-1.131-0.653v-1.307V223.646z M269.86,279.86l-1.132,0.653l0,0l-47.552,27.454l-48.683-28.107v-56.214
-		l48.683-28.107l48.683,28.107v54.907V279.86z"/>
-	<polygon points="380.571,116.506 382.563,115.132 380.041,112.332 378.467,114.17 	"/>
-	<polygon points="388.539,111.011 390.531,109.637 386.339,104.983 384.764,106.82 	"/>
-	<polygon points="406.467,98.646 398.935,90.284 397.36,92.122 404.475,100.02 	"/>
-	<polygon points="391.062,99.471 396.507,105.515 398.499,104.141 392.637,97.634 	"/>
-	<polygon points="225.255,215.853 217.1,215.853 216.782,218.253 225.573,218.253 	"/>
-	<polygon points="223.982,206.253 218.373,206.253 218.055,208.653 224.3,208.653 	"/>
-	<polygon points="222.709,196.653 219.646,196.653 219.328,199.053 223.027,199.053 	"/>
-	<polygon points="226.528,225.453 215.827,225.453 215.509,227.853 226.846,227.853 	"/>
-	<polygon points="319.412,196.653 319.094,199.053 322.793,199.053 322.475,196.653 	"/>
-	<polygon points="316.548,218.253 325.339,218.253 325.021,215.853 316.866,215.853 	"/>
-	<polygon points="317.821,208.653 324.066,208.653 323.748,206.253 318.139,206.253 	"/>
-	<polygon points="315.275,227.853 326.612,227.853 326.294,225.453 315.593,225.453 	"/>
-	<polygon points="503.419,76.263 475.296,101.584 474.484,97.761 474.34,97.084 473.681,96.87 471.779,96.252 471.779,96.252 
-		469.965,95.663 498.087,70.341 496.481,68.558 467.329,94.806 437.794,85.21 437.051,87.492 472.28,98.939 472.552,100.218 
-		472.552,100.218 484.112,154.603 486.46,154.102 475.873,104.295 505.025,78.046 	"/>
-	<path d="M428.029,68.712c-1.147-1.267-2.527-2.227-4.14-2.88c-1.613-0.653-3.393-0.98-5.34-0.98c-1.92,0-3.687,0.333-5.3,1
-		c-1.613,0.667-3,1.64-4.16,2.92c-1.16,1.28-2.067,2.853-2.72,4.72c-0.653,1.867-0.98,4-0.98,6.4s0.32,4.533,0.96,6.4
-		c0.64,1.867,1.54,3.433,2.7,4.7c1.16,1.267,2.547,2.227,4.16,2.88s3.393,0.98,5.34,0.98c1.973,0,3.767-0.333,5.38-1
-		c1.613-0.667,2.993-1.64,4.14-2.92s2.033-2.86,2.66-4.74c0.627-1.88,0.94-4.02,0.94-6.42s-0.32-4.527-0.96-6.38
-		C430.069,71.539,429.176,69.979,428.029,68.712z M427.229,84.712c-0.4,1.453-0.987,2.693-1.76,3.72
-		c-0.773,1.027-1.74,1.82-2.9,2.38c-1.16,0.56-2.5,0.84-4.02,0.84c-1.573,0-2.94-0.28-4.1-0.84c-1.16-0.56-2.127-1.353-2.9-2.38
-		c-0.773-1.027-1.353-2.267-1.74-3.72c-0.387-1.453-0.58-3.073-0.58-4.86c0-1.76,0.193-3.367,0.58-4.82
-		c0.387-1.453,0.973-2.7,1.76-3.74s1.76-1.84,2.92-2.4c1.16-0.56,2.513-0.84,4.06-0.84c1.52,0,2.853,0.28,4,0.84
-		c1.147,0.56,2.113,1.36,2.9,2.4c0.787,1.04,1.38,2.287,1.78,3.74s0.6,3.06,0.6,4.82C427.829,81.639,427.629,83.259,427.229,84.712z
-		"/>
-	<path d="M31.145,297.853c-1.146-1.267-2.526-2.227-4.14-2.88c-1.613-0.653-3.393-0.98-5.34-0.98c-1.92,0-3.687,0.333-5.3,1
-		c-1.613,0.667-3,1.64-4.16,2.92c-1.16,1.28-2.067,2.853-2.72,4.72c-0.653,1.867-0.98,4-0.98,6.4c0,2.4,0.32,4.533,0.96,6.4
-		s1.54,3.433,2.7,4.7c1.16,1.267,2.547,2.227,4.16,2.88c1.613,0.653,3.393,0.98,5.34,0.98c1.974,0,3.767-0.333,5.38-1
-		c1.613-0.667,2.993-1.64,4.14-2.92c1.147-1.28,2.033-2.86,2.66-4.74c0.627-1.88,0.94-4.02,0.94-6.42c0-2.4-0.32-4.527-0.96-6.38
-		C33.185,300.68,32.292,299.12,31.145,297.853z M30.345,313.853c-0.4,1.453-0.987,2.693-1.76,3.72c-0.773,1.027-1.74,1.82-2.9,2.38
-		c-1.16,0.56-2.5,0.84-4.02,0.84c-1.573,0-2.94-0.28-4.1-0.84c-1.16-0.56-2.127-1.353-2.9-2.38c-0.773-1.027-1.353-2.267-1.74-3.72
-		c-0.387-1.453-0.58-3.073-0.58-4.86c0-1.76,0.193-3.367,0.58-4.82c0.387-1.453,0.973-2.7,1.76-3.74c0.787-1.04,1.76-1.84,2.92-2.4
-		c1.16-0.56,2.513-0.84,4.06-0.84c1.52,0,2.853,0.28,4,0.84c1.147,0.56,2.113,1.36,2.9,2.4c0.787,1.04,1.38,2.287,1.78,3.74
-		c0.4,1.453,0.6,3.06,0.6,4.82C30.945,310.78,30.745,312.4,30.345,313.853z"/>
-	<polygon points="228.397,265.313 232.077,265.313 232.077,236.753 228.397,236.753 228.397,248.833 213.957,248.833 
-		213.957,236.753 210.277,236.753 210.277,265.313 213.957,265.313 213.957,252.273 228.397,252.273 	"/>
-	<polygon points="328.163,248.833 313.723,248.833 313.723,236.753 310.043,236.753 310.043,265.313 313.723,265.313 
-		313.723,252.273 328.163,252.273 328.163,265.313 331.843,265.313 331.843,236.753 328.163,236.753 	"/>
-	<path d="M397.074,34.651c1.16,1.267,2.547,2.227,4.16,2.88c1.613,0.653,3.393,0.98,5.34,0.98c1.973,0,3.767-0.333,5.38-1
-		c1.613-0.667,2.993-1.64,4.14-2.92c1.147-1.28,2.033-2.86,2.66-4.74c0.627-1.88,0.94-4.02,0.94-6.42s-0.32-4.527-0.96-6.38
-		c-0.64-1.853-1.533-3.413-2.68-4.68s-2.527-2.227-4.14-2.88c-1.613-0.653-3.393-0.98-5.34-0.98c-1.92,0-3.687,0.333-5.3,1
-		c-1.613,0.667-3,1.64-4.16,2.92c-1.16,1.28-2.067,2.853-2.72,4.72c-0.653,1.867-0.98,4-0.98,6.4s0.32,4.533,0.96,6.4
-		C395.014,31.817,395.914,33.384,397.074,34.651z M397.834,18.691c0.387-1.453,0.973-2.7,1.76-3.74c0.787-1.04,1.76-1.84,2.92-2.4
-		c1.16-0.56,2.513-0.84,4.06-0.84c1.52,0,2.853,0.28,4,0.84c1.147,0.56,2.113,1.36,2.9,2.4c0.787,1.04,1.38,2.286,1.78,3.74
-		c0.4,1.453,0.6,3.06,0.6,4.82c0,1.787-0.2,3.407-0.6,4.86c-0.4,1.453-0.987,2.693-1.76,3.72c-0.773,1.027-1.74,1.82-2.9,2.38
-		c-1.16,0.56-2.5,0.84-4.02,0.84c-1.573,0-2.94-0.28-4.1-0.84c-1.16-0.56-2.127-1.353-2.9-2.38c-0.773-1.027-1.353-2.267-1.74-3.72
-		c-0.387-1.453-0.58-3.073-0.58-4.86C397.254,21.751,397.447,20.144,397.834,18.691z"/>
-	<path d="M528.295,52.649c-0.64-1.853-1.533-3.413-2.68-4.68c-1.147-1.266-2.527-2.227-4.14-2.88c-1.613-0.653-3.393-0.98-5.34-0.98
-		c-1.92,0-3.687,0.333-5.3,1c-1.613,0.667-3,1.64-4.16,2.92c-1.16,1.28-2.067,2.853-2.72,4.72c-0.653,1.867-0.98,4-0.98,6.4
-		s0.32,4.533,0.96,6.4c0.64,1.867,1.54,3.433,2.7,4.7c1.16,1.267,2.547,2.227,4.16,2.88c1.613,0.653,3.393,0.98,5.34,0.98
-		c1.973,0,3.767-0.333,5.38-1c1.613-0.667,2.993-1.64,4.14-2.92s2.033-2.86,2.66-4.74c0.627-1.88,0.94-4.02,0.94-6.42
-		S528.935,54.503,528.295,52.649z M524.816,63.97c-0.4,1.453-0.987,2.693-1.76,3.72s-1.74,1.82-2.9,2.38s-2.5,0.84-4.02,0.84
-		c-1.573,0-2.94-0.28-4.1-0.84c-1.16-0.56-2.127-1.353-2.9-2.38c-0.773-1.027-1.353-2.267-1.74-3.72
-		c-0.387-1.453-0.58-3.073-0.58-4.86c0-1.76,0.193-3.367,0.58-4.82c0.387-1.453,0.973-2.7,1.76-3.74c0.787-1.04,1.76-1.84,2.92-2.4
-		c1.16-0.56,2.513-0.84,4.06-0.84c1.52,0,2.853,0.28,4,0.84c1.147,0.56,2.113,1.36,2.9,2.4c0.787,1.04,1.38,2.287,1.78,3.74
-		c0.4,1.453,0.6,3.06,0.6,4.82C525.415,60.896,525.216,62.516,524.816,63.97z"/>
-	<path d="M224.977,374.273c-0.347,0.853-0.82,1.587-1.42,2.2c-0.6,0.613-1.36,1.087-2.28,1.42c-0.92,0.333-2.033,0.5-3.34,0.5
-		c-1.44,0-2.713-0.28-3.82-0.84c-1.107-0.56-2.04-1.36-2.8-2.4c-0.76-1.04-1.34-2.287-1.74-3.74c-0.4-1.453-0.6-3.06-0.6-4.82
-		s0.2-3.367,0.6-4.82c0.4-1.453,0.98-2.693,1.74-3.72c0.76-1.027,1.693-1.827,2.8-2.4c1.107-0.573,2.367-0.86,3.78-0.86
-		c1.2,0,2.22,0.153,3.06,0.46c0.84,0.307,1.56,0.753,2.16,1.34c0.6,0.587,1.093,1.3,1.48,2.14c0.387,0.84,0.7,1.78,0.94,2.82
-		l3.6-0.6c-0.293-1.387-0.713-2.653-1.26-3.8c-0.547-1.147-1.267-2.133-2.16-2.96c-0.893-0.827-1.98-1.467-3.26-1.92
-		c-1.28-0.453-2.8-0.68-4.56-0.68c-1.813,0-3.5,0.333-5.06,1c-1.56,0.667-2.913,1.64-4.06,2.92c-1.147,1.28-2.04,2.853-2.68,4.72
-		c-0.64,1.867-0.96,4-0.96,6.4c0,2.373,0.3,4.487,0.9,6.34c0.6,1.853,1.447,3.42,2.54,4.7c1.093,1.28,2.427,2.253,4,2.92
-		c1.573,0.667,3.347,1,5.32,1c1.813,0,3.407-0.253,4.78-0.76c1.373-0.507,2.54-1.213,3.5-2.12c0.96-0.907,1.72-1.98,2.28-3.22
-		c0.56-1.24,0.92-2.58,1.08-4.02h-3.8C225.577,372.487,225.324,373.42,224.977,374.273z"/>
-	<rect x="233.737" y="352.313" width="3.48" height="28.56"/>
-	<polygon points="14.425,194.673 28.865,194.673 28.865,207.713 32.545,207.713 32.545,179.153 28.865,179.153 28.865,191.233 
-		14.425,191.233 14.425,179.153 10.745,179.153 10.745,207.713 14.425,207.713 	"/>
-	<polygon points="114.191,137.073 128.631,137.073 128.631,150.113 132.311,150.113 132.311,121.553 128.631,121.553 
-		128.631,133.633 114.191,133.633 114.191,121.553 110.511,121.553 110.511,150.113 114.191,150.113 	"/>
-	<polygon points="278.28,178.913 281.96,178.913 281.96,150.353 278.28,150.353 278.28,162.433 263.84,162.433 263.84,150.353 
-		260.16,150.353 260.16,178.913 263.84,178.913 263.84,165.873 278.28,165.873 	"/>
-</g>
-</svg>
+<svg enable-background="new 0 0 537.761 390.104" height="390.104" viewBox="0 0 537.761 390.104" width="537.761" xmlns="http://www.w3.org/2000/svg"><path d="m139.969 263.16h2.4v45.628h-2.4z" transform="matrix(.4996 .8663 -.8663 .4996 318.3788 20.8207)"/><path d="m239.735 263.16h2.4v45.628h-2.4z" transform="matrix(-.4996 -.8663 .8663 -.4996 113.5642 637.553)"/><path d="m376.871 118.29-6.734-53.039 25.327-22.804-1.606-1.783-24.692 22.233-8.752-2.842 28.113-25.313-1.606-1.783-29.143 26.24-48.438-15.727-.742 2.282 48.656 15.798 16.988 56.422-51.956 16.881 4.659-55.902h-12l4.618 55.417-47.902-27.656-.599-.346-.599.346-49.883 28.8-.601.345v.694 2 54.907l-47.301 27.309 4.618-55.416h-12l4.618 55.416-47.219-27.262 4.718-36.995h-12l4.514 35.396-47.797-27.596-1.8-1.041v2.081 2 53.2l-29.24-22.103-6 10.392 35.24 14.896v50.136l-34.213 19.753 1.199 2.079 33.014-19.061v1.907 2l-.001.693.602.347 3.383 1.953-33.013 19.06 1.199 2.079 34.214-19.753 42.368 24.461 1.732 1 .599.346.599-.346 1.732-1 47.552-27.454 48.683 28.107v35.175h2.4v-35.175l47.55-27.453 1.732-1 .601-.345v-.694-2-54.907l48.82-28.187 54.272 17.634.828.271.514-.706 1.176-1.618 32.681-44.981.513-.706-.513-.706zm-54.728 74.991v-55.856l53.123-17.26 32.169 44.277.663.912-.663.912-32.169 44.277zm-52.569 27.428-47.197-27.249v-56.214l47.551-27.453 1.133-.654 1.133.654 47.55 27.453v56.214l-47.197 27.249 4.514-35.396h-12zm-196.846.166v-53.443l46.283 26.722zm0 2.771 48.683-28.107 48.683 28.107v56.214l-48.683 28.107-47.551-27.453-1.131-.653v-1.307-54.908zm197.132 56.214-1.132.653-47.552 27.454-48.683-28.107v-56.214l48.683-28.107 48.683 28.107v54.907 1.307z"/><path d="m380.571 116.506 1.992-1.374-2.522-2.8-1.574 1.838z"/><path d="m388.539 111.011 1.992-1.374-4.192-4.654-1.575 1.837z"/><path d="m406.467 98.646-7.532-8.362-1.575 1.838 7.115 7.898z"/><path d="m391.062 99.471 5.445 6.044 1.992-1.374-5.862-6.507z"/><path d="m225.255 215.853h-8.155l-.318 2.4h8.791z"/><path d="m223.982 206.253h-5.609l-.318 2.4h6.245z"/><path d="m222.709 196.653h-3.063l-.318 2.4h3.699z"/><path d="m226.528 225.453h-10.701l-.318 2.4h11.337z"/><path d="m319.412 196.653-.318 2.4h3.699l-.318-2.4z"/><path d="m316.548 218.253h8.791l-.318-2.4h-8.155z"/><path d="m317.821 208.653h6.245l-.318-2.4h-5.609z"/><path d="m315.275 227.853h11.337l-.318-2.4h-10.701z"/><path d="m503.419 76.263-28.123 25.321-.812-3.823-.144-.677-.659-.214-1.902-.618-1.814-.589 28.122-25.322-1.606-1.783-29.152 26.248-29.535-9.596-.743 2.282 35.229 11.447.272 1.279 11.56 54.385 2.348-.501-10.587-49.807 29.152-26.249z"/><path d="m428.029 68.712c-1.147-1.267-2.527-2.227-4.14-2.88s-3.393-.98-5.34-.98c-1.92 0-3.687.333-5.3 1s-3 1.64-4.16 2.92-2.067 2.853-2.72 4.72-.98 4-.98 6.4.32 4.533.96 6.4 1.54 3.433 2.7 4.7 2.547 2.227 4.16 2.88 3.393.98 5.34.98c1.973 0 3.767-.333 5.38-1s2.993-1.64 4.14-2.92 2.033-2.86 2.66-4.74.94-4.02.94-6.42-.32-4.527-.96-6.38-1.533-3.413-2.68-4.68zm-.8 16c-.4 1.453-.987 2.693-1.76 3.72s-1.74 1.82-2.9 2.38-2.5.84-4.02.84c-1.573 0-2.94-.28-4.1-.84s-2.127-1.353-2.9-2.38-1.353-2.267-1.74-3.72-.58-3.073-.58-4.86c0-1.76.193-3.367.58-4.82s.973-2.7 1.76-3.74 1.76-1.84 2.92-2.4 2.513-.84 4.06-.84c1.52 0 2.853.28 4 .84s2.113 1.36 2.9 2.4 1.38 2.287 1.78 3.74.6 3.06.6 4.82c0 1.787-.2 3.407-.6 4.86z"/><path d="m31.145 297.853c-1.146-1.267-2.526-2.227-4.14-2.88-1.613-.653-3.393-.98-5.34-.98-1.92 0-3.687.333-5.3 1s-3 1.64-4.16 2.92-2.067 2.853-2.72 4.72-.98 4-.98 6.4.32 4.533.96 6.4 1.54 3.433 2.7 4.7 2.547 2.227 4.16 2.88 3.393.98 5.34.98c1.974 0 3.767-.333 5.38-1s2.993-1.64 4.14-2.92 2.033-2.86 2.66-4.74.94-4.02.94-6.42-.32-4.527-.96-6.38-1.533-3.413-2.68-4.68zm-.8 16c-.4 1.453-.987 2.693-1.76 3.72s-1.74 1.82-2.9 2.38-2.5.84-4.02.84c-1.573 0-2.94-.28-4.1-.84s-2.127-1.353-2.9-2.38-1.353-2.267-1.74-3.72-.58-3.073-.58-4.86c0-1.76.193-3.367.58-4.82s.973-2.7 1.76-3.74 1.76-1.84 2.92-2.4 2.513-.84 4.06-.84c1.52 0 2.853.28 4 .84s2.113 1.36 2.9 2.4 1.38 2.287 1.78 3.74.6 3.06.6 4.82c0 1.787-.2 3.407-.6 4.86z"/><path d="m228.397 265.313h3.68v-28.56h-3.68v12.08h-14.44v-12.08h-3.68v28.56h3.68v-13.04h14.44z"/><path d="m328.163 248.833h-14.44v-12.08h-3.68v28.56h3.68v-13.04h14.44v13.04h3.68v-28.56h-3.68z"/><path d="m397.074 34.651c1.16 1.267 2.547 2.227 4.16 2.88s3.393.98 5.34.98c1.973 0 3.767-.333 5.38-1s2.993-1.64 4.14-2.92 2.033-2.86 2.66-4.74.94-4.02.94-6.42-.32-4.527-.96-6.38-1.533-3.413-2.68-4.68-2.527-2.227-4.14-2.88-3.393-.98-5.34-.98c-1.92 0-3.687.333-5.3 1s-3 1.64-4.16 2.92-2.067 2.853-2.72 4.72-.98 4-.98 6.4.32 4.533.96 6.4c.64 1.866 1.54 3.433 2.7 4.7zm.76-15.96c.387-1.453.973-2.7 1.76-3.74s1.76-1.84 2.92-2.4 2.513-.84 4.06-.84c1.52 0 2.853.28 4 .84s2.113 1.36 2.9 2.4 1.38 2.286 1.78 3.74c.4 1.453.6 3.06.6 4.82 0 1.787-.2 3.407-.6 4.86s-.987 2.693-1.76 3.72-1.74 1.82-2.9 2.38-2.5.84-4.02.84c-1.573 0-2.94-.28-4.1-.84s-2.127-1.353-2.9-2.38-1.353-2.267-1.74-3.72-.58-3.073-.58-4.86c0-1.76.193-3.367.58-4.82z"/><path d="m528.295 52.649c-.64-1.853-1.533-3.413-2.68-4.68-1.147-1.266-2.527-2.227-4.14-2.88s-3.393-.98-5.34-.98c-1.92 0-3.687.333-5.3 1s-3 1.64-4.16 2.92-2.067 2.853-2.72 4.72-.98 4-.98 6.4.32 4.533.96 6.4 1.54 3.433 2.7 4.7 2.547 2.227 4.16 2.88 3.393.98 5.34.98c1.973 0 3.767-.333 5.38-1s2.993-1.64 4.14-2.92 2.033-2.86 2.66-4.74.94-4.02.94-6.42-.32-4.526-.96-6.38zm-3.479 11.321c-.4 1.453-.987 2.693-1.76 3.72s-1.74 1.82-2.9 2.38-2.5.84-4.02.84c-1.573 0-2.94-.28-4.1-.84s-2.127-1.353-2.9-2.38-1.353-2.267-1.74-3.72-.58-3.073-.58-4.86c0-1.76.193-3.367.58-4.82s.973-2.7 1.76-3.74 1.76-1.84 2.92-2.4 2.513-.84 4.06-.84c1.52 0 2.853.28 4 .84s2.113 1.36 2.9 2.4 1.38 2.287 1.78 3.74.6 3.06.6 4.82c-.001 1.786-.2 3.406-.6 4.86z"/><path d="m224.977 374.273c-.347.853-.82 1.587-1.42 2.2s-1.36 1.087-2.28 1.42-2.033.5-3.34.5c-1.44 0-2.713-.28-3.82-.84s-2.04-1.36-2.8-2.4-1.34-2.287-1.74-3.74-.6-3.06-.6-4.82.2-3.367.6-4.82.98-2.693 1.74-3.72 1.693-1.827 2.8-2.4 2.367-.86 3.78-.86c1.2 0 2.22.153 3.06.46s1.56.753 2.16 1.34 1.093 1.3 1.48 2.14.7 1.78.94 2.82l3.6-.6c-.293-1.387-.713-2.653-1.26-3.8s-1.267-2.133-2.16-2.96-1.98-1.467-3.26-1.92-2.8-.68-4.56-.68c-1.813 0-3.5.333-5.06 1s-2.913 1.64-4.06 2.92-2.04 2.853-2.68 4.72-.96 4-.96 6.4c0 2.373.3 4.487.9 6.34s1.447 3.42 2.54 4.7 2.427 2.253 4 2.92 3.347 1 5.32 1c1.813 0 3.407-.253 4.78-.76s2.54-1.213 3.5-2.12 1.72-1.98 2.28-3.22.92-2.58 1.08-4.02h-3.8c-.16 1.014-.413 1.947-.76 2.8z"/><path d="m233.737 352.313h3.48v28.56h-3.48z"/><path d="m14.425 194.673h14.44v13.04h3.68v-28.56h-3.68v12.08h-14.44v-12.08h-3.68v28.56h3.68z"/><path d="m114.191 137.073h14.44v13.04h3.68v-28.56h-3.68v12.08h-14.44v-12.08h-3.68v28.56h3.68z"/><path d="m278.28 178.913h3.68v-28.56h-3.68v12.08h-14.44v-12.08h-3.68v28.56h3.68v-13.04h14.44z"/></svg>
\ No newline at end of file
diff --git a/static/images/Estradiol.svg b/static/images/Estradiol.svg
index a6c078a3..3ef1cd46 100644
--- a/static/images/Estradiol.svg
+++ b/static/images/Estradiol.svg
@@ -1,46 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 479 303.3" style="enable-background:new 0 0 479 303.3;" xml:space="preserve">
-<g>
-	<rect x="171.9" y="160" transform="matrix(0.5 -0.866 0.866 0.5 -71.7511 241.2854)" width="2.4" height="45.6"/>
-	<rect x="112.6" y="194.2" width="2.4" height="45.6"/>
-	<rect x="150.3" y="250" transform="matrix(0.8663 -0.4996 0.4996 0.8663 -102.3568 120.0606)" width="45.6" height="2.4"/>
-	<polygon points="259.8,190.8 246.4,190.8 245.9,193.2 260.2,193.2 	"/>
-	<polygon points="258.1,181.2 248.1,181.2 247.6,183.6 258.5,183.6 	"/>
-	<polygon points="254.7,162 251.4,162 251,164.4 255.2,164.4 	"/>
-	<polygon points="256.4,171.6 249.7,171.6 249.3,174 256.9,174 	"/>
-	<polygon points="347.4,183.6 358.3,183.6 357.9,181.2 347.8,181.2 	"/>
-	<polygon points="351.2,162 350.8,164.4 354.9,164.4 354.5,162 	"/>
-	<polygon points="349.1,174 356.6,174 356.2,171.6 349.5,171.6 	"/>
-	<polygon points="345.7,193.2 360,193.2 359.6,190.8 346.1,190.8 	"/>
-	<path d="M60.6,261.4c-2.1-1.2-4.4-1.8-7-1.8s-5,0.6-7,1.8c-2.1,1.2-3.7,3-4.9,5.2c-1.2,2.3-1.8,4.9-1.8,7.8c0,2.9,0.6,5.5,1.8,7.7
-		s2.8,4,4.9,5.2s4.4,1.9,7.1,1.9c2.6,0,4.9-0.6,7-1.8c2.1-1.2,3.7-2.9,4.9-5.2s1.8-4.8,1.8-7.8c0-3-0.6-5.6-1.8-7.8
-		S62.7,262.6,60.6,261.4z M62.1,280.6c-0.8,1.7-2,3.1-3.5,4c-1.5,0.9-3.2,1.4-5.1,1.4c-1.9,0-3.6-0.5-5-1.4c-1.5-0.9-2.6-2.2-3.5-4
-		c-0.8-1.7-1.2-3.8-1.2-6.1c0-2.4,0.4-4.5,1.2-6.3s2-3.1,3.4-4s3.2-1.4,5.1-1.4c1.9,0,3.6,0.5,5.1,1.4s2.6,2.3,3.4,4
-		s1.2,3.8,1.2,6.2C63.3,276.8,62.9,278.9,62.1,280.6z"/>
-	<polygon points="32.1,271.8 18,271.8 18,260 14.2,260 14.2,288.7 18,288.7 18,275.2 32.1,275.2 32.1,288.7 35.9,288.7 35.9,260 
-		32.1,260 	"/>
-	<polygon points="260.1,214 246.1,214 246.1,202.2 242.3,202.2 242.3,230.8 246.1,230.8 246.1,217.4 260.1,217.4 260.1,230.8 
-		263.9,230.8 263.9,202.2 260.1,202.2 	"/>
-	<polygon points="295.9,131 310,131 310,144.4 313.8,144.4 313.8,115.8 310,115.8 310,127.6 295.9,127.6 295.9,115.8 292.1,115.8 
-		292.1,144.4 295.9,144.4 	"/>
-	<polygon points="359.9,214 345.8,214 345.8,202.2 342,202.2 342,230.8 345.8,230.8 345.8,217.4 359.9,217.4 359.9,230.8 
-		363.7,230.8 363.7,202.2 359.9,202.2 	"/>
-	<path d="M441.3,128.3L441.3,128.3L409,83.9l17.1-32.1l-14.5-4.7l-5.1,36l-52.3,17l6.2-55.9h-15.2l6.2,55.4L305.3,73l0,0l-1.7-1
-		l-0.6-0.3l-0.6,0.3l-48.2,27.8l0,0l-1.7,1l-0.6,0.3v0.7v2v54.9l-48.7,28.1l-47.6-27.5l0,0l-1.7-1l-0.6-0.3l-0.6,0.3l-1.7,1l0,0
-		l-48.2,27.8l-0.6,0.3v0.7v2v54.9l-31.3,18.1l1.2,2.1l31.3-18.1l47.6,27.5l0,0l1.7,1l0.6,0.3l0.6-0.3l1.7-1l0,0l47.6-27.5l49.3,28.5
-		l0.6,0.3l0.6-0.3l1.7-1l0,0l48.2-27.8l0.6-0.3v-0.7v-2v-54.9l48.8-28.2l54.3,17.6l0.8,0.3l0.5-0.7l1.2-1.6l0,0l31.5-43.4l0,0
-		l1.2-1.6l0.5-0.7l-0.5-0.7L441.3,128.3z M440,130.6l-32.8,45.2l-53.1-17.3v-55.9l53.1-17.3l32.2,44.3l0,0L440,130.6z M352.9,159.4
-		L352.9,159.4L352.9,159.4L352.9,159.4z M254.3,102.5l1.1-0.7l0,0L303,74.4l48.7,28.1v56.2l-47.1,27.2l6-35.1h-15.2l6,35.1
-		l-47.1-27.2v-54.9V102.5z M104.6,188.9l48.7-28.1l48.7,28.1v56.2l-48.7,28.1l-48.7-28.1v-54.9V188.9z M301.8,245.1l-1.1,0.7l0,0
-		l-47.6,27.5l-48.7-28.1v-56.2l48.7-28.1l48.7,28.1v54.9V245.1z"/>
-	<path d="M418.4,41.9c2.1,1.2,4.4,1.9,7.1,1.9c2.6,0,4.9-0.6,7-1.8c2.1-1.2,3.7-2.9,4.9-5.2c1.2-2.2,1.8-4.8,1.8-7.8
-		c0-3-0.6-5.6-1.8-7.8c-1.2-2.2-2.8-4-4.9-5.2c-2.1-1.2-4.4-1.8-7-1.8s-5,0.6-7,1.8c-2.1,1.2-3.7,3-4.9,5.2s-1.8,4.9-1.8,7.8
-		c0,2.9,0.6,5.5,1.8,7.7C414.7,39,416.3,40.7,418.4,41.9z M416.9,22.8c0.8-1.8,2-3.1,3.4-4c1.5-0.9,3.2-1.4,5.1-1.4
-		c1.9,0,3.6,0.5,5.1,1.4s2.6,2.3,3.4,4c0.8,1.8,1.2,3.8,1.2,6.2c0,2.4-0.4,4.4-1.3,6.2s-2,3.1-3.5,4c-1.5,0.9-3.2,1.4-5.1,1.4
-		c-1.9,0-3.6-0.5-5-1.4c-1.5-0.9-2.6-2.2-3.5-4c-0.8-1.7-1.2-3.8-1.2-6.1C415.7,26.7,416.1,24.6,416.9,22.8z"/>
-	<polygon points="461,14.7 461,26.4 446.9,26.4 446.9,14.7 443.1,14.7 443.1,43.3 446.9,43.3 446.9,29.8 461,29.8 461,43.3 
-		464.8,43.3 464.8,14.7 	"/>
-</g>
-</svg>
+<svg enable-background="new 0 0 479 303.3" viewBox="0 0 479 303.3" xmlns="http://www.w3.org/2000/svg"><path d="m171.9 160h2.4v45.6h-2.4z" transform="matrix(.5 -.866 .866 .5 -71.7511 241.2854)"/><path d="m112.6 194.2h2.4v45.6h-2.4z"/><path d="m150.3 250h45.6v2.4h-45.6z" transform="matrix(.8663 -.4996 .4996 .8663 -102.3568 120.0606)"/><path d="m259.8 190.8h-13.4l-.5 2.4h14.3z"/><path d="m258.1 181.2h-10l-.5 2.4h10.9z"/><path d="m254.7 162h-3.3l-.4 2.4h4.2z"/><path d="m256.4 171.6h-6.7l-.4 2.4h7.6z"/><path d="m347.4 183.6h10.9l-.4-2.4h-10.1z"/><path d="m351.2 162-.4 2.4h4.1l-.4-2.4z"/><path d="m349.1 174h7.5l-.4-2.4h-6.7z"/><path d="m345.7 193.2h14.3l-.4-2.4h-13.5z"/><path d="m60.6 261.4c-2.1-1.2-4.4-1.8-7-1.8s-5 .6-7 1.8c-2.1 1.2-3.7 3-4.9 5.2-1.2 2.3-1.8 4.9-1.8 7.8s.6 5.5 1.8 7.7 2.8 4 4.9 5.2 4.4 1.9 7.1 1.9c2.6 0 4.9-.6 7-1.8s3.7-2.9 4.9-5.2 1.8-4.8 1.8-7.8-.6-5.6-1.8-7.8-2.9-4-5-5.2zm1.5 19.2c-.8 1.7-2 3.1-3.5 4s-3.2 1.4-5.1 1.4-3.6-.5-5-1.4c-1.5-.9-2.6-2.2-3.5-4-.8-1.7-1.2-3.8-1.2-6.1 0-2.4.4-4.5 1.2-6.3s2-3.1 3.4-4 3.2-1.4 5.1-1.4 3.6.5 5.1 1.4 2.6 2.3 3.4 4 1.2 3.8 1.2 6.2c.1 2.4-.3 4.5-1.1 6.2z"/><path d="m32.1 271.8h-14.1v-11.8h-3.8v28.7h3.8v-13.5h14.1v13.5h3.8v-28.7h-3.8z"/><path d="m260.1 214h-14v-11.8h-3.8v28.6h3.8v-13.4h14v13.4h3.8v-28.6h-3.8z"/><path d="m295.9 131h14.1v13.4h3.8v-28.6h-3.8v11.8h-14.1v-11.8h-3.8v28.6h3.8z"/><path d="m359.9 214h-14.1v-11.8h-3.8v28.6h3.8v-13.4h14.1v13.4h3.8v-28.6h-3.8z"/><path d="m441.3 128.3-32.3-44.4 17.1-32.1-14.5-4.7-5.1 36-52.3 17 6.2-55.9h-15.2l6.2 55.4-46.1-26.6-1.7-1-.6-.3-.6.3-48.2 27.8-1.7 1-.6.3v.7 2 54.9l-48.7 28.1-47.6-27.5-1.7-1-.6-.3-.6.3-1.7 1-48.2 27.8-.6.3v.7 2 54.9l-31.3 18.1 1.2 2.1 31.3-18.1 47.6 27.5 1.7 1 .6.3.6-.3 1.7-1 47.6-27.5 49.3 28.5.6.3.6-.3 1.7-1 48.2-27.8.6-.3v-.7-2-54.9l48.8-28.2 54.3 17.6.8.3.5-.7 1.2-1.6 31.5-43.4 1.2-1.6.5-.7-.5-.7zm-1.3 2.3-32.8 45.2-53.1-17.3v-55.9l53.1-17.3 32.2 44.3zm-185.7-28.1 1.1-.7 47.6-27.4 48.7 28.1v56.2l-47.1 27.2 6-35.1h-15.2l6 35.1-47.1-27.2v-54.9zm-149.7 86.4 48.7-28.1 48.7 28.1v56.2l-48.7 28.1-48.7-28.1v-54.9zm197.2 56.2-1.1.7-47.6 27.5-48.7-28.1v-56.2l48.7-28.1 48.7 28.1v54.9z"/><path d="m418.4 41.9c2.1 1.2 4.4 1.9 7.1 1.9 2.6 0 4.9-.6 7-1.8s3.7-2.9 4.9-5.2c1.2-2.2 1.8-4.8 1.8-7.8s-.6-5.6-1.8-7.8-2.8-4-4.9-5.2-4.4-1.8-7-1.8-5 .6-7 1.8c-2.1 1.2-3.7 3-4.9 5.2s-1.8 4.9-1.8 7.8.6 5.5 1.8 7.7c1.1 2.3 2.7 4 4.8 5.2zm-1.5-19.1c.8-1.8 2-3.1 3.4-4 1.5-.9 3.2-1.4 5.1-1.4s3.6.5 5.1 1.4 2.6 2.3 3.4 4c.8 1.8 1.2 3.8 1.2 6.2s-.4 4.4-1.3 6.2-2 3.1-3.5 4-3.2 1.4-5.1 1.4-3.6-.5-5-1.4c-1.5-.9-2.6-2.2-3.5-4-.8-1.7-1.2-3.8-1.2-6.1.2-2.4.6-4.5 1.4-6.3z"/><path d="m461 14.7v11.7h-14.1v-11.7h-3.8v28.6h3.8v-13.5h14.1v13.5h3.8v-28.6z"/></svg>
\ No newline at end of file
diff --git a/static/images/Estrofem.png b/static/images/Estrofem.png
index 33c5695c..eae96bd8 100644
Binary files a/static/images/Estrofem.png and b/static/images/Estrofem.png differ
diff --git a/static/images/Huadian.jpg b/static/images/Huadian.jpg
index 3620bc51..43c862ec 100644
Binary files a/static/images/Huadian.jpg and b/static/images/Huadian.jpg differ
diff --git a/static/images/Mochida-10.jpg b/static/images/Mochida-10.jpg
index 09a0a66c..e1c402e8 100644
Binary files a/static/images/Mochida-10.jpg and b/static/images/Mochida-10.jpg differ
diff --git a/static/images/Mochida-5.jpg b/static/images/Mochida-5.jpg
index 5397d129..5050355f 100644
Binary files a/static/images/Mochida-5.jpg and b/static/images/Mochida-5.jpg differ
diff --git a/static/images/Ningjiao.jpg b/static/images/Ningjiao.jpg
index 11375b35..e27ecf74 100644
Binary files a/static/images/Ningjiao.jpg and b/static/images/Ningjiao.jpg differ
diff --git a/static/images/Oestrogel.jpg b/static/images/Oestrogel.jpg
index 340c5b64..32d735f2 100644
Binary files a/static/images/Oestrogel.jpg and b/static/images/Oestrogel.jpg differ
diff --git a/static/images/Progynon-Depot.jpg b/static/images/Progynon-Depot.jpg
index 345ac81c..5475cd05 100644
Binary files a/static/images/Progynon-Depot.jpg and b/static/images/Progynon-Depot.jpg differ
diff --git a/static/images/Progynova-th.png b/static/images/Progynova-th.png
index 931a3b7e..31930346 100644
Binary files a/static/images/Progynova-th.png and b/static/images/Progynova-th.png differ
diff --git a/static/images/Progynova.jpg b/static/images/Progynova.jpg
index 4f25b260..2182e28a 100644
Binary files a/static/images/Progynova.jpg and b/static/images/Progynova.jpg differ
diff --git a/static/images/Siterone100.jpg b/static/images/Siterone100.jpg
index 65f1d9bc..b19e98bf 100644
Binary files a/static/images/Siterone100.jpg and b/static/images/Siterone100.jpg differ
diff --git a/static/images/Siterone50.jpg b/static/images/Siterone50.jpg
index d311c9c6..c6f379c7 100644
Binary files a/static/images/Siterone50.jpg and b/static/images/Siterone50.jpg differ
diff --git a/static/images/Spironolactone.jpg b/static/images/Spironolactone.jpg
index 62132056..1df2371f 100644
Binary files a/static/images/Spironolactone.jpg and b/static/images/Spironolactone.jpg differ
diff --git a/static/images/Transgender_Pride_Flag.png b/static/images/Transgender_Pride_Flag.png
index 48c574e7..48d40896 100644
Binary files a/static/images/Transgender_Pride_Flag.png and b/static/images/Transgender_Pride_Flag.png differ
diff --git a/static/images/doctor/Chettawut.jpg b/static/images/doctor/Chettawut.jpg
index 4a5acb80..10e1db34 100644
Binary files a/static/images/doctor/Chettawut.jpg and b/static/images/doctor/Chettawut.jpg differ
diff --git a/static/images/doctor/cao-bingyu.jpg b/static/images/doctor/cao-bingyu.jpg
index dbe517f7..c6d088c6 100644
Binary files a/static/images/doctor/cao-bingyu.jpg and b/static/images/doctor/cao-bingyu.jpg differ
diff --git a/static/images/doctor/cao-qiuyun-zm.jpg b/static/images/doctor/cao-qiuyun-zm.jpg
index f024d64d..0b14e501 100644
Binary files a/static/images/doctor/cao-qiuyun-zm.jpg and b/static/images/doctor/cao-qiuyun-zm.jpg differ
diff --git a/static/images/doctor/cao-qiuyun-zm0.jpg b/static/images/doctor/cao-qiuyun-zm0.jpg
index 495016b5..c642bb2e 100644
Binary files a/static/images/doctor/cao-qiuyun-zm0.jpg and b/static/images/doctor/cao-qiuyun-zm0.jpg differ
diff --git a/static/images/doctor/cao-qiuyun-zm2.jpg b/static/images/doctor/cao-qiuyun-zm2.jpg
index c2b74e69..179f9e79 100644
Binary files a/static/images/doctor/cao-qiuyun-zm2.jpg and b/static/images/doctor/cao-qiuyun-zm2.jpg differ
diff --git a/static/images/doctor/cao-qiuyun.jpg b/static/images/doctor/cao-qiuyun.jpg
index aea13a23..b1d76c44 100644
Binary files a/static/images/doctor/cao-qiuyun.jpg and b/static/images/doctor/cao-qiuyun.jpg differ
diff --git a/static/images/doctor/chen-jianguo-zm.jpg b/static/images/doctor/chen-jianguo-zm.jpg
index 4a6aba35..69af9068 100644
Binary files a/static/images/doctor/chen-jianguo-zm.jpg and b/static/images/doctor/chen-jianguo-zm.jpg differ
diff --git a/static/images/doctor/chen-jianguo.jpg b/static/images/doctor/chen-jianguo.jpg
index 641d5860..76c34cad 100644
Binary files a/static/images/doctor/chen-jianguo.jpg and b/static/images/doctor/chen-jianguo.jpg differ
diff --git a/static/images/doctor/cheng-chen.jpg b/static/images/doctor/cheng-chen.jpg
index 0c0368ab..ce4375d4 100644
Binary files a/static/images/doctor/cheng-chen.jpg and b/static/images/doctor/cheng-chen.jpg differ
diff --git a/static/images/doctor/cheng-ming-zm.jpg b/static/images/doctor/cheng-ming-zm.jpg
index 1b7a0a97..e6c62b8f 100644
Binary files a/static/images/doctor/cheng-ming-zm.jpg and b/static/images/doctor/cheng-ming-zm.jpg differ
diff --git a/static/images/doctor/cong-zhong.jpg b/static/images/doctor/cong-zhong.jpg
index 4cf6e5e8..92fbfd84 100644
Binary files a/static/images/doctor/cong-zhong.jpg and b/static/images/doctor/cong-zhong.jpg differ
diff --git a/static/images/doctor/di-xiaolan-zm.jpg b/static/images/doctor/di-xiaolan-zm.jpg
index 0c6c1c14..4a0909e3 100644
Binary files a/static/images/doctor/di-xiaolan-zm.jpg and b/static/images/doctor/di-xiaolan-zm.jpg differ
diff --git a/static/images/doctor/di-xiaolan.jpg b/static/images/doctor/di-xiaolan.jpg
index e4e87128..c1ae0ac2 100644
Binary files a/static/images/doctor/di-xiaolan.jpg and b/static/images/doctor/di-xiaolan.jpg differ
diff --git a/static/images/doctor/du-xiangdong.jpg b/static/images/doctor/du-xiangdong.jpg
index 3cd5431b..55ca2ae5 100644
Binary files a/static/images/doctor/du-xiangdong.jpg and b/static/images/doctor/du-xiangdong.jpg differ
diff --git a/static/images/doctor/guo-ming-bl.jpg b/static/images/doctor/guo-ming-bl.jpg
index dfd14162..6b697553 100644
Binary files a/static/images/doctor/guo-ming-bl.jpg and b/static/images/doctor/guo-ming-bl.jpg differ
diff --git a/static/images/doctor/guo-ming-zm.jpg b/static/images/doctor/guo-ming-zm.jpg
index bf112ea9..95decbd1 100644
Binary files a/static/images/doctor/guo-ming-zm.jpg and b/static/images/doctor/guo-ming-zm.jpg differ
diff --git a/static/images/doctor/he-ying-bl.jpg b/static/images/doctor/he-ying-bl.jpg
index 919e8917..8917b0a1 100644
Binary files a/static/images/doctor/he-ying-bl.jpg and b/static/images/doctor/he-ying-bl.jpg differ
diff --git a/static/images/doctor/he-ying-zm.jpg b/static/images/doctor/he-ying-zm.jpg
index ed2b687b..2362eb0c 100644
Binary files a/static/images/doctor/he-ying-zm.jpg and b/static/images/doctor/he-ying-zm.jpg differ
diff --git a/static/images/doctor/hu-lei.jpg b/static/images/doctor/hu-lei.jpg
index 602c2245..949a1f1a 100644
Binary files a/static/images/doctor/hu-lei.jpg and b/static/images/doctor/hu-lei.jpg differ
diff --git a/static/images/doctor/hu-lei.origin.jpg b/static/images/doctor/hu-lei.origin.jpg
index 6fbc6523..7e6810ac 100644
Binary files a/static/images/doctor/hu-lei.origin.jpg and b/static/images/doctor/hu-lei.origin.jpg differ
diff --git a/static/images/doctor/hu-pei-cheng.jpg b/static/images/doctor/hu-pei-cheng.jpg
index 14cd1807..59fd04ba 100644
Binary files a/static/images/doctor/hu-pei-cheng.jpg and b/static/images/doctor/hu-pei-cheng.jpg differ
diff --git a/static/images/doctor/ji-ling-lost.png b/static/images/doctor/ji-ling-lost.png
index c7db2610..ce59931a 100644
Binary files a/static/images/doctor/ji-ling-lost.png and b/static/images/doctor/ji-ling-lost.png differ
diff --git a/static/images/doctor/jia-yanbin-zm.jpg b/static/images/doctor/jia-yanbin-zm.jpg
index 7d3063d1..c1844f41 100644
Binary files a/static/images/doctor/jia-yanbin-zm.jpg and b/static/images/doctor/jia-yanbin-zm.jpg differ
diff --git a/static/images/doctor/jia-yanbin.png b/static/images/doctor/jia-yanbin.png
index 7182118a..110d6fd6 100644
Binary files a/static/images/doctor/jia-yanbin.png and b/static/images/doctor/jia-yanbin.png differ
diff --git a/static/images/doctor/jiang-meijun.jpg b/static/images/doctor/jiang-meijun.jpg
index 9ef5a6d4..d605381f 100644
Binary files a/static/images/doctor/jiang-meijun.jpg and b/static/images/doctor/jiang-meijun.jpg differ
diff --git a/static/images/doctor/jianyi.jpg b/static/images/doctor/jianyi.jpg
index dff5e7ca..16f4871e 100644
Binary files a/static/images/doctor/jianyi.jpg and b/static/images/doctor/jianyi.jpg differ
diff --git a/static/images/doctor/jiaofei.jpg b/static/images/doctor/jiaofei.jpg
index 126adb6b..724afae9 100644
Binary files a/static/images/doctor/jiaofei.jpg and b/static/images/doctor/jiaofei.jpg differ
diff --git a/static/images/doctor/jiatiao1.jpg b/static/images/doctor/jiatiao1.jpg
index a4a9867a..e87fa628 100644
Binary files a/static/images/doctor/jiatiao1.jpg and b/static/images/doctor/jiatiao1.jpg differ
diff --git a/static/images/doctor/liu-ye.png b/static/images/doctor/liu-ye.png
index 7688ddd5..f6560901 100644
Binary files a/static/images/doctor/liu-ye.png and b/static/images/doctor/liu-ye.png differ
diff --git a/static/images/doctor/liuyechufang.jpg b/static/images/doctor/liuyechufang.jpg
index c343a993..b761b010 100644
Binary files a/static/images/doctor/liuyechufang.jpg and b/static/images/doctor/liuyechufang.jpg differ
diff --git a/static/images/doctor/lu-zheng-zm.jpg b/static/images/doctor/lu-zheng-zm.jpg
index e73c7006..d46f2a4c 100644
Binary files a/static/images/doctor/lu-zheng-zm.jpg and b/static/images/doctor/lu-zheng-zm.jpg differ
diff --git a/static/images/doctor/lu-zheng.jpg b/static/images/doctor/lu-zheng.jpg
index d715a234..dd481ef2 100644
Binary files a/static/images/doctor/lu-zheng.jpg and b/static/images/doctor/lu-zheng.jpg differ
diff --git a/static/images/doctor/ning-jie-zm.jpg b/static/images/doctor/ning-jie-zm.jpg
index 622f1f24..cee3b381 100644
Binary files a/static/images/doctor/ning-jie-zm.jpg and b/static/images/doctor/ning-jie-zm.jpg differ
diff --git a/static/images/doctor/ning-jie.jpg b/static/images/doctor/ning-jie.jpg
index 7cb4ea17..12b8ac1c 100644
Binary files a/static/images/doctor/ning-jie.jpg and b/static/images/doctor/ning-jie.jpg differ
diff --git a/static/images/doctor/pan-bai-lin.jpg b/static/images/doctor/pan-bai-lin.jpg
index c831b4e1..1d0a6817 100644
Binary files a/static/images/doctor/pan-bai-lin.jpg and b/static/images/doctor/pan-bai-lin.jpg differ
diff --git a/static/images/doctor/shenzhen-kangning-zm.jpg b/static/images/doctor/shenzhen-kangning-zm.jpg
index 3cc0fb7b..507736cc 100644
Binary files a/static/images/doctor/shenzhen-kangning-zm.jpg and b/static/images/doctor/shenzhen-kangning-zm.jpg differ
diff --git a/static/images/doctor/wang-biao-zm.jpg b/static/images/doctor/wang-biao-zm.jpg
index 4b4fef38..13d0b613 100644
Binary files a/static/images/doctor/wang-biao-zm.jpg and b/static/images/doctor/wang-biao-zm.jpg differ
diff --git a/static/images/doctor/wang-biao.jpg b/static/images/doctor/wang-biao.jpg
index 133197b3..10d4df30 100644
Binary files a/static/images/doctor/wang-biao.jpg and b/static/images/doctor/wang-biao.jpg differ
diff --git a/static/images/doctor/wang-xiaojing-zm.jpg b/static/images/doctor/wang-xiaojing-zm.jpg
index 1a0931e9..cb8a65bb 100644
Binary files a/static/images/doctor/wang-xiaojing-zm.jpg and b/static/images/doctor/wang-xiaojing-zm.jpg differ
diff --git a/static/images/doctor/wang-xiaojing.jpg b/static/images/doctor/wang-xiaojing.jpg
index b71f8e41..3bbbb6b9 100644
Binary files a/static/images/doctor/wang-xiaojing.jpg and b/static/images/doctor/wang-xiaojing.jpg differ
diff --git a/static/images/doctor/wei-zhaoguo.png b/static/images/doctor/wei-zhaoguo.png
index 47850b81..643d1262 100644
Binary files a/static/images/doctor/wei-zhaoguo.png and b/static/images/doctor/wei-zhaoguo.png differ
diff --git a/static/images/doctor/yang-huini.jpg b/static/images/doctor/yang-huini.jpg
index 1e76e684..4604ec63 100644
Binary files a/static/images/doctor/yang-huini.jpg and b/static/images/doctor/yang-huini.jpg differ
diff --git a/static/images/doctor/zhang-jingxuan.jpg b/static/images/doctor/zhang-jingxuan.jpg
index ba58a591..33c7fcc3 100644
Binary files a/static/images/doctor/zhang-jingxuan.jpg and b/static/images/doctor/zhang-jingxuan.jpg differ
diff --git a/static/images/doctor/zhang-jingxuan.origin.jpg b/static/images/doctor/zhang-jingxuan.origin.jpg
index cab08a5b..dec2a81e 100644
Binary files a/static/images/doctor/zhang-jingxuan.origin.jpg and b/static/images/doctor/zhang-jingxuan.origin.jpg differ
diff --git a/static/images/doctor/zhang-qian-zm.jpg b/static/images/doctor/zhang-qian-zm.jpg
index 42ea469c..9f7bc300 100644
Binary files a/static/images/doctor/zhang-qian-zm.jpg and b/static/images/doctor/zhang-qian-zm.jpg differ
diff --git a/static/images/doctor/zhang-qian.png b/static/images/doctor/zhang-qian.png
index 527a0a1b..3d9ef106 100644
Binary files a/static/images/doctor/zhang-qian.png and b/static/images/doctor/zhang-qian.png differ
diff --git a/static/images/doctor/zhao-yede.jpg b/static/images/doctor/zhao-yede.jpg
index 8f6031ea..861cc27c 100644
Binary files a/static/images/doctor/zhao-yede.jpg and b/static/images/doctor/zhao-yede.jpg differ
diff --git a/static/images/doctor/zheng-tiansheng-qr.jpg b/static/images/doctor/zheng-tiansheng-qr.jpg
index 0b41fe61..6e98e390 100644
Binary files a/static/images/doctor/zheng-tiansheng-qr.jpg and b/static/images/doctor/zheng-tiansheng-qr.jpg differ
diff --git a/static/images/doctor/zheng-tiansheng-zm.jpg b/static/images/doctor/zheng-tiansheng-zm.jpg
index 642ac62b..18206760 100644
Binary files a/static/images/doctor/zheng-tiansheng-zm.jpg and b/static/images/doctor/zheng-tiansheng-zm.jpg differ
diff --git a/static/images/doctor/zheng-tiansheng.jpg b/static/images/doctor/zheng-tiansheng.jpg
index 0c2128ca..52c4ff1b 100644
Binary files a/static/images/doctor/zheng-tiansheng.jpg and b/static/images/doctor/zheng-tiansheng.jpg differ
diff --git a/static/images/doctor/zhou-jian-ying.jpg b/static/images/doctor/zhou-jian-ying.jpg
index df3d0125..5f757b23 100644
Binary files a/static/images/doctor/zhou-jian-ying.jpg and b/static/images/doctor/zhou-jian-ying.jpg differ
diff --git a/static/images/hybl.jpg b/static/images/hybl.jpg
index 10029cff..cc763cf6 100644
Binary files a/static/images/hybl.jpg and b/static/images/hybl.jpg differ
diff --git a/static/images/introletter/SEU.jpg b/static/images/introletter/SEU.jpg
index 14cf8b73..880150be 100644
Binary files a/static/images/introletter/SEU.jpg and b/static/images/introletter/SEU.jpg differ
diff --git a/static/images/introletter/SUDA.jpg b/static/images/introletter/SUDA.jpg
index 32a4075c..7ffff419 100644
Binary files a/static/images/introletter/SUDA.jpg and b/static/images/introletter/SUDA.jpg differ
diff --git a/static/images/introletter/UCAS.jpg b/static/images/introletter/UCAS.jpg
index 2a8641b3..a2470710 100644
Binary files a/static/images/introletter/UCAS.jpg and b/static/images/introletter/UCAS.jpg differ
diff --git a/static/images/shadow-i.png b/static/images/shadow-i.png
index a5f7ac57..bfb13612 100644
Binary files a/static/images/shadow-i.png and b/static/images/shadow-i.png differ
diff --git a/static/images/wpnl.jpg b/static/images/wpnl.jpg
index 642f3458..66903a26 100644
Binary files a/static/images/wpnl.jpg and b/static/images/wpnl.jpg differ
diff --git a/static/logo-long.png b/static/logo-long.png
index 1a60a68c..edfae51e 100644
Binary files a/static/logo-long.png and b/static/logo-long.png differ
diff --git a/static/logo.png b/static/logo.png
index f95b5b3e..c502a132 100644
Binary files a/static/logo.png and b/static/logo.png differ
diff --git a/static/new/mtf-wiki-cn.svg b/static/new/mtf-wiki-cn.svg
index eac77851..eac528a8 100644
--- a/static/new/mtf-wiki-cn.svg
+++ b/static/new/mtf-wiki-cn.svg
@@ -1,36 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="512" version="1.1" viewBox="0 0 270.93 135.47" xmlns="http://www.w3.org/2000/svg">
- <g stroke="#000" stroke-width=".79377">
-  <g stroke="#000" aria-label="MtF wiki">
-   <path d="m10.759 71.5h7.1261v-24.906c0-2.6106-.28222-6.7028-.28222-6.8439.21167.28222 2.4694 3.6689 4.2333 5.715l12.065 14.534h.84667l12.065-14.534c1.905-2.1167 4.1628-5.5739 4.3039-5.715 0 .14111-.28222 4.2333-.28222 6.8439v24.906h7.1261v-48.472h-.77611l-22.719 26.811-22.931-26.811h-.77611z" fill="#5bcefa" stroke-width=".79377"/>
-   <path transform="scale(.26458)" d="m266.53 100.82v43.199h-16.801v22.668h16.801v51.467c0 29.867 14.667 40.533 34.4 40.533 2.3911 0 4.6093-.1393 6.6738-.39258v164h26.934v-33.068l14.133-14.666 33.867 47.734h31.734l-46.934-65.334 41.332-46.666h-30.666l-44.801 50.398c.53334-5.8667 1.334-12.799 1.334-19.732v-111.2h-15.658l-.084-.13867c-.054.0442-.11514.0938-.16992.13867h-11.021v5.5137c-.9194.13305-1.8929.21289-2.9414.21289-6.9333 0-11.199-3.7322-11.199-16.799v-52h29.867v-22.668h-29.867v-43.199z" fill="#fffffd" stroke-width="3.0001"/>
-   <g stroke-width=".79377">
-    <path d="m94.79 71.5h7.4789v-19.332h20.32v-6.6322h-20.32v-15.452h22.437v-6.5617h-29.916z" fill="#f5a9b8"/>
-    <path d="m23.884 112.44h.77611l7.62-14.393c.91722-1.7639 1.7639-4.6567 1.8344-4.9389.07055.28222.70556 3.175 1.6933 4.9389l7.3378 14.393h.77611l12.982-30.339h-7.1261l-4.8683 12.7c-.84667 2.1872-1.7639 5.5739-1.7639 5.5739s-1.0583-3.4572-2.1167-5.5739l-6.5617-13.264h-.70556l-6.35 12.7c-1.1289 2.1872-2.0461 5.5739-2.0461 5.5739s-.91722-3.3161-1.7639-5.5739l-4.7272-12.136h-7.9022z" fill="#5bcefa"/>
-    <g fill="#f5a9b8">
-     <path d="m67.488 75.326c2.54 0 4.7272-1.905 4.7272-4.7272 0-2.6811-2.1872-4.6567-4.7272-4.6567s-4.7272 1.9756-4.7272 4.6567c0 2.8222 2.1872 4.7272 4.7272 4.7272zm-3.5983 36.407h7.1967v-29.633h-7.1967z"/>
-     <path d="m116.38 111.73h7.1967v-29.633h-7.1967z"/>
-     <path d="m119.98 75.326c2.54 0 4.7272-1.905 4.7272-4.7272 0-2.6811-2.1872-4.6567-4.7272-4.6567s-4.7272 1.9756-4.7272 4.6567c0 2.8222 2.1872 4.7272 4.7272 4.7272z"/>
-    </g>
-   </g>
-  </g>
- </g>
- <g transform="translate(0 .37285)" fill="#fff" stroke="#000" stroke-width=".79377" aria-label=".cn">
-  <path d="m129.59 105.33q0-2.6458 1.905-4.445 1.905-1.905 4.445-1.905 2.6458 0 4.445 1.905 1.905 1.7992 1.905 4.5508 0 2.6458-1.905 4.5508-1.7992 1.7992-4.445 1.7992-2.54 0-4.445-1.905t-1.905-4.5508z"/>
-  <path d="m201.05 65.751-5.715 3.5983q-7.4083-9.8425-20.32-9.8425-10.16 0-17.039 6.5616-6.8791 6.4558-6.8791 16.087t6.7733 16.51 17.145 6.8791q12.382 0 20.32-9.8425l5.715 3.81q-4.2333 6.1383-11.43 9.4191-7.0908 3.2808-15.346 3.2808-13.017 0-21.802-8.5725-8.6783-8.5725-8.6783-20.955 0-12.382 8.7841-21.167 8.89-8.89 22.754-8.89 8.1491 0 15.028 3.4925 6.985 3.4925 10.689 9.6308z"/>
-  <path d="m210.79 54.109h7.3025v10.054q8.6783-11.536 21.061-11.536 6.35 0 11.43 3.4925 5.08 3.3867 7.1966 8.9958 2.1167 5.5033 2.1167 16.298v28.892h-7.1966v-26.776q0-9.8425-.9525-13.335-.84666-3.4925-2.7516-5.9266-1.7992-2.4342-4.6567-3.7042t-6.985-1.27q-4.0217 0-7.9375 2.0108t-6.6675 5.6091-3.7042 7.4083-.9525 15.346v20.637h-7.3025z"/>
- </g>
- <g stroke="#fff" stroke-width=".26458" aria-label="a mirror site">
-  <path d="m152.71 28.493c-.69991-1.1289-1.8965-1.8062-3.3641-1.8062-3.6576 0-6.0734 3.4318-6.0734 6.683 0 2.5739 1.6708 4.5156 4.2672 4.5156 1.5127 0 2.8448-.58702 3.9511-1.7611h.0452l-.22578 1.4676h1.8062l1.6708-10.612h-1.8062l-.22578 1.5127zm-4.651 7.7216c-1.8062 0-2.89-1.3772-2.89-3.2286 0-2.3707 1.7836-4.6284 4.1092-4.6284 1.9643 0 3.048 1.3095 3.048 3.0706 0 2.0546-1.3772 4.7865-4.2672 4.7865z"/>
-  <path d="m172.19 28.448c-.4064-1.1063-1.3321-1.7611-2.6642-1.7611-1.0386 0-2.0772.56444-2.7771 1.445h-.0452l.18062-1.1515h-1.8062l-1.6708 10.612h1.8062l.85795-5.509c.38383-2.4384 1.3321-3.7253 2.9351-3.7253 1.0386 0 1.5127.63218 1.5127 1.9191 0 .33867-.0452.8128-.11289 1.2644l-.94827 6.0508h1.8062l.90311-5.7348c.36124-2.3255 1.2869-3.4996 2.8448-3.4996 1.0386 0 1.603.45156 1.603 1.8062 0 .33867-.0452.69991-.11289 1.1515l-.99343 6.2766h1.8062l1.0386-6.5701c.0677-.45156.0903-.85796.0903-1.2418 0-2.0094-.85796-3.0932-2.7996-3.0932-1.3772 0-2.6868.65476-3.4544 1.7611z"/>
-  <path d="m185.6 22.759c0-.58702-.47413-1.0612-1.1063-1.0612-.79022 0-1.5127.76764-1.5127 1.4676 0 .65476.47413 1.1063 1.1063 1.1063.83538 0 1.5127-.74507 1.5127-1.5127zm-2.8448 4.222-1.6708 10.612h1.8062l1.6708-10.612z"/>
-  <path d="m194.05 27.184c-.47413-.29351-.92569-.49671-1.5579-.49671-.8128 0-1.5353.27093-2.5739 1.445h-.0452l.18062-1.1515h-1.8062l-1.6708 10.612h1.8062l.85796-5.4187c.4064-2.6642 1.3772-3.8156 2.6642-3.8156.47413 0 .67733.2032 1.016.47413z"/>
-  <path d="m201.61 27.184c-.47413-.29351-.92569-.49671-1.5579-.49671-.8128 0-1.5353.27093-2.5739 1.445h-.0452l.18062-1.1515h-1.8062l-1.6708 10.612h1.8062l.85796-5.4187c.4064-2.6642 1.3772-3.8156 2.6642-3.8156.47414 0 .67734.2032 1.016.47413z"/>
-  <path d="m212.42 32.309c.0452-.29351.0677-.58702.0677-.88053 0-2.6416-1.8288-4.7413-4.7639-4.7413-3.4318 0-6.525 3.048-6.525 6.5476 0 2.6642 1.9868 4.651 4.7413 4.651 3.1609 0 5.9831-2.5061 6.4798-5.5767zm-6.2089 3.906c-1.9191 0-3.1835-1.3547-3.1835-3.2286 0-2.5061 2.0094-4.6284 4.4027-4.6284 2.0546 0 3.2286 1.3998 3.2286 3.2512 0 2.5287-2.0546 4.6059-4.4478 4.6059z"/>
-  <path d="m221.46 27.184c-.47414-.29351-.92569-.49671-1.5579-.49671-.8128 0-1.5353.27093-2.5739 1.445h-.0452l.18063-1.1515h-1.8062l-1.6708 10.612h1.8062l.85796-5.4187c.4064-2.6642 1.3772-3.8156 2.6642-3.8156.47413 0 .67733.2032 1.016.47413z"/>
-  <path d="m235.81 28.652c-.31609-1.174-1.3772-1.9643-2.5287-1.9643-1.9417 0-3.6802 1.5579-3.6802 3.4996 0 .85796.4064 1.6708 2.2578 2.4384 1.0837.45156 1.8288.83538 1.8288 1.7385 0 .94827-.83538 1.8514-2.0094 1.8514-.99343 0-1.5353-.45156-1.874-1.6933l-1.7159.67733c.29351 1.6933 1.5579 2.6868 3.2964 2.6868 2.1449 0 4.1995-1.7159 4.1995-4.0414 0-.63218-.18063-1.1966-.79023-1.7159-.85795-.74507-1.8965-.92569-2.7545-1.4676-.47413-.29351-.65476-.63218-.65476-.94827 0-.72249.74507-1.3547 1.4901-1.3547.56444 0 1.0837.38382 1.2869 1.0837z"/>
-  <path d="m242.45 22.759c0-.58702-.47413-1.0612-1.1063-1.0612-.79022 0-1.5127.76764-1.5127 1.4676 0 .65476.47413 1.1063 1.1063 1.1063.83538 0 1.5127-.74507 1.5127-1.5127zm-2.8448 4.222-1.6708 10.612h1.8062l1.6708-10.612z"/>
-  <path d="m245.88 23.165-.6096 3.8156h-1.1063l-.24836 1.6708h1.1063l-1.4224 8.9408h1.8062l1.4224-8.9408h1.8965l.24836-1.6708h-1.8965l.6096-3.8156z"/>
-  <path d="m259.05 32.196c.0677-.36124.0903-.72249.0903-1.0612 0-2.619-1.5579-4.4478-4.2898-4.4478-3.8382 0-6.1412 3.5673-6.1412 6.8185 0 2.5964 1.7611 4.3801 4.4027 4.3801 2.1675 0 4.0866-1.0837 5.3961-2.9803l-1.3998-.88053c-1.0837 1.5127-2.2578 2.19-3.5899 2.19-1.7836 0-2.9351-1.2418-2.9351-2.9803 0-.18062.0226-.36124.0452-.56444h8.3312zm-8.1054-1.0612c.47413-1.5804 2.19-2.7771 3.6576-2.7771 1.5353 0 2.6642 1.1515 2.6868 2.7771z"/>
- </g>
-</svg>
+<svg height="512" viewBox="0 0 270.93 135.47" width="1024" xmlns="http://www.w3.org/2000/svg"><g stroke="#000" stroke-width=".79377"><path d="m10.759 71.5h7.1261v-24.906c0-2.6106-.28222-6.7028-.28222-6.8439.21167.28222 2.4694 3.6689 4.2333 5.715l12.065 14.534h.84667l12.065-14.534c1.905-2.1167 4.1628-5.5739 4.3039-5.715 0 .14111-.28222 4.2333-.28222 6.8439v24.906h7.1261v-48.472h-.77611l-22.719 26.811-22.931-26.811h-.77611z" fill="#5bcefa" stroke-width=".79377"/><path d="m266.53 100.82v43.199h-16.801v22.668h16.801v51.467c0 29.867 14.667 40.533 34.4 40.533 2.3911 0 4.6093-.1393 6.6738-.39258v164h26.934v-33.068l14.133-14.666 33.867 47.734h31.734l-46.934-65.334 41.332-46.666h-30.666l-44.801 50.398c.53334-5.8667 1.334-12.799 1.334-19.732v-111.2h-15.658l-.084-.13867c-.054.0442-.11514.0938-.16992.13867h-11.021v5.5137c-.9194.13305-1.8929.21289-2.9414.21289-6.9333 0-11.199-3.7322-11.199-16.799v-52h29.867v-22.668h-29.867v-43.199z" fill="#fffffd" stroke-width="3.0001" transform="scale(.26458)"/><g stroke-width=".79377"><path d="m94.79 71.5h7.4789v-19.332h20.32v-6.6322h-20.32v-15.452h22.437v-6.5617h-29.916z" fill="#f5a9b8"/><path d="m23.884 112.44h.77611l7.62-14.393c.91722-1.7639 1.7639-4.6567 1.8344-4.9389.07055.28222.70556 3.175 1.6933 4.9389l7.3378 14.393h.77611l12.982-30.339h-7.1261l-4.8683 12.7c-.84667 2.1872-1.7639 5.5739-1.7639 5.5739s-1.0583-3.4572-2.1167-5.5739l-6.5617-13.264h-.70556l-6.35 12.7c-1.1289 2.1872-2.0461 5.5739-2.0461 5.5739s-.91722-3.3161-1.7639-5.5739l-4.7272-12.136h-7.9022z" fill="#5bcefa"/><g fill="#f5a9b8"><path d="m67.488 75.326c2.54 0 4.7272-1.905 4.7272-4.7272 0-2.6811-2.1872-4.6567-4.7272-4.6567s-4.7272 1.9756-4.7272 4.6567c0 2.8222 2.1872 4.7272 4.7272 4.7272zm-3.5983 36.407h7.1967v-29.633h-7.1967z"/><path d="m116.38 111.73h7.1967v-29.633h-7.1967z"/><path d="m119.98 75.326c2.54 0 4.7272-1.905 4.7272-4.7272 0-2.6811-2.1872-4.6567-4.7272-4.6567s-4.7272 1.9756-4.7272 4.6567c0 2.8222 2.1872 4.7272 4.7272 4.7272z"/></g></g></g><g fill="#fff" stroke="#000" stroke-width=".79377" transform="translate(0 .37285)"><path d="m129.59 105.33q0-2.6458 1.905-4.445 1.905-1.905 4.445-1.905 2.6458 0 4.445 1.905 1.905 1.7992 1.905 4.5508 0 2.6458-1.905 4.5508-1.7992 1.7992-4.445 1.7992-2.54 0-4.445-1.905t-1.905-4.5508z"/><path d="m201.05 65.751-5.715 3.5983q-7.4083-9.8425-20.32-9.8425-10.16 0-17.039 6.5616-6.8791 6.4558-6.8791 16.087t6.7733 16.51 17.145 6.8791q12.382 0 20.32-9.8425l5.715 3.81q-4.2333 6.1383-11.43 9.4191-7.0908 3.2808-15.346 3.2808-13.017 0-21.802-8.5725-8.6783-8.5725-8.6783-20.955 0-12.382 8.7841-21.167 8.89-8.89 22.754-8.89 8.1491 0 15.028 3.4925 6.985 3.4925 10.689 9.6308z"/><path d="m210.79 54.109h7.3025v10.054q8.6783-11.536 21.061-11.536 6.35 0 11.43 3.4925 5.08 3.3867 7.1966 8.9958 2.1167 5.5033 2.1167 16.298v28.892h-7.1966v-26.776q0-9.8425-.9525-13.335-.84666-3.4925-2.7516-5.9266-1.7992-2.4342-4.6567-3.7042t-6.985-1.27q-4.0217 0-7.9375 2.0108t-6.6675 5.6091-3.7042 7.4083-.9525 15.346v20.637h-7.3025z"/></g><g stroke="#fff" stroke-width=".26458"><path d="m152.71 28.493c-.69991-1.1289-1.8965-1.8062-3.3641-1.8062-3.6576 0-6.0734 3.4318-6.0734 6.683 0 2.5739 1.6708 4.5156 4.2672 4.5156 1.5127 0 2.8448-.58702 3.9511-1.7611h.0452l-.22578 1.4676h1.8062l1.6708-10.612h-1.8062l-.22578 1.5127zm-4.651 7.7216c-1.8062 0-2.89-1.3772-2.89-3.2286 0-2.3707 1.7836-4.6284 4.1092-4.6284 1.9643 0 3.048 1.3095 3.048 3.0706 0 2.0546-1.3772 4.7865-4.2672 4.7865z"/><path d="m172.19 28.448c-.4064-1.1063-1.3321-1.7611-2.6642-1.7611-1.0386 0-2.0772.56444-2.7771 1.445h-.0452l.18062-1.1515h-1.8062l-1.6708 10.612h1.8062l.85795-5.509c.38383-2.4384 1.3321-3.7253 2.9351-3.7253 1.0386 0 1.5127.63218 1.5127 1.9191 0 .33867-.0452.8128-.11289 1.2644l-.94827 6.0508h1.8062l.90311-5.7348c.36124-2.3255 1.2869-3.4996 2.8448-3.4996 1.0386 0 1.603.45156 1.603 1.8062 0 .33867-.0452.69991-.11289 1.1515l-.99343 6.2766h1.8062l1.0386-6.5701c.0677-.45156.0903-.85796.0903-1.2418 0-2.0094-.85796-3.0932-2.7996-3.0932-1.3772 0-2.6868.65476-3.4544 1.7611z"/><path d="m185.6 22.759c0-.58702-.47413-1.0612-1.1063-1.0612-.79022 0-1.5127.76764-1.5127 1.4676 0 .65476.47413 1.1063 1.1063 1.1063.83538 0 1.5127-.74507 1.5127-1.5127zm-2.8448 4.222-1.6708 10.612h1.8062l1.6708-10.612z"/><path d="m194.05 27.184c-.47413-.29351-.92569-.49671-1.5579-.49671-.8128 0-1.5353.27093-2.5739 1.445h-.0452l.18062-1.1515h-1.8062l-1.6708 10.612h1.8062l.85796-5.4187c.4064-2.6642 1.3772-3.8156 2.6642-3.8156.47413 0 .67733.2032 1.016.47413z"/><path d="m201.61 27.184c-.47413-.29351-.92569-.49671-1.5579-.49671-.8128 0-1.5353.27093-2.5739 1.445h-.0452l.18062-1.1515h-1.8062l-1.6708 10.612h1.8062l.85796-5.4187c.4064-2.6642 1.3772-3.8156 2.6642-3.8156.47414 0 .67734.2032 1.016.47413z"/><path d="m212.42 32.309c.0452-.29351.0677-.58702.0677-.88053 0-2.6416-1.8288-4.7413-4.7639-4.7413-3.4318 0-6.525 3.048-6.525 6.5476 0 2.6642 1.9868 4.651 4.7413 4.651 3.1609 0 5.9831-2.5061 6.4798-5.5767zm-6.2089 3.906c-1.9191 0-3.1835-1.3547-3.1835-3.2286 0-2.5061 2.0094-4.6284 4.4027-4.6284 2.0546 0 3.2286 1.3998 3.2286 3.2512 0 2.5287-2.0546 4.6059-4.4478 4.6059z"/><path d="m221.46 27.184c-.47414-.29351-.92569-.49671-1.5579-.49671-.8128 0-1.5353.27093-2.5739 1.445h-.0452l.18063-1.1515h-1.8062l-1.6708 10.612h1.8062l.85796-5.4187c.4064-2.6642 1.3772-3.8156 2.6642-3.8156.47413 0 .67733.2032 1.016.47413z"/><path d="m235.81 28.652c-.31609-1.174-1.3772-1.9643-2.5287-1.9643-1.9417 0-3.6802 1.5579-3.6802 3.4996 0 .85796.4064 1.6708 2.2578 2.4384 1.0837.45156 1.8288.83538 1.8288 1.7385 0 .94827-.83538 1.8514-2.0094 1.8514-.99343 0-1.5353-.45156-1.874-1.6933l-1.7159.67733c.29351 1.6933 1.5579 2.6868 3.2964 2.6868 2.1449 0 4.1995-1.7159 4.1995-4.0414 0-.63218-.18063-1.1966-.79023-1.7159-.85795-.74507-1.8965-.92569-2.7545-1.4676-.47413-.29351-.65476-.63218-.65476-.94827 0-.72249.74507-1.3547 1.4901-1.3547.56444 0 1.0837.38382 1.2869 1.0837z"/><path d="m242.45 22.759c0-.58702-.47413-1.0612-1.1063-1.0612-.79022 0-1.5127.76764-1.5127 1.4676 0 .65476.47413 1.1063 1.1063 1.1063.83538 0 1.5127-.74507 1.5127-1.5127zm-2.8448 4.222-1.6708 10.612h1.8062l1.6708-10.612z"/><path d="m245.88 23.165-.6096 3.8156h-1.1063l-.24836 1.6708h1.1063l-1.4224 8.9408h1.8062l1.4224-8.9408h1.8965l.24836-1.6708h-1.8965l.6096-3.8156z"/><path d="m259.05 32.196c.0677-.36124.0903-.72249.0903-1.0612 0-2.619-1.5579-4.4478-4.2898-4.4478-3.8382 0-6.1412 3.5673-6.1412 6.8185 0 2.5964 1.7611 4.3801 4.4027 4.3801 2.1675 0 4.0866-1.0837 5.3961-2.9803l-1.3998-.88053c-1.0837 1.5127-2.2578 2.19-3.5899 2.19-1.7836 0-2.9351-1.2418-2.9351-2.9803 0-.18062.0226-.36124.0452-.56444h8.3312zm-8.1054-1.0612c.47413-1.5804 2.19-2.7771 3.6576-2.7771 1.5353 0 2.6642 1.1515 2.6868 2.7771z"/></g></svg>
\ No newline at end of file
diff --git a/static/new/mtf-wiki-inline.svg b/static/new/mtf-wiki-inline.svg
index 0b0d75ed..dd237394 100644
--- a/static/new/mtf-wiki-inline.svg
+++ b/static/new/mtf-wiki-inline.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="140" height="32" version="1.1" viewBox="0 0 37.042 8.4667" xmlns="http://www.w3.org/2000/svg">
- <g style="paint-order:stroke fill markers">
-  <g direction="ltr" style="paint-order:stroke fill markers" aria-label="MtF Wiki">
-   <path d="m.79008 7.6242h.96203v-3.3623c0-.35243-.0381-.90488-.0381-.92393.028575.0381.33338.4953.5715.77153l1.6288 1.9622h.1143l1.6288-1.9622c.25718-.28575.56198-.75248.58103-.77153 0 .01905-.0381.5715-.0381.92393v3.3623h.96203v-6.5437h-.10478l-3.0671 3.6195-3.0956-3.6195h-.10478z" direction="ltr" fill="#5bcefa" style="paint-order:stroke fill markers"/>
-   <path d="m10.086 7.7195c.54293 0 .8382-.20003 1.0382-.381l-.40005-.65723c-.10478.085725-.24765.20955-.50483.20955-.24765 0-.40005-.13335-.40005-.60008v-1.8574h1.0668v-.80963h-1.0668v-1.5431h-.96203v1.5431h-.60008v.80963h.60008v1.8383c0 1.0668.52388 1.4478 1.2287 1.4478z" direction="ltr" fill="#f5a9b8" style="paint-order:stroke fill markers"/>
-   <path d="m12.134 7.6242h1.0097v-2.6099h2.7432v-.89535h-2.7432v-2.086h3.029v-.88583h-4.0386z" direction="ltr" style="paint-order:stroke fill markers"/>
-   <path d="m21.364 7.6909h.12382l1.6478-3.8576c.12382-.3048.27622-.762.28575-.78105.0095.028575.13335.47625.2667.78105l1.6097 3.8576h.12382l2.2384-6.5437h-.98108l-1.143 3.4481c-.12382.35243-.25718.89535-.25718.92393-.01905-.05715-.16192-.58103-.3048-.92393l-1.4954-3.5147h-.12382l-1.4859 3.5147c-.1524.36195-.3048.89535-.31432.92393-.0095-.0381-.13335-.5715-.24765-.92393l-1.143-3.4481h-1.0573z" direction="ltr" fill="#f5a9b8" style="paint-order:stroke fill markers"/>
-   <path d="m28.813 2.7093c.3429 0 .63818-.25718.63818-.63818 0-.36195-.29528-.62865-.63818-.62865-.3429 0-.63818.2667-.63818.62865 0 .381.29528.63818.63818.63818zm-.48578 4.9149h.97155v-4.0005h-.97155z" direction="ltr" fill="#f5a9b8" style="paint-order:stroke fill markers"/>
-   <path d="m31.508 6.4431.50482-.52388 1.2097 1.705h1.1335l-1.6764-2.3336 1.4764-1.6669h-1.0954l-1.6002 1.8002c.01905-.20955.04763-.4572.04763-.70485v-3.9719h-.96203v6.8771h.96203z" direction="ltr" fill="#5bcefa" style="paint-order:stroke fill markers"/>
-   <path d="m35.613 2.7093c.3429 0 .63818-.25718.63818-.63818 0-.36195-.29528-.62865-.63818-.62865-.3429 0-.63818.2667-.63818.62865 0 .381.29528.63818.63818.63818zm-.48578 4.9149h.97155v-4.0005h-.97155z" direction="ltr" fill="#5bcefa" style="paint-order:stroke fill markers"/>
-  </g>
- </g>
-</svg>
+<svg height="32" viewBox="0 0 37.042 8.4667" width="140" xmlns="http://www.w3.org/2000/svg"><path d="m.79008 7.6242h.96203v-3.3623c0-.35243-.0381-.90488-.0381-.92393.028575.0381.33338.4953.5715.77153l1.6288 1.9622h.1143l1.6288-1.9622c.25718-.28575.56198-.75248.58103-.77153 0 .01905-.0381.5715-.0381.92393v3.3623h.96203v-6.5437h-.10478l-3.0671 3.6195-3.0956-3.6195h-.10478z" fill="#5bcefa"/><path d="m10.086 7.7195c.54293 0 .8382-.20003 1.0382-.381l-.40005-.65723c-.10478.085725-.24765.20955-.50483.20955-.24765 0-.40005-.13335-.40005-.60008v-1.8574h1.0668v-.80963h-1.0668v-1.5431h-.96203v1.5431h-.60008v.80963h.60008v1.8383c0 1.0668.52388 1.4478 1.2287 1.4478z" fill="#f5a9b8"/><path d="m12.134 7.6242h1.0097v-2.6099h2.7432v-.89535h-2.7432v-2.086h3.029v-.88583h-4.0386z"/><path d="m21.364 7.6909h.12382l1.6478-3.8576c.12382-.3048.27622-.762.28575-.78105.0095.028575.13335.47625.2667.78105l1.6097 3.8576h.12382l2.2384-6.5437h-.98108l-1.143 3.4481c-.12382.35243-.25718.89535-.25718.92393-.01905-.05715-.16192-.58103-.3048-.92393l-1.4954-3.5147h-.12382l-1.4859 3.5147c-.1524.36195-.3048.89535-.31432.92393-.0095-.0381-.13335-.5715-.24765-.92393l-1.143-3.4481h-1.0573z" fill="#f5a9b8"/><path d="m28.813 2.7093c.3429 0 .63818-.25718.63818-.63818 0-.36195-.29528-.62865-.63818-.62865s-.63818.2667-.63818.62865c0 .381.29528.63818.63818.63818zm-.48578 4.9149h.97155v-4.0005h-.97155z" fill="#f5a9b8"/><g fill="#5bcefa"><path d="m31.508 6.4431.50482-.52388 1.2097 1.705h1.1335l-1.6764-2.3336 1.4764-1.6669h-1.0954l-1.6002 1.8002c.01905-.20955.04763-.4572.04763-.70485v-3.9719h-.96203v6.8771h.96203z"/><path d="m35.613 2.7093c.3429 0 .63818-.25718.63818-.63818 0-.36195-.29528-.62865-.63818-.62865s-.63818.2667-.63818.62865c0 .381.29528.63818.63818.63818zm-.48578 4.9149h.97155v-4.0005h-.97155z"/></g></svg>
\ No newline at end of file
diff --git a/static/new/mtf-wiki-long.svg b/static/new/mtf-wiki-long.svg
index fae0a783..155fb08f 100644
--- a/static/new/mtf-wiki-long.svg
+++ b/static/new/mtf-wiki-long.svg
@@ -1,13 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1500" height="500" version="1.1" viewBox="0 0 396.88 132.29" xmlns="http://www.w3.org/2000/svg">
- <g direction="ltr" stroke="#000" stroke-width=".52917" aria-label="MtF.wiki">
-  <path d="m21.062 103.82h10.689v-37.359c0-3.9158-.42333-10.054-.42333-10.266.3175.42333 3.7042 5.5033 6.35 8.5725l18.097 21.802h1.27l18.097-21.802c2.8575-3.175 6.2441-8.3608 6.4558-8.5725 0 .21167-.42333 6.35-.42333 10.266v37.359h10.689v-72.707h-1.1642l-34.078 40.217-34.396-40.217h-1.1642z" direction="ltr" fill="#5bcefa"/>
-  <path d="m124.35 104.88c6.0325 0 9.3133-2.2225 11.536-4.2333l-4.445-7.3025c-1.1642.9525-2.7517 2.3283-5.6092 2.3283-2.7517 0-4.445-1.4817-4.445-6.6675v-20.637h11.853v-8.9958h-11.853v-17.145h-10.689v17.145h-6.6675v8.9958h6.6675v20.426c0 11.853 5.8208 16.087 13.652 16.087z" direction="ltr" fill="#f5a9b8"/>
-  <path d="m147.11 103.82h11.218v-28.998h30.48v-9.9483h-30.48v-23.177h33.655v-9.8425h-44.873z" direction="ltr" fill="#fff"/>
-  <path d="m203.31 104.46c3.81 0 7.1966-3.0692 7.1966-7.3025 0-4.2333-3.3867-7.1966-7.1966-7.1966-3.9158 0-7.3025 2.9633-7.3025 7.1966 0 4.2333 3.3866 7.3025 7.3025 7.3025z" direction="ltr" fill="#fff"/>
-  <path d="m229.34 104.88h1.1642l11.43-21.59c1.3758-2.6458 2.6458-6.985 2.7516-7.4083.10584.42333 1.0583 4.7625 2.54 7.4083l11.007 21.59h1.1642l19.473-45.508h-10.689l-7.3025 19.05c-1.27 3.2808-2.6458 8.3608-2.6458 8.3608s-1.5875-5.1858-3.175-8.3608l-9.8425-19.897h-1.0583l-9.525 19.05c-1.6933 3.2808-3.0692 8.3608-3.0692 8.3608s-1.3758-4.9742-2.6458-8.3608l-7.0908-18.203h-11.853z" direction="ltr" fill="#f5a9b8"/>
-  <path d="m293.16 49.213c3.81 0 7.0908-2.8575 7.0908-7.0908 0-4.0217-3.2808-6.985-7.0908-6.985-3.81 0-7.0908 2.9633-7.0908 6.985 0 4.2333 3.2808 7.0908 7.0908 7.0908zm-5.3975 54.61h10.795v-44.45h-10.795z" direction="ltr" fill="#f5a9b8"/>
-  <path d="m323.11 90.699 5.6092-5.8208 13.441 18.944h12.594l-18.627-25.929 16.404-18.521h-12.171l-17.78 20.002c.21167-2.3283.52917-5.08.52917-7.8316v-44.132h-10.689v76.411h10.689z" direction="ltr" fill="#5bcefa"/>
-  <path d="m368.72 49.213c3.81 0 7.0908-2.8575 7.0908-7.0908 0-4.0217-3.2808-6.985-7.0908-6.985s-7.0908 2.9633-7.0908 6.985c0 4.2333 3.2808 7.0908 7.0908 7.0908zm-5.3975 54.61h10.795v-44.45h-10.795z" direction="ltr" fill="#5bcefa"/>
- </g>
-</svg>
+<svg height="500" viewBox="0 0 396.88 132.29" width="1500" xmlns="http://www.w3.org/2000/svg"><g stroke="#000" stroke-width=".52917"><path d="m21.062 103.82h10.689v-37.359c0-3.9158-.42333-10.054-.42333-10.266.3175.42333 3.7042 5.5033 6.35 8.5725l18.097 21.802h1.27l18.097-21.802c2.8575-3.175 6.2441-8.3608 6.4558-8.5725 0 .21167-.42333 6.35-.42333 10.266v37.359h10.689v-72.707h-1.1642l-34.078 40.217-34.396-40.217h-1.1642z" fill="#5bcefa"/><path d="m124.35 104.88c6.0325 0 9.3133-2.2225 11.536-4.2333l-4.445-7.3025c-1.1642.9525-2.7517 2.3283-5.6092 2.3283-2.7517 0-4.445-1.4817-4.445-6.6675v-20.637h11.853v-8.9958h-11.853v-17.145h-10.689v17.145h-6.6675v8.9958h6.6675v20.426c0 11.853 5.8208 16.087 13.652 16.087z" fill="#f5a9b8"/><path d="m147.11 103.82h11.218v-28.998h30.48v-9.9483h-30.48v-23.177h33.655v-9.8425h-44.873z" fill="#fff"/><path d="m203.31 104.46c3.81 0 7.1966-3.0692 7.1966-7.3025s-3.3867-7.1966-7.1966-7.1966c-3.9158 0-7.3025 2.9633-7.3025 7.1966s3.3866 7.3025 7.3025 7.3025z" fill="#fff"/><path d="m229.34 104.88h1.1642l11.43-21.59c1.3758-2.6458 2.6458-6.985 2.7516-7.4083.10584.42333 1.0583 4.7625 2.54 7.4083l11.007 21.59h1.1642l19.473-45.508h-10.689l-7.3025 19.05c-1.27 3.2808-2.6458 8.3608-2.6458 8.3608s-1.5875-5.1858-3.175-8.3608l-9.8425-19.897h-1.0583l-9.525 19.05c-1.6933 3.2808-3.0692 8.3608-3.0692 8.3608s-1.3758-4.9742-2.6458-8.3608l-7.0908-18.203h-11.853z" fill="#f5a9b8"/><path d="m293.16 49.213c3.81 0 7.0908-2.8575 7.0908-7.0908 0-4.0217-3.2808-6.985-7.0908-6.985s-7.0908 2.9633-7.0908 6.985c0 4.2333 3.2808 7.0908 7.0908 7.0908zm-5.3975 54.61h10.795v-44.45h-10.795z" fill="#f5a9b8"/><g fill="#5bcefa"><path d="m323.11 90.699 5.6092-5.8208 13.441 18.944h12.594l-18.627-25.929 16.404-18.521h-12.171l-17.78 20.002c.21167-2.3283.52917-5.08.52917-7.8316v-44.132h-10.689v76.411h10.689z"/><path d="m368.72 49.213c3.81 0 7.0908-2.8575 7.0908-7.0908 0-4.0217-3.2808-6.985-7.0908-6.985s-7.0908 2.9633-7.0908 6.985c0 4.2333 3.2808 7.0908 7.0908 7.0908zm-5.3975 54.61h10.795v-44.45h-10.795z"/></g></g></svg>
\ No newline at end of file
diff --git a/static/new/mtf-wiki-square.svg b/static/new/mtf-wiki-square.svg
index 9000dab4..dbee73c1 100644
--- a/static/new/mtf-wiki-square.svg
+++ b/static/new/mtf-wiki-square.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="512" height="512" version="1.1" viewBox="0 0 135.47 135.47" xmlns="http://www.w3.org/2000/svg">
- <g stroke-width=".26458">
- <g direction="ltr" stroke="#000" aria-label="MtF wiki">
-   <path d="m10.759 71.5h7.1261v-24.906c0-2.6106-.28222-6.7028-.28222-6.8439.21167.28222 2.4694 3.6689 4.2333 5.715l12.065 14.534h.84667l12.065-14.534c1.905-2.1167 4.1628-5.5739 4.3039-5.715 0 .14111-.28222 4.2333-.28222 6.8439v24.906h7.1261v-48.472h-.77611l-22.719 26.811-22.931-26.811h-.77611z" direction="ltr" fill="#5bcefa" stroke-width=".26458"/>
-   <path transform="scale(.26458)" d="m266.53 100.82v43.199h-16.801v22.668h16.801v51.467c0 29.867 14.667 40.533 34.4 40.533 2.3911 0 4.6093-.1393 6.6738-.39258v164h26.934v-33.068l14.133-14.666 33.867 47.734h31.734l-46.934-65.334 41.332-46.666h-30.666l-44.801 50.398c.53334-5.8667 1.334-12.799 1.334-19.732v-111.2h-15.658l-.08399-.13867c-.05404.04422-.11514.09376-.16992.13867h-11.021v5.5137c-.9194.13305-1.8929.21289-2.9414.21289-6.9333 0-11.199-3.7322-11.199-16.799v-52h29.867v-22.668h-29.867v-43.199h-26.934z" direction="ltr" fill="#fffffd" stroke-width="1"/>
-   <g stroke-width=".26458">
-    <path d="m94.79 71.5h7.4789v-19.332h20.32v-6.6322h-20.32v-15.452h22.437v-6.5617h-29.916z" direction="ltr" fill="#f5a9b8"/>
-    <path d="m23.884 112.44h.77611l7.62-14.393c.91722-1.7639 1.7639-4.6567 1.8344-4.9389.07055.28222.70556 3.175 1.6933 4.9389l7.3378 14.393h.77611l12.982-30.339h-7.1261l-4.8683 12.7c-.84667 2.1872-1.7639 5.5739-1.7639 5.5739s-1.0583-3.4572-2.1167-5.5739l-6.5617-13.264h-.70556l-6.35 12.7c-1.1289 2.1872-2.0461 5.5739-2.0461 5.5739s-.91722-3.3161-1.7639-5.5739l-4.7272-12.136h-7.9022z" direction="ltr" fill="#5bcefa"/>
-    <path d="m67.488 75.326c2.54 0 4.7272-1.905 4.7272-4.7272 0-2.6811-2.1872-4.6567-4.7272-4.6567-2.54 0-4.7272 1.9756-4.7272 4.6567 0 2.8222 2.1872 4.7272 4.7272 4.7272zm-3.5983 36.407h7.1967v-29.633h-7.1967z" direction="ltr" fill="#f5a9b8"/>
-    <path d="m116.38 111.73h7.1967v-29.633h-7.1967z" direction="ltr" fill="#f5a9b8"/>
-    <path d="m119.98 75.326c2.54 0 4.7272-1.905 4.7272-4.7272 0-2.6811-2.1872-4.6567-4.7272-4.6567-2.54 0-4.7272 1.9756-4.7272 4.6567 0 2.8222 2.1872 4.7272 4.7272 4.7272z" direction="ltr" fill="#fffffd"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="512" viewBox="0 0 135.47 135.47" width="512" xmlns="http://www.w3.org/2000/svg"><g stroke="#000" stroke-width=".26458"><path d="m10.759 71.5h7.1261v-24.906c0-2.6106-.28222-6.7028-.28222-6.8439.21167.28222 2.4694 3.6689 4.2333 5.715l12.065 14.534h.84667l12.065-14.534c1.905-2.1167 4.1628-5.5739 4.3039-5.715 0 .14111-.28222 4.2333-.28222 6.8439v24.906h7.1261v-48.472h-.77611l-22.719 26.811-22.931-26.811h-.77611z" fill="#5bcefa" stroke-width=".26458"/><path d="m266.53 100.82v43.199h-16.801v22.668h16.801v51.467c0 29.867 14.667 40.533 34.4 40.533 2.3911 0 4.6093-.1393 6.6738-.39258v164h26.934v-33.068l14.133-14.666 33.867 47.734h31.734l-46.934-65.334 41.332-46.666h-30.666l-44.801 50.398c.53334-5.8667 1.334-12.799 1.334-19.732v-111.2h-15.658l-.08399-.13867c-.05404.04422-.11514.09376-.16992.13867h-11.021v5.5137c-.9194.13305-1.8929.21289-2.9414.21289-6.9333 0-11.199-3.7322-11.199-16.799v-52h29.867v-22.668h-29.867v-43.199h-26.934z" fill="#fffffd" stroke-width="1" transform="scale(.26458)"/><g stroke-width=".26458"><path d="m94.79 71.5h7.4789v-19.332h20.32v-6.6322h-20.32v-15.452h22.437v-6.5617h-29.916z" fill="#f5a9b8"/><path d="m23.884 112.44h.77611l7.62-14.393c.91722-1.7639 1.7639-4.6567 1.8344-4.9389.07055.28222.70556 3.175 1.6933 4.9389l7.3378 14.393h.77611l12.982-30.339h-7.1261l-4.8683 12.7c-.84667 2.1872-1.7639 5.5739-1.7639 5.5739s-1.0583-3.4572-2.1167-5.5739l-6.5617-13.264h-.70556l-6.35 12.7c-1.1289 2.1872-2.0461 5.5739-2.0461 5.5739s-.91722-3.3161-1.7639-5.5739l-4.7272-12.136h-7.9022z" fill="#5bcefa"/><path d="m67.488 75.326c2.54 0 4.7272-1.905 4.7272-4.7272 0-2.6811-2.1872-4.6567-4.7272-4.6567s-4.7272 1.9756-4.7272 4.6567c0 2.8222 2.1872 4.7272 4.7272 4.7272zm-3.5983 36.407h7.1967v-29.633h-7.1967z" fill="#f5a9b8"/><path d="m116.38 111.73h7.1967v-29.633h-7.1967z" fill="#f5a9b8"/><path d="m119.98 75.326c2.54 0 4.7272-1.905 4.7272-4.7272 0-2.6811-2.1872-4.6567-4.7272-4.6567s-4.7272 1.9756-4.7272 4.6567c0 2.8222 2.1872 4.7272 4.7272 4.7272z" fill="#fffffd"/></g></g></svg>
\ No newline at end of file