diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index 37247b81e..24886ae5b 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -515,6 +515,11 @@
                 <li class="icon icon-time">time</li>
                 <li class="icon icon-form">form</li>
                 <li class="icon icon-site">site</li>
+                <li class="icon icon-placeholder">placeholder</li>
+                <li class="icon icon-pilcrow">pilcrow</li>
+                <li class="icon icon-title">title</li>
+                <li class="icon icon-code">code</li>
+                <li class="icon icon-openquote">openquote</li>
             </ul>
 
         </section>
diff --git a/wagtail/wagtailadmin/blocks.py b/wagtail/wagtailadmin/blocks.py
index a2740e9d2..bb83961dd 100644
--- a/wagtail/wagtailadmin/blocks.py
+++ b/wagtail/wagtailadmin/blocks.py
@@ -66,7 +66,7 @@ class Block(six.with_metaclass(BaseBlock, object)):
 
     class Meta:
         label = None
-        icon = "streamfield-block-placeholder"
+        icon = "placeholder"
         classname = None
 
     """
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index d77fb5845..aa5bac7ea 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -258,10 +258,7 @@
 .icon-site:before{
     content:"@";
 }
-.icon-larger:before{
-    font-size:1.5em;
-}
-.icon-streamfield-block-placeholder:before{
+.icon-placeholder:before{
     content:"{";
 }
 .icon-pilcrow:before {
@@ -273,7 +270,13 @@
 .icon-code:before{
     content:"\e601"
 }
+.icon-openquote:before{
+    content:"“"
+}
 
+.icon-larger:before{
+    font-size:1.5em;
+}
 
 .icon.text-replace{
     font-size:0em;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
index ae9f43808..456cca8e6 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
@@ -1,6 +1,43 @@
 {
 	"IcoMoonType": "selection",
 	"icons": [
+		{
+			"icon": {
+				"paths": [
+					"M225 448c123.712 0 224 100.29 224 224 0 123.712-100.288 224-224 224s-224-100.288-224-224l-1-32c0-247.424 200.576-448 448-448v128c-85.474 0-165.834 33.286-226.274 93.726-11.634 11.636-22.252 24.016-31.83 37.020 11.438-1.8 23.16-2.746 35.104-2.746zM801 448c123.71 0 224 100.29 224 224 0 123.712-100.29 224-224 224s-224-100.288-224-224l-1-32c0-247.424 200.576-448 448-448v128c-85.474 0-165.834 33.286-226.274 93.726-11.636 11.636-22.254 24.016-31.832 37.020 11.44-1.8 23.16-2.746 35.106-2.746z"
+				],
+				"attrs": [
+					{
+						"fill": "rgb(68, 68, 68)"
+					}
+				],
+				"isMulticolor": false,
+				"tags": [
+					"quotes-left",
+					"ldquo"
+				],
+				"grid": 16,
+				"colorPermutations": {
+					"6868681": [
+						0
+					]
+				}
+			},
+			"attrs": [
+				{
+					"fill": "rgb(68, 68, 68)"
+				}
+			],
+			"properties": {
+				"order": 1,
+				"id": 0,
+				"prevSize": 16,
+				"code": 8220,
+				"name": "quotes-left"
+			},
+			"setIdx": 0,
+			"iconIdx": 0
+		},
 		{
 			"icon": {
 				"paths": [
@@ -48,13 +85,13 @@
 				}
 			],
 			"properties": {
-				"order": 1,
+				"order": 2,
 				"id": 1,
 				"prevSize": 16,
 				"code": 58881,
 				"name": "embed"
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 0
 		},
 		{
@@ -85,13 +122,13 @@
 				}
 			],
 			"properties": {
-				"order": 1,
+				"order": 3,
 				"id": 0,
 				"prevSize": 16,
 				"code": 58880,
 				"name": "pilcrow"
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 1
 		},
 		{
@@ -123,14 +160,14 @@
 				}
 			],
 			"properties": {
-				"order": 1,
+				"order": 4,
 				"id": 0,
 				"prevSize": 16,
 				"code": 123,
 				"name": "marquee"
 			},
 			"setIdx": 1,
-			"iconIdx": 0
+			"iconIdx": 2
 		},
 		{
 			"icon": {
@@ -146,14 +183,14 @@
 			},
 			"properties": {
 				"id": 7,
-				"order": 4,
+				"order": 8,
 				"prevSize": 16,
 				"code": 121,
 				"name": "user",
 				"ligatures": ""
 			},
-			"setIdx": 2,
-			"iconIdx": 7
+			"setIdx": 1,
+			"iconIdx": 3
 		},
 		{
 			"icon": {
@@ -168,14 +205,14 @@
 			},
 			"properties": {
 				"id": 104,
-				"order": 66,
+				"order": 70,
 				"prevSize": 16,
 				"code": 52,
 				"name": "eye",
 				"ligatures": ""
 			},
-			"setIdx": 2,
-			"iconIdx": 104
+			"setIdx": 1,
+			"iconIdx": 4
 		},
 		{
 			"icon": {
@@ -190,14 +227,14 @@
 			},
 			"properties": {
 				"id": 105,
-				"order": 67,
+				"order": 71,
 				"prevSize": 16,
 				"code": 94,
 				"name": "eye-slash",
 				"ligatures": ""
 			},
-			"setIdx": 2,
-			"iconIdx": 105
+			"setIdx": 1,
+			"iconIdx": 5
 		},
 		{
 			"icon": {
@@ -213,14 +250,14 @@
 			},
 			"properties": {
 				"id": 162,
-				"order": 7,
+				"order": 11,
 				"prevSize": 16,
 				"code": 64,
 				"name": "globe",
 				"ligatures": ""
 			},
-			"setIdx": 2,
-			"iconIdx": 162
+			"setIdx": 1,
+			"iconIdx": 6
 		},
 		{
 			"icon": {
@@ -236,14 +273,14 @@
 			},
 			"properties": {
 				"id": 72,
-				"order": 12,
+				"order": 16,
 				"prevSize": 16,
 				"code": 56,
 				"name": "clock",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 0
+			"setIdx": 1,
+			"iconIdx": 7
 		},
 		{
 			"icon": {
@@ -257,15 +294,15 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 3,
+				"order": 7,
 				"id": 67,
 				"prevSize": 16,
 				"code": 109,
 				"name": "lock",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 1
+			"setIdx": 1,
+			"iconIdx": 8
 		},
 		{
 			"icon": {
@@ -279,15 +316,15 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 8,
+				"order": 12,
 				"id": 66,
 				"prevSize": 16,
 				"code": 112,
 				"name": "lock-open",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 2
+			"setIdx": 1,
+			"iconIdx": 9
 		},
 		{
 			"icon": {
@@ -300,15 +337,15 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 1,
+				"order": 5,
 				"id": 63,
 				"prevSize": 16,
 				"code": 36,
 				"name": "form",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 3
+			"setIdx": 1,
+			"iconIdx": 10
 		},
 		{
 			"icon": {
@@ -320,14 +357,14 @@
 			},
 			"properties": {
 				"id": 0,
-				"order": 2,
+				"order": 6,
 				"prevSize": 16,
 				"code": 97,
 				"name": "uni61",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 4
+			"setIdx": 1,
+			"iconIdx": 11
 		},
 		{
 			"icon": {
@@ -339,14 +376,14 @@
 			},
 			"properties": {
 				"id": 1,
-				"order": 5,
+				"order": 9,
 				"prevSize": 16,
 				"code": 98,
 				"name": "uni62",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 5
+			"setIdx": 1,
+			"iconIdx": 12
 		},
 		{
 			"icon": {
@@ -358,14 +395,14 @@
 			},
 			"properties": {
 				"id": 2,
-				"order": 6,
+				"order": 10,
 				"prevSize": 16,
 				"code": 99,
 				"name": "uni63",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 6
+			"setIdx": 1,
+			"iconIdx": 13
 		},
 		{
 			"icon": {
@@ -377,14 +414,14 @@
 			},
 			"properties": {
 				"id": 3,
-				"order": 9,
+				"order": 13,
 				"prevSize": 16,
 				"code": 100,
 				"name": "uni64",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 7
+			"setIdx": 1,
+			"iconIdx": 14
 		},
 		{
 			"icon": {
@@ -396,14 +433,14 @@
 			},
 			"properties": {
 				"id": 4,
-				"order": 10,
+				"order": 14,
 				"prevSize": 16,
 				"code": 101,
 				"name": "uni65",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 8
+			"setIdx": 1,
+			"iconIdx": 15
 		},
 		{
 			"icon": {
@@ -415,14 +452,14 @@
 			},
 			"properties": {
 				"id": 5,
-				"order": 11,
+				"order": 15,
 				"prevSize": 16,
 				"code": 102,
 				"name": "uni66",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 9
+			"setIdx": 1,
+			"iconIdx": 16
 		},
 		{
 			"icon": {
@@ -434,14 +471,14 @@
 			},
 			"properties": {
 				"id": 6,
-				"order": 13,
+				"order": 17,
 				"prevSize": 16,
 				"code": 103,
 				"name": "uni67",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 10
+			"setIdx": 1,
+			"iconIdx": 17
 		},
 		{
 			"icon": {
@@ -453,14 +490,14 @@
 			},
 			"properties": {
 				"id": 7,
-				"order": 14,
+				"order": 18,
 				"prevSize": 16,
 				"code": 105,
 				"name": "uni69",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 11
+			"setIdx": 1,
+			"iconIdx": 18
 		},
 		{
 			"icon": {
@@ -472,14 +509,14 @@
 			},
 			"properties": {
 				"id": 8,
-				"order": 15,
+				"order": 19,
 				"prevSize": 16,
 				"code": 106,
 				"name": "uni6A",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 12
+			"setIdx": 1,
+			"iconIdx": 19
 		},
 		{
 			"icon": {
@@ -491,14 +528,14 @@
 			},
 			"properties": {
 				"id": 9,
-				"order": 16,
+				"order": 20,
 				"prevSize": 16,
 				"code": 107,
 				"name": "uni6B",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 13
+			"setIdx": 1,
+			"iconIdx": 20
 		},
 		{
 			"icon": {
@@ -510,14 +547,14 @@
 			},
 			"properties": {
 				"id": 10,
-				"order": 17,
+				"order": 21,
 				"prevSize": 16,
 				"code": 108,
 				"name": "uni6C",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 14
+			"setIdx": 1,
+			"iconIdx": 21
 		},
 		{
 			"icon": {
@@ -529,14 +566,14 @@
 			},
 			"properties": {
 				"id": 12,
-				"order": 18,
+				"order": 22,
 				"prevSize": 16,
 				"code": 110,
 				"name": "uni6E",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 15
+			"setIdx": 1,
+			"iconIdx": 22
 		},
 		{
 			"icon": {
@@ -548,14 +585,14 @@
 			},
 			"properties": {
 				"id": 13,
-				"order": 19,
+				"order": 23,
 				"prevSize": 16,
 				"code": 104,
 				"name": "uni68",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 16
+			"setIdx": 1,
+			"iconIdx": 23
 		},
 		{
 			"icon": {
@@ -567,14 +604,14 @@
 			},
 			"properties": {
 				"id": 14,
-				"order": 20,
+				"order": 24,
 				"prevSize": 16,
 				"code": 111,
 				"name": "uni6F",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 17
+			"setIdx": 1,
+			"iconIdx": 24
 		},
 		{
 			"icon": {
@@ -586,14 +623,14 @@
 			},
 			"properties": {
 				"id": 16,
-				"order": 21,
+				"order": 25,
 				"prevSize": 16,
 				"code": 113,
 				"name": "uni71",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 18
+			"setIdx": 1,
+			"iconIdx": 25
 		},
 		{
 			"icon": {
@@ -605,14 +642,14 @@
 			},
 			"properties": {
 				"id": 17,
-				"order": 22,
+				"order": 26,
 				"prevSize": 16,
 				"code": 114,
 				"name": "uni72",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 19
+			"setIdx": 1,
+			"iconIdx": 26
 		},
 		{
 			"icon": {
@@ -624,14 +661,14 @@
 			},
 			"properties": {
 				"id": 18,
-				"order": 23,
+				"order": 27,
 				"prevSize": 16,
 				"code": 115,
 				"name": "uni73",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 20
+			"setIdx": 1,
+			"iconIdx": 27
 		},
 		{
 			"icon": {
@@ -643,14 +680,14 @@
 			},
 			"properties": {
 				"id": 19,
-				"order": 24,
+				"order": 28,
 				"prevSize": 16,
 				"code": 116,
 				"name": "uni74",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 21
+			"setIdx": 1,
+			"iconIdx": 28
 		},
 		{
 			"icon": {
@@ -662,14 +699,14 @@
 			},
 			"properties": {
 				"id": 20,
-				"order": 25,
+				"order": 29,
 				"prevSize": 16,
 				"code": 117,
 				"name": "uni75",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 22
+			"setIdx": 1,
+			"iconIdx": 29
 		},
 		{
 			"icon": {
@@ -681,14 +718,14 @@
 			},
 			"properties": {
 				"id": 21,
-				"order": 26,
+				"order": 30,
 				"prevSize": 16,
 				"code": 118,
 				"name": "uni76",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 23
+			"setIdx": 1,
+			"iconIdx": 30
 		},
 		{
 			"icon": {
@@ -700,14 +737,14 @@
 			},
 			"properties": {
 				"id": 22,
-				"order": 27,
+				"order": 31,
 				"prevSize": 16,
 				"code": 119,
 				"name": "uni77",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 24
+			"setIdx": 1,
+			"iconIdx": 31
 		},
 		{
 			"icon": {
@@ -719,14 +756,14 @@
 			},
 			"properties": {
 				"id": 23,
-				"order": 28,
+				"order": 32,
 				"prevSize": 16,
 				"code": 120,
 				"name": "uni78",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 25
+			"setIdx": 1,
+			"iconIdx": 32
 		},
 		{
 			"icon": {
@@ -738,14 +775,14 @@
 			},
 			"properties": {
 				"id": 24,
-				"order": 29,
+				"order": 33,
 				"prevSize": 16,
 				"code": 122,
 				"name": "uni7A",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 26
+			"setIdx": 1,
+			"iconIdx": 33
 		},
 		{
 			"icon": {
@@ -757,14 +794,14 @@
 			},
 			"properties": {
 				"id": 25,
-				"order": 30,
+				"order": 34,
 				"prevSize": 16,
 				"code": 65,
 				"name": "uni41",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 27
+			"setIdx": 1,
+			"iconIdx": 34
 		},
 		{
 			"icon": {
@@ -776,14 +813,14 @@
 			},
 			"properties": {
 				"id": 26,
-				"order": 31,
+				"order": 35,
 				"prevSize": 16,
 				"code": 66,
 				"name": "uni42",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 28
+			"setIdx": 1,
+			"iconIdx": 35
 		},
 		{
 			"icon": {
@@ -795,14 +832,14 @@
 			},
 			"properties": {
 				"id": 27,
-				"order": 32,
+				"order": 36,
 				"prevSize": 16,
 				"code": 68,
 				"name": "uni44",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 29
+			"setIdx": 1,
+			"iconIdx": 36
 		},
 		{
 			"icon": {
@@ -814,14 +851,14 @@
 			},
 			"properties": {
 				"id": 28,
-				"order": 33,
+				"order": 37,
 				"prevSize": 16,
 				"code": 67,
 				"name": "uni43",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 30
+			"setIdx": 1,
+			"iconIdx": 37
 		},
 		{
 			"icon": {
@@ -833,14 +870,14 @@
 			},
 			"properties": {
 				"id": 29,
-				"order": 34,
+				"order": 38,
 				"prevSize": 16,
 				"code": 69,
 				"name": "uni45",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 31
+			"setIdx": 1,
+			"iconIdx": 38
 		},
 		{
 			"icon": {
@@ -852,14 +889,14 @@
 			},
 			"properties": {
 				"id": 30,
-				"order": 35,
+				"order": 39,
 				"prevSize": 16,
 				"code": 70,
 				"name": "uni46",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 32
+			"setIdx": 1,
+			"iconIdx": 39
 		},
 		{
 			"icon": {
@@ -871,14 +908,14 @@
 			},
 			"properties": {
 				"id": 31,
-				"order": 36,
+				"order": 40,
 				"prevSize": 16,
 				"code": 71,
 				"name": "uni47",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 33
+			"setIdx": 1,
+			"iconIdx": 40
 		},
 		{
 			"icon": {
@@ -890,14 +927,14 @@
 			},
 			"properties": {
 				"id": 32,
-				"order": 37,
+				"order": 41,
 				"prevSize": 16,
 				"code": 72,
 				"name": "uni48",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 34
+			"setIdx": 1,
+			"iconIdx": 41
 		},
 		{
 			"icon": {
@@ -909,14 +946,14 @@
 			},
 			"properties": {
 				"id": 33,
-				"order": 38,
+				"order": 42,
 				"prevSize": 16,
 				"code": 73,
 				"name": "uni49",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 35
+			"setIdx": 1,
+			"iconIdx": 42
 		},
 		{
 			"icon": {
@@ -928,14 +965,14 @@
 			},
 			"properties": {
 				"id": 34,
-				"order": 39,
+				"order": 43,
 				"prevSize": 16,
 				"code": 74,
 				"name": "uni4A",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 36
+			"setIdx": 1,
+			"iconIdx": 43
 		},
 		{
 			"icon": {
@@ -947,14 +984,14 @@
 			},
 			"properties": {
 				"id": 35,
-				"order": 40,
+				"order": 44,
 				"prevSize": 16,
 				"code": 75,
 				"name": "uni4B",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 37
+			"setIdx": 1,
+			"iconIdx": 44
 		},
 		{
 			"icon": {
@@ -966,14 +1003,14 @@
 			},
 			"properties": {
 				"id": 36,
-				"order": 41,
+				"order": 45,
 				"prevSize": 16,
 				"code": 76,
 				"name": "uni4C",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 38
+			"setIdx": 1,
+			"iconIdx": 45
 		},
 		{
 			"icon": {
@@ -985,14 +1022,14 @@
 			},
 			"properties": {
 				"id": 37,
-				"order": 42,
+				"order": 46,
 				"prevSize": 16,
 				"code": 77,
 				"name": "uni4D",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 39
+			"setIdx": 1,
+			"iconIdx": 46
 		},
 		{
 			"icon": {
@@ -1004,14 +1041,14 @@
 			},
 			"properties": {
 				"id": 38,
-				"order": 43,
+				"order": 47,
 				"prevSize": 16,
 				"code": 78,
 				"name": "uni4E",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 40
+			"setIdx": 1,
+			"iconIdx": 47
 		},
 		{
 			"icon": {
@@ -1023,14 +1060,14 @@
 			},
 			"properties": {
 				"id": 39,
-				"order": 44,
+				"order": 48,
 				"prevSize": 16,
 				"code": 79,
 				"name": "uni4F",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 41
+			"setIdx": 1,
+			"iconIdx": 48
 		},
 		{
 			"icon": {
@@ -1042,14 +1079,14 @@
 			},
 			"properties": {
 				"id": 40,
-				"order": 45,
+				"order": 49,
 				"prevSize": 16,
 				"code": 80,
 				"name": "uni50",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 42
+			"setIdx": 1,
+			"iconIdx": 49
 		},
 		{
 			"icon": {
@@ -1061,14 +1098,14 @@
 			},
 			"properties": {
 				"id": 41,
-				"order": 46,
+				"order": 50,
 				"prevSize": 16,
 				"code": 81,
 				"name": "uni51",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 43
+			"setIdx": 1,
+			"iconIdx": 50
 		},
 		{
 			"icon": {
@@ -1080,14 +1117,14 @@
 			},
 			"properties": {
 				"id": 43,
-				"order": 47,
+				"order": 51,
 				"prevSize": 16,
 				"code": 82,
 				"name": "uni52",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 45
+			"setIdx": 1,
+			"iconIdx": 51
 		},
 		{
 			"icon": {
@@ -1099,14 +1136,14 @@
 			},
 			"properties": {
 				"id": 44,
-				"order": 48,
+				"order": 52,
 				"prevSize": 16,
 				"code": 84,
 				"name": "uni54",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 46
+			"setIdx": 1,
+			"iconIdx": 52
 		},
 		{
 			"icon": {
@@ -1118,14 +1155,14 @@
 			},
 			"properties": {
 				"id": 45,
-				"order": 49,
+				"order": 53,
 				"prevSize": 16,
 				"code": 87,
 				"name": "uni57",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 47
+			"setIdx": 1,
+			"iconIdx": 53
 		},
 		{
 			"icon": {
@@ -1137,14 +1174,14 @@
 			},
 			"properties": {
 				"id": 46,
-				"order": 50,
+				"order": 54,
 				"prevSize": 16,
 				"code": 88,
 				"name": "uni58",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 48
+			"setIdx": 1,
+			"iconIdx": 54
 		},
 		{
 			"icon": {
@@ -1156,14 +1193,14 @@
 			},
 			"properties": {
 				"id": 47,
-				"order": 51,
+				"order": 55,
 				"prevSize": 16,
 				"code": 89,
 				"name": "uni59",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 49
+			"setIdx": 1,
+			"iconIdx": 55
 		},
 		{
 			"icon": {
@@ -1175,14 +1212,14 @@
 			},
 			"properties": {
 				"id": 48,
-				"order": 52,
+				"order": 56,
 				"prevSize": 16,
 				"code": 90,
 				"name": "uni5A",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 50
+			"setIdx": 1,
+			"iconIdx": 56
 		},
 		{
 			"icon": {
@@ -1194,14 +1231,14 @@
 			},
 			"properties": {
 				"id": 49,
-				"order": 53,
+				"order": 57,
 				"prevSize": 16,
 				"code": 86,
 				"name": "uni56",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 51
+			"setIdx": 1,
+			"iconIdx": 57
 		},
 		{
 			"icon": {
@@ -1213,14 +1250,14 @@
 			},
 			"properties": {
 				"id": 50,
-				"order": 54,
+				"order": 58,
 				"prevSize": 16,
 				"code": 49,
 				"name": "uni31",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 52
+			"setIdx": 1,
+			"iconIdx": 58
 		},
 		{
 			"icon": {
@@ -1232,14 +1269,14 @@
 			},
 			"properties": {
 				"id": 51,
-				"order": 55,
+				"order": 59,
 				"prevSize": 16,
 				"code": 85,
 				"name": "uni55",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 53
+			"setIdx": 1,
+			"iconIdx": 59
 		},
 		{
 			"icon": {
@@ -1251,14 +1288,14 @@
 			},
 			"properties": {
 				"id": 52,
-				"order": 56,
+				"order": 60,
 				"prevSize": 16,
 				"code": 51,
 				"name": "uni33",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 54
+			"setIdx": 1,
+			"iconIdx": 60
 		},
 		{
 			"icon": {
@@ -1270,14 +1307,14 @@
 			},
 			"properties": {
 				"id": 53,
-				"order": 57,
+				"order": 61,
 				"prevSize": 16,
 				"code": 50,
 				"name": "uni32",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 55
+			"setIdx": 1,
+			"iconIdx": 61
 		},
 		{
 			"icon": {
@@ -1289,14 +1326,14 @@
 			},
 			"properties": {
 				"id": 54,
-				"order": 58,
+				"order": 62,
 				"prevSize": 16,
 				"code": 53,
 				"name": "uni35",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 56
+			"setIdx": 1,
+			"iconIdx": 62
 		},
 		{
 			"icon": {
@@ -1308,14 +1345,14 @@
 			},
 			"properties": {
 				"id": 55,
-				"order": 59,
+				"order": 63,
 				"prevSize": 16,
 				"code": 54,
 				"name": "uni36",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 57
+			"setIdx": 1,
+			"iconIdx": 63
 		},
 		{
 			"icon": {
@@ -1327,14 +1364,14 @@
 			},
 			"properties": {
 				"id": 56,
-				"order": 60,
+				"order": 64,
 				"prevSize": 16,
 				"code": 48,
 				"name": "uni30",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 58
+			"setIdx": 1,
+			"iconIdx": 64
 		},
 		{
 			"icon": {
@@ -1346,14 +1383,14 @@
 			},
 			"properties": {
 				"id": 57,
-				"order": 61,
+				"order": 65,
 				"prevSize": 16,
 				"code": 63,
 				"name": "uni3F",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 59
+			"setIdx": 1,
+			"iconIdx": 65
 		},
 		{
 			"icon": {
@@ -1365,14 +1402,14 @@
 			},
 			"properties": {
 				"id": 58,
-				"order": 62,
+				"order": 66,
 				"prevSize": 16,
 				"code": 33,
 				"name": "uni21",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 60
+			"setIdx": 1,
+			"iconIdx": 66
 		},
 		{
 			"icon": {
@@ -1384,14 +1421,14 @@
 			},
 			"properties": {
 				"id": 59,
-				"order": 63,
+				"order": 67,
 				"prevSize": 16,
 				"code": 57,
 				"name": "uni39",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 61
+			"setIdx": 1,
+			"iconIdx": 67
 		},
 		{
 			"icon": {
@@ -1403,14 +1440,14 @@
 			},
 			"properties": {
 				"id": 60,
-				"order": 64,
+				"order": 68,
 				"prevSize": 16,
 				"code": 83,
 				"name": "uni53",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 62
+			"setIdx": 1,
+			"iconIdx": 68
 		},
 		{
 			"icon": {
@@ -1422,14 +1459,14 @@
 			},
 			"properties": {
 				"id": 62,
-				"order": 65,
+				"order": 69,
 				"prevSize": 16,
 				"code": 55,
 				"name": "uni37",
 				"ligatures": ""
 			},
-			"setIdx": 3,
-			"iconIdx": 64
+			"setIdx": 1,
+			"iconIdx": 69
 		},
 		{
 			"icon": {
@@ -1444,13 +1481,13 @@
 			},
 			"properties": {
 				"id": 49,
-				"order": 71,
+				"order": 72,
 				"prevSize": 16,
 				"code": 61492,
 				"name": "text-height"
 			},
-			"setIdx": 2,
-			"iconIdx": 49
+			"setIdx": 1,
+			"iconIdx": 70
 		}
 	],
 	"height": 1024,
@@ -1472,7 +1509,7 @@
 				"baseline": 6.25,
 				"whitespace": 50
 			},
-			"showMetrics": true,
+			"showMetrics": false,
 			"showMetadata": false,
 			"showVersion": false,
 			"includeMetadata": false,
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index 03415dea6..c62083ac5 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 5bed359aa..64723fcf8 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -75,6 +75,7 @@
 <glyph unicode="&#x79;" d="M115.076 175.322q0 28.393 1.875 55.447t7.5 58.393 14.197 58.125 23.035 52.231 33.215 43.393 45.803 28.66 59.732 10.715q4.822 0 22.5-11.518t39.909-25.715 57.857-25.715 71.519-11.518 71.517 11.518 57.857 25.715 39.909 25.715 22.5 11.518q32.678 0 59.732-10.715t45.803-28.66 33.215-43.393 23.035-52.231 14.197-58.125 7.5-58.393 1.875-55.447q0-64.285-39.107-101.518t-103.929-37.232h-468.214q-64.822 0-103.929 37.232t-39.107 101.518zM286.506 653.715q0 85.178 60.268 145.447t145.447 60.268 145.447-60.268 60.268-145.447-60.268-145.447-145.447-60.268-145.447 60.268-60.268 145.447z" horiz-adv-x="1029" />
 <glyph unicode="&#x7a;" d="M688 682c0-6-2-10-6-14l-224-224 224-226c4-2 6-8 6-12 0-6-2-10-6-14l-28-28c-4-4-10-6-14-6s-10 2-14 6l-266 266c-4 4-6 8-6 14 0 4 2 8 6 12l266 266c4 4 10 6 14 6s10-2 14-6l28-28c4-4 6-8 6-12z" />
 <glyph unicode="&#x7b;" d="M128 640v-128h-128v128h128zM0 832c0 70.656 57.344 128 128 128h64v-128c-35.392 0-64-28.608-64-64h-128v64zM320 832v128h128v-128h-128zM128 128c0-35.392 28.608-64 64-64v-128h-64c-70.656 0-128 57.344-128 128v64h128zM128 384v-128h-128v128h128zM320-64v128h128v-128h-128zM896 512v128h128v-128h-128zM576-64v128h128v-128h-128zM896 960c70.656 0 128-57.344 128-128v-64h-128c0 35.392-28.608 64-64 64v128h64zM896 256v128h128v-128h-128zM832 64c35.392 0 64 28.608 64 64h128v-64c0-70.656-57.344-128-128-128h-64v128zM576 832v128h128v-128h-128z" />
+<glyph unicode="&#x201c;" d="M225 512c123.712 0 224-100.29 224-224 0-123.712-100.288-224-224-224s-224 100.288-224 224l-1 32c0 247.424 200.576 448 448 448v-128c-85.474 0-165.834-33.286-226.274-93.726-11.634-11.636-22.252-24.016-31.83-37.020 11.438 1.8 23.16 2.746 35.104 2.746zM801 512c123.71 0 224-100.29 224-224 0-123.712-100.29-224-224-224s-224 100.288-224 224l-1 32c0 247.424 200.576 448 448 448v-128c-85.474 0-165.834-33.286-226.274-93.726-11.636-11.636-22.254-24.016-31.832-37.020 11.44 1.8 23.16 2.746 35.106 2.746z" />
 <glyph unicode="&#xe600;" d="M384 960h512v-128h-128v-896h-128v896h-128v-896h-128v512c-141.384 0-256 114.616-256 256s114.616 256 256 256z" />
 <glyph unicode="&#xe601;" d="M832 224l96-96 320 320-320 320-96-96 224-224zM448 672l-96 96-320-320 320-320 96 96-224 224zM701.298 809.481l69.468-18.944-191.987-704.026-69.468 18.944 191.987 704.026z" horiz-adv-x="1280" />
 <glyph unicode="&#xf034;" d="M0 657.714v218.857l46.286 0.571 30.857-15.429q6.857-2.857 120.571-2.857 25.143 0 75.429 1.143t75.429 1.143q20.571 0 61.429-0.286t61.429-0.286h167.429q3.429 0 12-0.286t11.714 0 9.143 1.714 10 5.143 8.571 10l24 0.571q2.286 0 8-0.286t8-0.286q1.143-64 1.143-192 0-45.714-2.857-62.286-22.286-8-38.857-10.286-14.286 25.143-30.857 73.143-1.714 5.143-6.286 27.429t-8.286 42-4.286 20.286q-3.429 4.571-6.857 7.143t-8.857 3.429-7.429 1.429-10.286 0.286-9.429-0.286q-9.714 0-38 0.286t-42.571 0.286-36.571-1.143-40.571-3.429q-5.143-46.286-4.571-77.714 0-53.714 1.143-221.714t1.143-260q0-9.143-1.429-40.857t0-52.286 7.143-39.429q22.857-12 70.857-24.286t68.571-21.429q2.857-22.857 2.857-28.571 0-8-1.714-16.571l-19.429-0.571q-43.429-1.143-124.571 4.571t-118.286 5.714q-28.571 0-86.286-5.143t-86.857-5.143q-1.714 29.143-1.714 29.714v5.143q9.714 15.429 35.143 24.571t56.286 16.571 44.571 15.429q10.857 24 10.857 218.857 0 57.714-1.714 173.143t-1.714 173.143v66.857q0 1.143 0.286 8.857t0.286 14.286-0.571 14.571-1.714 13.714-2.857 8q-6.286 6.857-92.571 6.857-18.857 0-53.143-6.857t-45.714-14.857q-10.857-7.429-19.429-41.429t-18-63.429-24.286-30.571q-24 14.857-32 25.143zM808 135.714q5.143 10.571 24 10.571h45.714v585.143h-45.714q-18.857 0-24 10.571t6.286 25.429l72 92.571q11.429 14.857 28 14.857t28-14.857l72-92.571q11.429-14.857 6.286-25.429t-24-10.571h-45.714v-585.143h45.714q18.857 0 24-10.571t-6.286-25.429l-72-92.571q-11.429-14.857-28-14.857t-28 14.857l-72 92.571q-11.429 14.857-6.286 25.429z" />
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
index 610e7d14c..d0b7edcd3 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 43fd724b7..48d2dbd0d 100755
Binary files a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff differ