diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 7fb3320dd..92e83bbe5 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -246,12 +246,6 @@
 .icon-form:before{
     content:"$";
 }
-.icon-date:before{
-    content:"7";
-}
-.icon-form:before{
-    content:"$";
-}
 .icon.text-replace{
     font-size:0em;
     line-height:0;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index c5d6b5cc5..7d7860a83 100755
Binary files a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot differ
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
index f25359ec6..dcfa5a08c 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -6,7 +6,6 @@
 <font id="wagtail" horiz-adv-x="512">
 <font-face units-per-em="512" ascent="480" descent="-32" />
 <missing-glyph horiz-adv-x="512" />
-<<<<<<< HEAD
 <glyph unicode="&#x20;" d="" horiz-adv-x="256" />
 <glyph unicode="&#x21;" d="M499 33c4-6 4-12 0-18-3-5-8-8-15-8 0 0-457 0-457 0-6 0-11 3-14 8-4 6-4 12-1 18 0 0 228 400 228 400 3 6 8 9 16 9 7 0 12-3 15-9 0 0 228-400 228-400zM284 58c0 0 0 51 0 51s-56 0-56 0c0 0 0-51 0-51 0 0 56 0 56 0zM284 147c0 0 0 154 0 154s-56 0-56 0c0 0 0-154 0-154 0 0 56 0 56 0z" />
 <glyph unicode="&#x24;" d="M51.015 429.196v-409.778h409.777v409.777h-409.777zM176.358 84.156h-82.644v42.699h150.825v-42.699zM396.055 299.719h-302.339v64.050h301.651v-64.050zM395.365 184.017h-301.651v64.049h301.651v-64.049z" />
@@ -72,72 +71,4 @@
 <glyph unicode="&#x78;" d="M477 318c0-7-2-14-8-19l-245-246c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z" />
 <glyph unicode="&#x79;" d="M392 110c70-24 105-45 105-62 0 0 0-54 0-54 0 0-241 0-241 0 0 0-241 0-241 0 0 0 0 54 0 54 0 17 35 38 105 62 32 12 54 24 65 36 12 12 18 28 18 48 0 8-4 16-12 25-7 10-12 22-16 38-1 4-2 7-5 9-2 2-4 3-7 4-2 1-4 4-7 9-2 5-4 12-4 22 0 5 0 10 2 13 2 4 3 6 5 6 0 0 2 2 2 2-3 17-5 32-6 45-2 19 5 38 21 58 15 19 42 29 80 29 38 0 65-10 81-29 16-20 22-39 20-58 0 0-6-45-6-45 6-2 9-10 9-21 0-10-2-17-4-22-3-5-5-8-7-9-3-1-5-2-7-4-3-2-4-5-5-9-3-17-8-29-16-38-8-9-12-17-12-25 0-20 6-36 18-48 12-12 34-24 65-36z" />
 <glyph unicode="&#x7a;" d="M344 325c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3s-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3s5-1 7-3l14-14c2-2 3-4 3-6z" />
-</font></defs></svg>
-=======
-
-<glyph unicode="&#97;" d="M239 256c0 19-7 35-20 48-13 14-29 20-48 20-19 0-35-6-49-20-13-13-20-29-20-48 0-19 7-35 20-48 14-14 30-20 49-20 19 0 35 6 48 20 13 13 20 29 20 48z m205-137c0 10-4 18-10 24-7 7-15 11-24 11-10 0-18-4-24-11-7-6-11-14-11-24 0-9 4-17 10-24 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 24z m0 274c0 9-4 17-10 24-7 6-15 10-24 10-10 0-18-4-24-10-7-7-11-15-11-24 0-10 4-18 10-25 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 25z m-103-113l0-49c0-2 0-4-2-5-1-2-2-3-4-3l-41-6c-2-7-5-13-9-21 6-8 14-18 24-30 2-2 2-4 2-6 0-2 0-4-2-5-4-5-11-13-22-24-10-10-17-16-21-16-2 0-3 1-5 2l-31 24c-6-3-13-6-20-8-2-19-4-33-7-41-1-5-3-7-8-7l-49 0c-2 0-4 1-5 2-2 2-3 3-3 5l-6 41c-6 2-13 4-20 8l-32-24c-1-1-3-2-5-2-2 0-4 1-6 3-25 23-38 37-38 42 0 2 1 4 2 5 2 3 5 8 11 14 5 7 9 13 12 17-4 8-7 15-9 22l-41 6c-1 0-3 1-4 3-1 1-2 3-2 5l0 49c0 2 1 4 2 5 1 2 3 3 4 3l41 6c2 7 5 13 9 21-6 8-14 18-24 30-1 2-2 4-2 6 0 2 1 4 2 5 4 5 11 13 22 24 11 10 18 16 21 16 2 0 4-1 6-2l30-24c6 3 13 6 21 8 2 19 4 33 6 41 1 5 4 7 8 7l49 0c2 0 4-1 6-2 1-2 2-3 2-5l7-41c6-2 12-4 20-8l31 24c1 1 3 2 5 2 2 0 4-1 6-3 26-23 38-37 38-42 0-2 0-4-1-5-3-3-6-8-12-15-5-6-9-12-12-16 4-8 7-16 9-22l41-6c2 0 3-1 4-3 2-1 2-3 2-5z m171-142l0-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8l0 37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 3 10 6 15 9 5 3 8 5 8 5 2 0 6-5 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8z m0 273l0-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8l0 37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 4 10 7 15 9 5 3 8 5 8 5 2 0 6-4 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8z"/>
-<glyph unicode="&#98;" d="M439 293l0-229c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l155 0 0-155c0-8 3-14 8-19 5-6 12-8 19-8z m-1 36l-145 0 0 146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z"/>
-<glyph unicode="&#99;" d="M110 73l292 0 0 220-119 0c-7 0-14 2-19 8-5 5-8 11-8 19l0 119-146 0z m183 256l107 0c-2 6-4 10-6 12l-90 89c-2 3-6 5-11 7z m146-9l0-256c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l182 0c8 0 16-1 26-5 9-4 16-9 21-14l89-89c6-5 10-13 14-22 4-9 6-17 6-25z"/>
-<glyph unicode="&#100;" d="M140 73l26 26-67 67-26-26 0-30 37 0 0-37z m150 265c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5z m-16 55l119-119-238-237-118 0 0 118z m195-27c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z"/>
-<glyph unicode="&#101;" d="M399 174c0-3-1-5-3-7l-15-14c-1-2-4-3-6-3-3 0-5 1-7 3l-112 112-112-112c-2-2-4-3-7-3-2 0-5 1-6 3l-15 14c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
-<glyph unicode="&#102;" d="M347 274c0 36-12 66-37 91-25 25-55 37-91 37-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90z m147-237c0-10-4-19-11-26-7-7-16-11-26-11-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z"/>
-<glyph unicode="&#103;" d="M426 134c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z"/>
-<glyph unicode="&#105;" d="M475 247c0 6-5 9-14 9l-290 0c-7 0-15-2-23-6-8-4-15-8-19-14l-79-97c-3-4-4-7-4-10 0-6 4-10 14-10l290 0c7 0 15 2 23 6 8 4 14 9 19 14l78 97c3 4 5 8 5 11z m-304 43l204 0 0 43c0 7-2 13-7 18-5 5-11 7-18 7l-154 0c-7 0-13 3-18 8-5 5-7 11-7 18l0 17c0 7-3 13-8 18-5 5-11 8-18 8l-85 0c-7 0-13-3-18-8-5-5-8-11-8-18l0-227 68 84c8 9 19 17 31 23 13 6 26 9 38 9z m338-43c0-11-4-22-12-32l-79-97c-8-10-18-17-31-23-13-7-25-10-37-10l-290 0c-17 0-31 6-42 18-12 12-18 26-18 42l0 256c0 16 6 30 18 42 11 12 25 18 42 18l85 0c16 0 30-6 42-18 12-12 18-26 18-42l0-8 145 0c16 0 30-6 42-18 12-12 18-26 18-42l0-43 51 0c9 0 18-2 26-6 8-5 14-11 18-19 3-6 4-12 4-18z"/>
-<glyph unicode="&#106;" d="M494 338l0-201c0-17-7-32-19-45-13-13-28-19-45-19l-348 0c-17 0-32 6-45 19-12 13-19 28-19 45l0 274c0 18 7 33 19 46 13 12 28 18 45 18l92 0c17 0 32-6 45-18 12-13 19-28 19-46l0-9 192 0c17 0 32-6 45-19 12-12 19-27 19-45z"/>
-<glyph unicode="&#107;" d="M512 309l0-227c0-12-4-23-13-32-9-9-20-13-33-13l-420 0c-13 0-24 4-33 13-9 9-13 20-13 32l0 227c8-9 18-17 29-25 69-47 116-79 142-98 11-8 20-15 26-19 7-4 16-9 27-14 12-4 22-7 32-7l0 0c10 0 20 3 32 7 11 5 20 10 27 14 6 4 15 11 26 19 33 23 80 56 142 98 11 8 21 16 29 25z m0 84c0-15-5-29-14-43-9-14-21-25-35-35-71-50-116-81-134-93-1-1-6-4-12-9-6-4-11-8-15-11-4-2-9-5-15-9-6-3-11-6-16-8-6-1-10-2-15-2l0 0c-5 0-9 1-15 2-5 2-10 5-16 8-6 4-11 7-15 9-4 3-9 7-15 11-6 5-11 8-12 9-18 12-43 30-75 52-33 23-52 36-59 41-12 8-23 19-33 33-11 14-16 27-16 39 0 15 4 27 12 37 8 10 19 15 34 15l420 0c13 0 23-5 32-14 9-9 14-19 14-32z"/>
-<glyph unicode="&#108;" d="M347 421c0-5-1-10-5-13-4-4-8-6-13-6l-36 0 0-292 36 0c5 0 9-2 13-6 4-3 5-8 5-13 0-5-1-9-5-12l-73-74c-4-3-8-5-13-5-5 0-9 2-13 5l-73 74c-4 3-5 7-5 12 0 5 1 10 5 13 4 4 8 6 13 6l36 0 0 292-36 0c-5 0-9 2-13 6-4 3-5 8-5 13 0 5 1 9 5 12l73 74c4 3 8 5 13 5 5 0 9-2 13-5l73-74c4-3 5-7 5-12z"/>
-<glyph unicode="&#109;" d="M183 293l146 0 0 54c0 21-7 38-21 52-15 14-32 22-52 22-20 0-37-8-52-22-14-14-21-31-21-52z m238-28l0-164c0-8-3-15-8-20-6-5-12-8-20-8l-274 0c-8 0-14 3-20 8-5 5-8 12-8 20l0 164c0 8 3 14 8 20 6 5 12 8 20 8l9 0 0 54c0 35 13 66 38 91 25 25 55 37 90 37 35 0 65-12 90-37 25-25 38-56 38-91l0-54 9 0c8 0 14-3 20-8 5-6 8-12 8-20z"/>
-<glyph unicode="&#110;" d="M335 238c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
-<glyph unicode="&#104;" d="M366 174l0-19c0-2-1-4-3-6-2-2-4-3-6-3l-202 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 19c0 2 1 5 3 6 2 2 4 3 6 3l202 0c2 0 4-1 6-3 2-1 3-4 3-6z m0 73l0-18c0-3-1-5-3-7-2-2-4-3-6-3l-202 0c-2 0-4 1-6 3-2 2-3 4-3 7l0 18c0 3 1 5 3 6 2 2 4 3 6 3l202 0c2 0 4-1 6-3 2-1 3-3 3-6z m-256-174l292 0 0 220-119 0c-7 0-14 2-19 8-5 5-8 11-8 19l0 119-146 0z m183 256l107 0c-2 6-4 10-6 12l-90 89c-2 3-6 5-11 7z m146-9l0-256c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l182 0c8 0 16-1 26-5 9-4 16-9 21-14l89-89c6-5 10-13 14-22 4-9 6-17 6-25z"/>
-<glyph unicode="&#111;" d="M171 341c0-14-5-26-15-36-10-10-22-15-37-15-14 0-26 5-36 15-10 10-15 22-15 36 0 15 5 27 15 37 10 10 22 15 36 15 15 0 27-5 37-15 10-10 15-22 15-37z m273-102l0-120-376 0 0 52 86 85 42-43 137 137z m25 188l-426 0c-3 0-5-1-6-3-2-2-3-4-3-6l0-324c0-2 1-4 3-6 1-2 3-3 6-3l426 0c3 0 5 1 6 3 2 2 3 4 3 6l0 324c0 2-1 4-3 6-1 2-3 3-6 3z m43-9l0-324c0-12-4-22-13-30-8-9-18-13-30-13l-426 0c-12 0-22 4-30 13-9 8-13 18-13 30l0 324c0 12 4 22 13 30 8 9 18 13 30 13l426 0c12 0 22-4 30-13 9-8 13-18 13-30z"/>
-<glyph unicode="&#112;" d="M494 347l0-73c0-5-2-9-6-13-3-3-8-5-13-5l-18 0c-5 0-9 2-13 5-3 4-5 8-5 13l0 73c0 21-7 38-22 52-14 14-31 22-51 22-20 0-38-8-52-22-14-14-21-31-21-52l0-54 27 0c8 0 14-3 19-8 6-6 8-12 8-20l0-164c0-8-2-15-8-20-5-5-11-8-19-8l-274 0c-8 0-14 3-20 8-5 5-8 12-8 20l0 164c0 8 3 14 8 20 6 5 12 8 20 8l192 0 0 54c0 36 12 66 37 91 25 25 55 37 91 37 35 0 65-12 90-37 25-25 38-55 38-91z"/>
-<glyph unicode="&#113;" d="M399 302c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l15 15c1 1 4 2 6 2 3 0 5-1 7-2l112-113 112 113c2 1 4 2 7 2 2 0 5-1 6-2l15-15c2-2 3-4 3-6z"/>
-<glyph unicode="&#114;" d="M366 119l0 18c0 3-1 5-3 7-2 1-4 2-6 2l-202 0c-2 0-4-1-6-2-2-2-3-4-3-7l0-18c0-3 1-5 3-7 2-1 4-2 6-2l202 0c2 0 4 1 6 2 2 2 3 4 3 7z m0 73l0 18c0 3-1 5-3 7-2 2-4 2-6 2l-202 0c-2 0-4 0-6-2-2-2-3-4-3-7l0-18c0-3 1-5 3-7 2-1 4-2 6-2l202 0c2 0 4 1 6 2 2 2 3 4 3 7z m73 101l0-229c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l155 0 0-155c0-8 3-14 8-19 5-6 12-8 19-8z m-1 36l-145 0 0 146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z"/>
-<glyph unicode="&#115;" d="M457 137l0 201c0 8-3 14-8 20-5 5-12 8-19 8l-201 0c-8 0-15 2-20 8-5 5-8 12-8 19l0 18c0 8-3 15-8 20-5 5-12 8-19 8l-92 0c-7 0-14-3-19-8-5-5-8-12-8-20l0-274c0-7 3-14 8-19 5-6 12-8 19-8l348 0c7 0 14 2 19 8 5 5 8 12 8 19z m37 201l0-201c0-17-7-32-19-45-13-13-28-19-45-19l-348 0c-17 0-32 6-45 19-12 13-19 28-19 45l0 274c0 18 7 33 19 46 13 12 28 18 45 18l92 0c17 0 32-6 45-18 12-13 19-28 19-46l0-9 192 0c17 0 32-6 45-19 12-12 19-27 19-45z"/>
-<glyph unicode="&#116;" d="M457 302l0-55c0-8-3-14-8-20-5-5-12-8-19-8l-119 0 0-118c0-8-3-15-8-20-5-5-12-8-20-8l-54 0c-8 0-15 3-20 8-5 5-8 12-8 20l0 118-119 0c-7 0-14 3-19 8-5 6-8 12-8 20l0 55c0 7 3 14 8 19 5 5 12 8 19 8l119 0 0 119c0 8 3 14 8 19 5 6 12 8 20 8l54 0c8 0 15-2 20-8 5-5 8-11 8-19l0-119 119 0c7 0 14-3 19-8 5-5 8-12 8-19z"/>
-<glyph unicode="&#117;" d="M165 384c0 10-4 19-11 26-7 7-16 11-26 11-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26z m304-165c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33l0 119c0 10 3 18 10 26 8 7 16 10 26 10l119 0c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z"/>
-<glyph unicode="&#118;" d="M501 241c0-5-3-11-8-18l-90-105c-7-9-18-17-32-23-14-7-26-10-38-10l-290 0c-6 0-12 1-16 4-5 2-8 6-8 11 0 6 3 12 9 18l89 105c8 10 19 17 32 24 14 6 27 9 39 9l290 0c6 0 11-1 16-3 5-3 7-7 7-12z m-91 92l0-43-222 0c-17 0-34-4-53-13-18-8-33-19-44-31l-89-106-2-2c0 1 0 2 0 4 0 1 0 2 0 3l0 256c0 16 6 30 18 42 11 12 25 18 42 18l85 0c16 0 30-6 42-18 12-12 18-26 18-42l0-8 145 0c16 0 30-6 42-18 12-12 18-26 18-42z"/>
-<glyph unicode="&#119;" d="M329 256c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52z m146 31l0-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8l-64 0c-2 0-5 0-7 2-2 2-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3-3 0-5 1-7 3-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7l0 63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8l64 0c2 0 5 0 7-2 2-2 3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3 3 0 5-1 7-3 25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z"/>
-<glyph unicode="&#120;" d="M477 350c0-7-2-14-8-19l-206-207-39-39c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z"/>
-<glyph unicode="&#122;" d="M344 357c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l14-14c2-2 3-4 3-6z"/>
-<glyph unicode="&#65;" d="M232 141l176 175c3 4 5 8 5 13 0 5-2 9-5 13l-29 29c-4 4-8 6-13 6-5 0-10-2-13-6l-134-133-60 60c-3 4-8 5-13 5-5 0-9-1-13-5l-29-29c-3-4-5-8-5-13 0-5 2-9 5-13l103-102c3-4 7-6 12-6 5 0 10 2 13 6z m243 252l0-274c0-23-8-42-24-58-16-16-35-24-58-24l-274 0c-23 0-42 8-58 24-16 16-24 35-24 58l0 274c0 23 8 42 24 58 16 16 35 24 58 24l274 0c23 0 42-8 58-24 16-16 24-35 24-58z"/>
-<glyph unicode="&#66;" d="M384 238l0 36c0 5-2 10-5 13-4 4-8 6-13 6l-73 0 0 73c0 5-2 9-6 13-3 3-8 5-13 5l-36 0c-5 0-10-2-13-5-4-4-6-8-6-13l0-73-73 0c-5 0-9-2-13-6-3-3-5-8-5-13l0-36c0-5 2-10 5-13 4-4 8-6 13-6l73 0 0-73c0-5 2-9 6-13 3-3 8-5 13-5l36 0c5 0 10 2 13 5 4 4 6 8 6 13l0 73 73 0c5 0 9 2 13 6 3 3 5 8 5 13z m91 18c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#68;" d="M173 54c-80 23-309 124-49 458 140-95 194-179 204-248-67-24-113-71-107-156-37 87-66 208-78 283-6-88 7-244 30-337m89-21c-19 53-59 228 241 219 9-275-137-265-202-246 27 53 62 101 106 141-54-30-103-68-145-114"/>
-<glyph unicode="&#67;" d="M213 77c15-6 28-9 40-9 25 0 46 4 62 12 16 8 28 19 35 32 7 14 11 31 11 52 0 22-4 39-12 51-11 18-24 30-40 36-15 7-39 10-71 10-14 0-23-1-29-3l0-41 0-50 1-77c0-3 1-7 3-13z m-4 214c9-2 19-2 32-2 33 0 58 6 75 18 17 13 25 34 25 64 0 21-8 39-24 54-16 14-40 21-73 21-10 0-22-1-37-4 0-8 0-15 1-22 1-23 2-50 1-79l0-28c0-9 0-16 0-22z m-154-254l0 26c9 2 15 3 20 4 15 2 26 5 35 9 3 5 5 10 6 14 2 13 3 31 3 56l-1 142c-1 48-2 87-3 115 0 17-1 27-3 31 0 1-1 2-3 4-4 2-10 3-20 4-6 0-16 2-32 4l-2 23 75 2 108 4 13 0c1 0 2 0 4 0 2 0 3 0 4 0 0 0 2 0 6 0 4 0 8 0 12 0l21 0c17 0 35-2 55-8 8-2 17-6 27-11 11-5 21-12 29-21 9-9 15-19 19-30 4-11 6-23 6-35 0-13-3-26-9-37-7-11-16-21-28-30-5-3-19-11-42-22 33-7 59-21 76-41 17-20 26-43 26-68 0-14-3-30-8-46-4-12-11-23-20-33-13-14-26-24-40-31-14-7-34-13-58-17-16-3-35-4-57-3l-56 1c-16 0-45-1-85-3-7-1-33-2-78-3z"/>
-<glyph unicode="&#69;" d="M110 37l5 24c0 1 8 3 22 6 14 4 25 7 33 11 5 7 9 17 11 29l8 40 16 76 4 19c1 8 3 16 4 24 2 8 4 14 5 19 1 5 3 9 4 13 1 4 1 7 2 9 1 2 1 3 1 3l8 45 5 18 6 39 3 14 0 11c-8 4-22 7-42 8-5 0-9 1-10 1l5 29 91-4c7 0 14 0 20 0 13 0 33 1 62 2 6 1 12 1 19 2 7 0 10 0 10 0 0-3-1-7-1-10-2-6-3-11-4-15-11-4-21-7-31-9-12-3-22-6-29-9-2-6-5-14-7-25-2-8-3-16-4-23-8-38-14-67-19-88l-17-89-11-45-12-67-4-13c0-1 0-4 1-7 12-3 23-5 34-6 7-1 13-2 19-3-1-6-1-11-2-17-2-6-3-10-3-12-3 0-6 0-7 0-4 0-8 0-12 0-1 0-4 0-8 0-3 1-17 3-41 5l-57 1c-7 0-24-1-49-3-14-2-24-2-28-3z"/>
-<glyph unicode="&#70;" d="M110 110c0-16-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 23-16 39 0 15 5 28 16 39 11 10 24 16 39 16 15 0 28-6 39-16 10-11 16-24 16-39z m0 146c0-15-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 24-16 39 0 15 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-24 16-39z m402-119l0-55c0-2-1-4-3-6-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 55c0 3 1 5 3 7 2 1 4 2 6 2l348 0c2 0 4-1 6-2 2-2 3-4 3-7z m-402 265c0-15-6-28-16-39-11-10-24-16-39-16-15 0-28 6-39 16-11 11-16 24-16 39 0 16 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-23 16-39z m402-119l0-54c0-3-1-5-3-7-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 7l0 54c0 3 1 5 3 7 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-7z m0 147l0-55c0-3-1-5-3-7-2-1-4-2-6-2l-348 0c-2 0-4 1-6 2-2 2-3 4-3 7l0 55c0 2 1 4 3 6 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-6z"/>
-<glyph unicode="&#71;" d="M109 49c0-15-5-27-16-36-10-9-23-13-38-13-21 0-37 6-50 19l17 25c9-9 19-13 30-13 6 0 10 2 14 4 5 3 7 7 7 12 0 13-10 18-30 16l-8 16c2 2 5 6 9 13 5 6 9 11 13 15 3 4 7 8 10 11l0 1c-3 0-8-1-14-1-6 0-11 0-14 0l0-15-30 0 0 43 95 0 0-25-27-33c10-2 18-7 23-14 6-7 9-15 9-25z m0 179l0-45-103 0c-1 7-2 12-2 15 0 10 3 19 7 27 4 8 10 14 16 19 6 5 13 10 19 14 6 4 12 8 16 12 5 4 7 9 7 13 0 5-2 9-4 11-3 3-7 4-12 4-8 0-16-6-23-17l-24 17c5 10 11 18 20 23 9 5 20 8 31 8 13 0 25-4 35-12 9-8 14-18 14-32 0-9-3-18-10-26-6-8-13-14-21-18-8-5-15-10-22-15-6-5-10-10-10-15l36 0 0 17z m403-91l0-55c0-2-1-4-3-6-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 55c0 3 1 5 3 7 2 1 4 2 6 2l348 0c2 0 4-1 6-2 2-2 3-4 3-7z m-402 257l0-28-96 0 0 28 31 0c0 8 0 19 0 35 0 15 0 27 0 34l0 4-1 0c-1-3-6-9-14-16l-20 22 39 36 30 0 0-115z m402-111l0-54c0-3-1-5-3-7-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 7l0 54c0 3 1 5 3 7 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-7z m0 147l0-55c0-3-1-5-3-7-2-1-4-2-6-2l-348 0c-2 0-4 1-6 2-2 2-3 4-3 7l0 55c0 2 1 4 3 6 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-6z"/>
-<glyph unicode="&#72;" d="M475 256c0-30-5-58-17-85-12-27-27-51-47-70-19-20-43-35-70-47-27-12-55-17-85-17-33 0-64 6-93 20-30 14-55 34-76 59-1 2-2 4-2 6 0 3 1 4 3 6l39 39c2 2 4 3 7 3 3 0 5-2 7-3 13-19 31-33 51-42 20-10 41-15 64-15 20 0 39 4 57 11 18 8 33 18 46 32 14 13 24 28 32 46 7 18 11 37 11 57 0 20-4 39-11 57-8 18-18 33-32 46-13 14-28 24-46 32-18 7-37 11-57 11-19 0-37-3-54-10-17-7-32-16-45-29l39-39c6-6 7-13 4-20-4-8-9-11-17-11l-128 0c-5 0-9 1-13 5-4 4-5 8-5 13l0 128c0 8 3 13 11 17 7 3 14 2 20-4l37-37c20 19 44 34 70 45 26 10 53 15 81 15 30 0 58-5 85-17 27-12 51-27 70-47 20-19 35-43 47-70 12-27 17-55 17-85z"/>
-<glyph unicode="&#73;" d="M475 439l0-128c0-5-1-9-5-13-4-4-8-5-13-5l-128 0c-8 0-13 3-17 11-3 7-2 14 4 20l40 39c-28 26-62 39-100 39-20 0-39-4-57-11-18-8-33-18-46-32-14-13-24-28-32-46-7-18-11-37-11-57 0-20 4-39 11-57 8-18 18-33 32-46 13-14 28-24 46-32 18-7 37-11 57-11 23 0 44 5 64 15 20 9 38 23 51 42 2 1 4 3 7 3 3 0 5-1 7-3l39-39c2-2 3-3 3-6 0-2-1-4-2-6-21-25-46-45-76-59-29-14-60-20-93-20-30 0-58 5-85 17-27 12-51 27-70 47-20 19-35 43-47 70-12 27-17 55-17 85 0 30 5 58 17 85 12 27 27 51 47 70 19 20 43 35 70 47 27 12 55 17 85 17 28 0 55-5 81-15 26-11 50-26 70-45l37 37c6 6 12 7 20 4 8-4 11-9 11-17z"/>
-<glyph unicode="&#74;" d="M434 165c0 7-2 14-8 19l-59 59c-5 6-12 8-20 8-8 0-14-3-20-9 0 0 2-2 5-5 3-3 5-5 6-6 1-1 3-3 5-6 2-2 3-4 3-7 1-2 1-5 1-8 0-7-2-14-8-19-5-5-11-8-19-8-3 0-5 0-8 1-2 1-5 2-7 4-3 1-4 3-6 4-1 1-3 3-6 6-3 3-4 5-5 5-6-5-9-12-9-20 0-8 2-15 8-20l58-59c6-5 12-8 20-8 7 0 14 3 19 8l42 41c6 6 8 12 8 20z m-201 201c0 8-2 14-8 19l-58 60c-6 5-12 8-20 8-7 0-14-3-19-8l-42-42c-6-5-8-12-8-19 0-8 2-14 8-19l59-60c5-5 12-8 20-8 8 0 14 3 20 9 0 1-2 3-5 6-3 3-5 5-6 6-1 1-3 3-5 5-2 3-3 5-3 7-1 3-1 5-1 8 0 8 2 14 8 20 5 5 11 8 19 8 3 0 5-1 8-1 2-1 5-2 7-4 3-2 4-3 6-4 1-1 3-3 6-6 3-3 4-5 5-6 6 6 9 13 9 21z m256-201c0-23-8-43-24-58l-42-42c-16-16-35-24-58-24-23 0-43 8-58 24l-59 60c-16 15-24 35-24 58 0 23 8 43 25 59l-25 25c-16-16-36-25-59-25-23 0-43 8-59 24l-59 60c-16 16-24 35-24 58 0 23 8 42 24 58l42 42c16 16 35 23 58 23 23 0 43-8 58-24l59-59c16-16 24-35 24-58 0-23-8-43-25-60l25-25c16 17 36 25 59 25 23 0 43-8 59-24l59-59c16-16 24-36 24-58z"/>
-<glyph unicode="&#75;" d="M475 256c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#76;" d="M256 411c-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78 0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20z m219-155c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#77;" d="M479 165c0-11-4-19-11-26l-21-22c-8-7-16-10-26-10-11 0-19 3-26 10l-139 139-139-139c-7-7-15-10-26-10-10 0-18 3-25 10l-22 22c-7 7-11 15-11 26 0 10 4 18 11 26l186 186c7 7 16 10 26 10 10 0 19-3 26-10l186-186c7-8 11-16 11-26z"/>
-<glyph unicode="&#78;" d="M479 311c0-10-4-19-11-26l-186-186c-7-7-16-11-26-11-10 0-19 4-26 11l-186 186c-7 7-11 16-11 26 0 10 4 19 11 26l21 21c8 7 17 11 26 11 11 0 19-4 26-11l139-139 139 139c7 7 15 11 26 11 9 0 18-4 26-11l21-21c7-8 11-16 11-26z"/>
-<glyph unicode="&#79;" d="M158 256c-29-1-52-12-71-34l-35 0c-15 0-27 3-37 11-10 7-15 17-15 31 0 63 11 94 33 94 1 0 5-1 12-5 6-4 15-8 26-12 10-3 21-5 31-5 12 0 24 2 36 6-1-7-1-13-1-18 0-24 7-47 21-68z m286-170c0-21-7-38-20-50-13-13-30-19-51-19l-234 0c-21 0-38 6-51 19-13 12-20 29-20 50 0 10 1 19 1 28 1 9 2 18 4 29 2 10 4 20 7 29 3 9 7 17 11 26 5 8 11 15 17 21 6 6 14 11 23 15 9 3 19 5 30 5 1 0 5-2 11-6 6-4 12-8 19-13 8-4 17-9 29-12 12-4 24-6 36-6 12 0 24 2 36 6 12 3 21 8 29 12 7 5 13 9 19 13 6 4 10 6 11 6 11 0 21-2 30-5 9-4 17-9 23-15 6-6 12-13 17-21 4-9 8-17 11-26 3-9 5-19 7-29 2-11 3-20 4-29 0-9 1-18 1-28z m-273 341c0-19-7-35-20-49-14-13-30-20-49-20-18 0-35 7-48 20-13 14-20 30-20 49 0 19 7 35 20 48 13 13 30 20 48 20 19 0 35-7 49-20 13-13 20-29 20-48z m187-103c0-28-10-52-30-72-20-20-44-30-72-30-28 0-52 10-72 30-20 20-30 44-30 72 0 29 10 53 30 73 20 20 44 30 72 30 28 0 52-10 72-30 20-20 30-44 30-73z m154-60c0-14-5-24-15-31-10-8-22-11-37-11l-35 0c-19 22-42 33-71 34 14 21 21 44 21 68 0 5 0 11-1 18 12-4 24-6 36-6 10 0 21 2 31 5 11 4 20 8 26 12 7 4 11 5 12 5 22 0 33-31 33-94z m-34 163c0-19-7-35-20-49-13-13-30-20-48-20-19 0-35 7-49 20-13 14-20 30-20 49 0 19 7 35 20 48 14 13 30 20 49 20 18 0 35-7 48-20 13-13 20-29 20-48z"/>
-<glyph unicode="&#80;" d="M375 256c0-7-3-12-9-16l-156-91c-3-2-6-3-9-3-3 0-6 1-9 3-6 3-9 9-9 16l0 182c0 7 3 13 9 16 6 4 12 4 18 0l156-91c6-4 9-9 9-16z m36 0c0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78z m64 0c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#81;" d="M238 366c0 15-6 28-16 39-11 10-24 16-39 16-15 0-28-6-39-16-11-11-16-24-16-39 0-8 2-16 5-24-7 4-15 5-23 5-16 0-28-5-39-16-11-10-16-23-16-38 0-16 5-29 16-39 11-11 23-16 39-16 15 0 28 5 39 16 10 10 16 23 16 39 0 8-2 15-6 23 8-3 16-5 24-5 15 0 28 5 39 16 10 11 16 23 16 39z m243-201c0-4-5-10-14-19-9-10-16-14-19-14-2 0-4 1-8 4-4 3-7 6-11 10-3 3-6 7-11 11-4 5-6 7-7 8l-27-28 63-63c5-5 8-12 8-19 0-8-4-16-11-23-8-8-15-11-23-11-8 0-15 2-20 8l-192 191c-33-25-68-37-104-37-31 0-56 10-76 29-19 20-29 45-29 76 0 30 9 60 27 89 18 30 42 53 71 71 29 18 59 27 89 27 31 0 57-9 76-29 20-19 30-45 30-76 0-36-13-70-38-104l102-101 27 27c-1 1-3 3-7 7-5 4-9 8-12 11-3 3-6 7-9 10-3 4-5 7-5 9 0 3 5 9 14 18 9 10 16 14 19 14 2 0 5-1 7-2 1-2 5-6 13-13 7-7 15-15 23-23 8-8 16-16 25-24 8-9 15-16 21-23 5-6 8-10 8-11z"/>
-<glyph unicode="&#121;" d="M392 142c70-24 105-45 105-62 0 0 0-54 0-54 0 0-241 0-241 0 0 0-241 0-241 0 0 0 0 54 0 54 0 17 35 38 105 62 32 12 54 24 65 36 12 12 18 28 18 48 0 8-4 16-12 25-7 10-12 22-16 38-1 4-2 7-5 9-2 2-4 3-7 4-2 1-4 4-7 9-2 5-4 12-4 22 0 5 0 10 2 13 2 4 3 6 5 6 0 0 2 2 2 2-3 17-5 32-6 45-2 19 5 38 21 58 15 19 42 29 80 29 38 0 65-10 81-29 16-20 22-39 20-58 0 0-6-45-6-45 6-2 9-10 9-21 0-10-2-17-4-22-3-5-5-8-7-9-3-1-5-2-7-4-3-2-4-5-5-9-3-17-8-29-16-38-8-9-12-17-12-25 0-20 6-36 18-48 12-12 34-24 65-36"/>
-<glyph unicode="&#82;" d="M440 389l-188 0c-10 12-20 25-23 28-2 6-8 10-14 10l-75 0c-5 0-9-3-13-6l-25-32-30 0c-16 0-28-13-28-28l0-248c0-15 12-28 28-28l368 0c16 0 28 13 28 28l0 248c0 15-12 28-28 28z"/>
-<glyph unicode="&#84;" d="M421 137c0 12-4 23-12 33-9 10-19 15-30 15-10 0-18-3-24-10-5-7-8-16-8-27 0-11 3-20 10-27 7-8 17-11 30-11 9 0 17 2 24 7 7 6 10 12 10 20z m-174-36c0-3-1-5-3-7l-91-91c-2-2-4-3-7-3-2 0-4 1-6 3l-92 91c-3 3-3 6-2 10 2 4 5 6 9 6l55 0 0 393c0 3 1 5 2 6 2 2 4 3 7 3l55 0c2 0 5-1 6-3 2-1 3-3 3-6l0-393 55 0c2 0 5-1 6-3 2-2 3-4 3-6z m214 19c0-12-1-23-4-34-2-12-6-23-11-33-6-10-12-19-20-27-7-8-17-14-28-19-11-5-23-7-36-7-12 0-22 2-31 5-5 1-9 3-12 4l11 32c3-1 6-2 9-3 7-2 14-4 21-4 16 0 29 6 39 17 9 11 16 25 19 42l-1 0c-4-5-10-8-17-11-8-3-16-4-25-4-20 0-36 7-49 20-13 14-19 30-19 50 0 20 7 37 20 51 14 13 31 20 52 20 24 0 43-9 59-27 15-18 23-42 23-72z m-8 205l0-32-134 0 0 32 47 0 0 124c0 1 0 3 0 5 1 2 1 4 1 5l0 4-1 0-2-3c-2-2-4-5-7-9l-18-16-24 24 55 53 35 0 0-187z"/>
-<glyph unicode="&#87;" d="M421 229l0-138c0-5-2-9-6-12-3-4-8-6-13-6l-109 0 0 110-74 0 0-110-109 0c-5 0-10 2-13 6-4 3-6 7-6 12l0 138c0 0 0 0 1 0 0 1 0 1 0 1l164 136 164-136c0 0 1-1 1-1z m63 19l-17-21c-2-2-4-3-6-3l-1 0c-3 0-5 1-6 2l-198 165-198-165c-2-2-4-2-7-2-2 0-4 1-6 3l-17 21c-2 2-2 4-2 7 0 3 1 5 3 6l205 171c6 5 14 8 22 8 8 0 16-3 22-8l69-58 0 56c0 2 1 5 3 6 2 2 4 3 7 3l54 0c3 0 5-1 7-3 2-1 3-4 3-6l0-117 62-52c2-1 3-3 3-6 0-3 0-5-2-7z"/>
-<glyph unicode="&#88;" d="M365 141c1-4 1-7-2-10l-100-110c-1-2-4-3-6-3-3 0-5 1-7 3l-101 110c-3 3-3 6-2 10 2 3 5 5 8 5l64 0 0 357c0 3 1 5 3 6 2 2 4 3 7 3l54 0c3 0 5-1 7-3 2-1 3-3 3-6l0-357 64 0c4 0 6-2 8-5z"/>
-<glyph unicode="&#89;" d="M365 371c-2-3-5-5-8-5l-64 0 0-357c0-3-1-5-3-6-2-2-4-3-7-3l-54 0c-3 0-5 1-7 3-2 1-3 3-3 6l0 357-64 0c-4 0-6 2-8 5-1 4-1 7 2 10l100 110c1 2 4 3 6 3 3 0 5-1 7-3l101-110c3-3 3-6 2-10z"/>
-<glyph unicode="&#90;" d="M201 302l0-165c0-3-1-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-2 1-2 3-2 6l0 165c0 2 0 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-4 2-6z m73 0l0-165c0-3-1-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-1 1-2 3-2 6l0 165c0 2 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-4 2-6z m73 0l0-165c0-3 0-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-1 1-2 3-2 6l0 165c0 2 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 2-1 2-4 2-6z m37-207l0 271-256 0 0-271c0-4 1-8 2-12 1-3 3-6 4-7 2-2 3-3 3-3l238 0c0 0 1 1 3 3 1 1 3 4 4 7 1 4 2 8 2 12z m-192 307l128 0-14 34c-1 1-3 2-5 3l-90 0c-2-1-4-2-5-3z m265-9l0-18c0-3-1-5-2-7-2-1-4-2-7-2l-27 0 0-271c0-16-5-30-14-41-9-12-20-17-32-17l-238 0c-12 0-23 5-32 16-9 11-14 25-14 41l0 272-27 0c-3 0-5 1-7 2-1 2-2 4-2 7l0 18c0 3 1 5 2 7 2 1 4 2 7 2l88 0 20 48c3 7 8 13 16 18 7 5 15 7 22 7l92 0c7 0 15-2 22-7 8-5 13-11 16-18l20-48 88 0c3 0 5-1 7-2 1-2 2-4 2-7z"/>
-<glyph unicode="&#86;" d="M370 400c0-4-3-8-8-8-4 0-8 4-8 8 0 5 4 8 8 8 5 0 8-3 8-8m3-76c0 0-11 50-77 37-6 23-5 40 9 55 20 21 52 10 52 10l0 17c-11 5-22 6-33 6-43 0-67-32-77-54l-119-219 34 6-62-119 43 8 33 93c93 0 213 34 197 160m40 42l-26 26-21-26z m-222-175c0 0 4 1 9 2 5 2 13 3 22 6 5 1 10 3 15 4 5 2 11 4 16 6 6 3 11 5 16 8 6 3 11 7 16 10 1 1 3 2 4 3l3 3c3 3 5 5 7 7 2 2 4 5 6 7 1 1 2 2 3 4l1 2 1 1c1 2 2 3 2 4 1 1 2 3 2 4 1 1 1 1 1 2 1 0 1 1 1 2 1 1 1 2 2 3 1 3 2 5 3 8 0 2 1 4 2 7 0 2 1 4 1 6 0 2 1 4 1 6 0 2 1 4 1 6 0 1 0 3 0 4 0 5 1 9 1 9l5-1c0 0-1-3-1-8 0-2-1-3-1-5 0-2 0-4-1-5 0-2 0-4-1-7 0-2-1-4-1-6-1-3-2-5-3-8-1-2-2-5-3-7 0-1-1-3-2-4 0-1 0-1-1-2 0-1 0-1-1-2 0-1-1-2-2-4-1-1-1-2-2-3-1-1-1-2-1-2l-2-2c-1-1-2-3-3-4-2-2-4-5-6-7-2-2-4-4-7-7l-3-3c-2-1-3-1-4-2-6-4-11-8-17-11-5-2-11-5-16-7-6-2-11-4-17-6-5-1-10-3-15-4-9-2-17-4-22-5-5-1-9-2-9-2"/>
-<glyph unicode="&#49;" d="M75 75c-48 48-75 113-75 181 0 141 115 256 256 256l32-32-32-32c-106 0-192-86-192-192 0-51 20-100 56-136l-39-5z m181-75l-32 32 32 32c106 0 192 86 192 192 0 51-20 100-56 136l39 5 6 40c48-48 75-113 75-181 0-141-115-256-256-256z"/>
-<glyph unicode="&#85;" d="M218 63c0-35-29-63-64-63-35 0-64 28-64 63 0 36 29 64 64 64 35 0 64-28 64-64z m0 193c0-35-29-64-64-64-35 0-64 29-64 64 0 35 29 64 64 64 35 0 64-29 64-64z m0 193c0-36-29-64-64-64-35 0-64 28-64 64 0 35 29 63 64 63 35 0 64-28 64-63z m204-386c0-35-29-63-64-63-35 0-64 28-64 63 0 36 29 64 64 64 35 0 64-28 64-64z m0 193c0-35-29-64-64-64-35 0-64 29-64 64 0 35 29 64 64 64 35 0 64-29 64-64z m0 193c0-36-29-64-64-64-35 0-64 28-64 64 0 35 29 63 64 63 35 0 64-28 64-63z"/>
-<glyph unicode="&#51;" d="M332 426l0-94 49 0 0-98-192 0 0 55-152-102 152-101 0 54 286 0 0 286z"/>
-<glyph unicode="&#50;" d="M192 320l-192 0 149-109-54-179 153 107 168-107-69 179 165 109-192 0-72 184z"/>
-<glyph unicode="&#53;" d="M135 456l241 0 0-23-241 0z m270-177l-127-124 0 222-45 0 0-220-125 122-33-32 181-181 181 181z"/>
-<glyph unicode="&#54;" d="M136 456l241 0 0-23-241 0z m-28-302l126 124 0-222 45 0 0 220 126-122 32 32-181 181-181-181z"/>
-<glyph unicode="&#48;" d="M346 321c0-2 0-4 0-6 0-2-1-4-1-7 0-2-1-5-1-7-1-3-2-6-2-9-1-3-2-6-3-9-1-3-2-6-3-10-1-1-2-3-2-4-1-1-1-2-1-3-1-1-1-1-2-2-1-2-1-3-2-5-1-2-2-3-3-5l-2-2-1-3c-1-1-2-3-4-4-2-3-4-7-7-9-3-3-6-6-9-9l-4-4c-2-1-3-2-5-4-6-5-13-9-20-13-7-4-14-7-21-10-7-3-14-6-21-8-6-2-12-4-18-6-12-3-22-5-29-7-7-2-11-2-11-2 0 0 4 0 11 2 7 1 17 3 29 6 6 2 12 3 19 5 7 2 14 5 21 8 7 3 14 6 21 10 7 3 14 8 21 13 2 1 3 2 5 3l5 4c3 3 6 6 8 9 3 3 6 6 8 9 2 2 3 3 4 5l2 2c0 1 1 2 1 3 1 1 2 3 4 5 0 1 1 3 2 5 1 0 1 1 2 2 0 1 0 2 1 3 1 1 1 3 2 5 2 3 3 6 4 9 1 4 2 7 3 10 1 3 1 6 2 8 1 3 1 6 2 8 0 3 0 5 1 7 0 3 0 5 0 6 1 8 1 12 1 12l-6 0c0 0 0-4-1-11m112 80l-34 33c-1 33-22 55-32 61-10 9-33 16-59 13-25-4-61-17-86-64-49-92-154-289-155-291-1 0-1-1 0-1 0-1 1-1 1-1l40 7-78-151c0-1 0-1 1-2 0 0 0 0 1 0 0 0 0 0 0 0l56 10c0 0 1 0 1 1l41 120c105 1 178 26 218 77 42 54 36 122 29 154l-5 31 60 0c0 0 1 0 1 1 1 0 0 1 0 2m-55 42c0-5-5-10-10-10-6 0-10 5-10 10 0 6 4 11 10 11 5 0 10-5 10-11m-33-228c-40-50-112-75-216-75-1 0-1-1-1-2l-42-120-51-9 78 151c0 1 0 1 0 2-1 0-1 1-2 1l-40-8c14 26 109 202 154 287 25 46 59 59 83 62 25 3 46-3 56-10l0-22c-2 0-16 5-29 5-13 0-28-5-37-15-16-18-20-36-12-66 54 10 78-13 87-27 7-30 15-99-28-154m29 186l23 30 30-30z"/>
-<glyph unicode="&#63;" d="M253 492c65 0 120-22 167-67 46-45 70-100 72-165 0-65-22-121-68-167-45-47-100-71-165-73-65 0-121 22-167 68-47 45-71 100-72 165-1 65 21 121 67 167 46 47 101 71 166 72m-1-379c10 0 19 3 25 9 6 7 10 15 10 24 0 11-2 19-9 26-6 6-15 9-25 9 0 0-1 0-1 0-10 0-18-3-24-9-7-6-10-14-11-24 0-10 3-18 10-25 6-6 14-10 24-10 0 0 1 0 1 0m85 168c9 11 13 24 13 40 0 26-9 46-27 59-18 13-41 19-69 19-22 0-40-4-53-13-24-14-36-39-37-75 0 0 0-2 0-2 0 0 56 0 56 0 0 0 0 2 0 2 0 9 3 18 8 28 6 8 15 12 28 12 14 0 23-3 27-10 5-7 8-14 8-23 0-6-3-13-8-20-3-4-7-8-11-10 0 0-3-2-3-2-2-2-4-4-8-6-3-2-7-5-10-8-4-2-7-5-11-8-4-3-7-6-9-9-4-7-7-20-9-40 0 0 0-4 0-4 0 0 56 0 56 0 0 0 0 2 0 2 0 4 0 9 2 14 2 7 6 13 14 19 0 0 14 9 14 9 16 12 25 20 29 26"/>
-<glyph unicode="&#33;" d="M499 65c4-6 4-12 0-18-3-5-8-8-15-8 0 0-457 0-457 0-6 0-11 3-14 8-4 6-4 12-1 18 0 0 228 400 228 400 3 6 8 9 16 9 7 0 12-3 15-9 0 0 228-400 228-400m-215 25c0 0 0 51 0 51 0 0-56 0-56 0 0 0 0-51 0-51 0 0 56 0 56 0m0 89c0 0 0 154 0 154 0 0-56 0-56 0 0 0 0-154 0-154 0 0 56 0 56 0"/>
-<glyph unicode="&#57;" d="M256 512c-141 0-256-115-256-256 0-141 115-256 256-256 141 0 256 115 256 256 0 141-115 256-256 256z m-40-374l-117 118 45 45 72-73 154 154 45-45z"/>
-<glyph unicode="&#83;" d="M435 186l0-117-358 0 0 117-68 0 0-151c0-19 15-35 34-35l426 0c19 0 34 16 34 35l0 151z m-185 12l-99 118c0 0-15 15 2 15 16 0 55 0 55 0 0 0 0 9 0 24 0 41 0 118 0 149 0 0-2 8 11 8 12 0 68 0 78 0 9 0 8-7 8-7 0-30 0-109 0-149 0-13 0-22 0-22 0 0 32 0 52 0 19 0 5-15 5-15 0 0-84-111-96-122-8-9-16 1-16 1z"/>
-<glyph unicode="&#52;" d="M256 309c8 0 15-1 22-4 7-3 13-6 18-11 5-5 9-11 11-17 3-7 5-14 5-21 0-7-2-14-5-21-2-6-6-12-11-17-5-5-11-8-18-11-7-3-14-4-22-4-8 0-15 1-22 4-7 3-13 6-18 11-5 5-9 11-11 17-3 7-5 14-5 21 0 7 2 14 5 21 2 6 6 12 11 17 5 5 11 8 18 11 7 3 14 4 22 4z m0-136c12 0 23 2 34 6 11 4 20 10 28 18 8 7 14 16 19 26 4 11 6 21 6 33 0 12-2 22-6 33-5 10-11 19-19 26-8 8-17 14-28 18-11 4-22 6-34 6-12 0-23-2-34-6-11-4-20-10-28-18-8-7-14-16-19-26-4-11-6-21-6-33 0-12 2-22 6-33 5-10 11-19 19-26 8-8 17-14 28-18 11-4 22-6 34-6z m0 194c18 0 35-2 51-6 16-4 31-10 45-17 14-6 26-14 37-22 11-9 21-17 29-25 7-8 13-16 17-23 5-8 7-14 7-18 0-4-2-10-7-18-4-7-10-15-17-23-8-8-18-16-29-25-11-8-23-16-37-22-14-7-29-13-45-17-16-4-33-6-51-6-18 0-35 2-51 6-17 4-31 10-45 17-14 6-26 14-37 22-11 9-21 17-29 25-7 8-13 16-17 23-5 8-7 14-7 18 0 4 2 10 7 18 4 7 10 15 17 23 8 8 18 16 29 25 11 8 23 16 37 22 14 7 28 13 45 17 16 4 33 6 51 6z"/>
-<glyph unicode="&#55;" d="M416 0l-320 0c-53 0-96 43-96 96l0 320c0 42 27 77 64 90l0-42c0-27 22-48 48-48 26 0 48 21 48 48l0 48 192 0 0-48c0-27 22-48 48-48 26 0 48 21 48 48l0 42c37-13 64-48 64-90l0-320c0-53-43-96-96-96z m32 352l-384 0 0-256c0-18 14-32 32-32l320 0c18 0 32 14 32 32z m-128-160l64 0 0-64-64 0z m0 96l64 0 0-64-64 0z m-96-96l64 0 0-64-64 0z m0 96l64 0 0-64-64 0z m-96-96l64 0 0-64-64 0z m0 96l64 0 0-64-64 0z m272 160c-9 0-16 7-16 16l0 48 32 0 0-48c0-9-7-16-16-16z m-288 0c-9 0-16 7-16 16l0 48 32 0 0-48c0-9-7-16-16-16z"/>
-<glyph unicode="&#36;" d="M0 512l0-512 512 0 0 512z m157-431l-104 0 0 53 189 0 0-53z m274 269l-378 0 0 81 377 0 0-81z m-1-144l-377 0 0 80 377 0z"/>
-</font></defs></svg>
->>>>>>> master
+</font></defs></svg>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
index c4161bea8..38d2e1789 100755
Binary files a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf differ
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff
index 484c0b127..6bb696528 100755
Binary files a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff differ