diff --git a/core/modules/shortcut/css/shortcut.icons.css b/core/modules/shortcut/css/shortcut.icons.css
index d7f5970..d356696 100644
--- a/core/modules/shortcut/css/shortcut.icons.css
+++ b/core/modules/shortcut/css/shortcut.icons.css
@@ -25,42 +25,29 @@
  * Add/remove links.
  */
 .add-or-remove-shortcuts .icon {
-  background: transparent url("../images/shortcut-add.png") no-repeat;
-  height: 12px;
-  margin-left: 8px; /* LTR */
-  overflow: hidden;
-  text-indent: 12px;
-  width: 12px;
+  background: transparent url('../images/favstar.svg') no-repeat left top;
+  width: 20px;
+  height: 20px;
+  vertical-align: text-bottom;
+  text-indent: -999em;
 }
 .no-svg .add-or-remove-shortcuts .icon {
-  background: transparent url("../images/shortcut-add.png") no-repeat;
+  background-image: url('../images/favstar.png');
 }
-[dir="rtl"] .add-or-remove-shortcuts .icon {
-  margin-left: 0;
-  margin-right: 8px;
-}
-[dir="rtl"] .add-or-remove-shortcuts .text {
-  padding: 0 10px 0 6px;
-}
-[dir="rtl"] .add-or-remove-shortcuts a:focus .text,
-[dir="rtl"] .add-or-remove-shortcuts a:hover .text {
-  border-radius: 5px 0 0 5px;
-}
-.add-shortcut a:focus .icon,
-.add-shortcut a:hover .icon {
-  background-position: 0 -12px; /* LTR */
+.add-shortcut a:hover .icon,
+.add-shortcut a:focus .icon {
+  background-position: -20px top;
 }
 [dir="rtl"] .add-shortcut a:focus .icon,
 [dir="rtl"] .add-shortcut a:hover .icon {
   background-position: 0 -24px;
 }
 .remove-shortcut .icon {
-  margin-top: 4px;
-  background-position: -12px 0;
+  background-position: -40px top;
 }
 .remove-shortcut a:focus .icon,
 .remove-shortcut a:hover .icon {
-  background-position: -12px -12px; /* LTR */
+  background-position: -60px top; /* LTR */
 }
 [dir="rtl"] .remove-shortcut a:focus .icon,
 [dir="rtl"] .remove-shortcut a:hover .icon {
diff --git a/core/modules/shortcut/css/shortcut.module.css b/core/modules/shortcut/css/shortcut.module.css
index 05672e9..9ec5829 100644
--- a/core/modules/shortcut/css/shortcut.module.css
+++ b/core/modules/shortcut/css/shortcut.module.css
@@ -7,13 +7,11 @@
  * Add/remove links.
  */
 .add-or-remove-shortcuts .icon {
-  display: block;
-  float: left; /* LTR */
+  display: inline-block;
   margin-top: 5px;
 }
 .add-or-remove-shortcuts .text {
   display: none;
-  float: left; /* LTR */
   padding-top: 2px;
 }
 [dir="rtl"] .add-or-remove-shortcuts .icon,
diff --git a/core/modules/shortcut/css/shortcut.theme.css b/core/modules/shortcut/css/shortcut.theme.css
index 018f328..3d29110 100644
--- a/core/modules/shortcut/css/shortcut.theme.css
+++ b/core/modules/shortcut/css/shortcut.theme.css
@@ -19,3 +19,12 @@
 [dir="rtl"] .toolbar .toolbar-tray-horizontal .edit-shortcuts {
   float: right;
 }
+
+/**
+ * Add/remove links.
+ */
+.add-or-remove-shortcuts {
+  display: inline-block;
+  margin-left: 0.3em;
+}
+
diff --git a/core/modules/shortcut/images/favstar.png b/core/modules/shortcut/images/favstar.png
new file mode 100755
index 0000000..bd51fde
--- /dev/null
+++ b/core/modules/shortcut/images/favstar.png
@@ -0,0 +1,8 @@
+‰PNG
+
+   IHDR   P      Øº×  ýIDATXGíXkPSGÞ{ó€@X§"tF?•‡RG…à³­Ö'Qe†¶´cSZ€z[!ZÚ:þ(ã@m%¼ÄGÕñl©ƒ"vF¢£h¬A^{»{á21$÷&ÈOw&™›Ý³ßžûížóÞ´×b ãš¼(Â×&«‘ÏÜ©<~ñN×¶ñÑÆ#”Á¾`lZ³ßÚF¨æ×ñáÌï6AuLçÂã$p,nÈ„G¼å„îzÅë88ÚxDúTå”ðiÙ¨Æ††Dn#½Ù#m/   	Í7™LÅ\xœ*dqùV@æ!@…¥jŠ«6Ô94o´ñr¶M&O^÷6Â.Ò·«jéÍi#Ò§×*df‘ÈZü‘[_À†ÅJ bõÌP€34ºë©ÌË²O¥)¹y$Ž6¡œåã'®Ú²#M„ü9¸÷pOwGg,¡n¬‰çñÎdíÉxÍÇ0*É#'P6{“}Ø2á§ÑUÓ'ÒÓ¦p‚‡a¤¯¶¨ZKl•RØ¯çŒ
+fÝì­Ó5óIå1±³è®U5àÊE½6kÿm…§¾Ñk§…¼3#äÃ>ˆG¿ï5?ÔœÐœV°’PëéÜJ(¥  eð18 ¯sé,Jö¤DünÊãeUÏÐää•±ãmÅ$ÕS1q†gÿ’ž8 ’Ö/•E’±ÊÜfGÔG-6k{ Wòw$xP<Z¾NßØõÖ¸qô	<–_fyôÈä(PIL¤çÀU€(ØW		”ÒÊe±™†l£]£ ©E§Ã¾Ož—Šá`™“¾¡)º®òÁa#Pµ-úbŸµo¡ãšs¥±–Ä‰Þöýœ>ß{³¦ÖËÑÖK(¸¸cß­Å¨wZx9†åŽ6aSß­”ÉW'0ý–ž^pägmkW—%ˆ&5D Ð¤èTÒ*ÖÄj­¥ÒéªëÃÙµvÕ¬Ÿ·IST%÷!ÍÕL8ïÙÙ½>E!
+Äé‹3ƒ»MÍ D[Ú³ó ÁéáæµŠ$ãä)“#¹ ‰……Àôôc:DÞ Ÿˆ@$<AIRù'Š«/sÚ¯Kš=Ç±T`³f2ââ.ž»¢äÎãó«–¬X"Ššá‰{ îÖp¶ül­¿H\Àq}Âüø†„Ä¹ql€46“é¶g&'å@ú¥1Á&
+`õÚâëùîxI‡3 ÂeÍsTfOñ¸r zioï²ˆ¨ˆÀ÷—.¢Îü=wú|_ƒ¡¾ÕÒm"ðª2ˆ„„›“?Ý0¶ö8ˆ¼_Oƒ§OŸ£nÃàX¤=‰¯ˆ}K#VŒºÏ¥´HQ……ò^vf¸Oð¸¤C
+‡ÀklÌUÁ+’–Ù6¹ødY×¿wï=¶ö¶Ír%(´pàbý„À€ŽÏ¿úlŽ#Þ©ò«ÀP×üýÅmíÿu†ÒãB ‡ß(ôaŠIqªÂŠ5qPœ	ÅÐîØ0ÆîØºC ƒsµ+;“5H¾ÏÊ°v«$r…‡Nà…U`á‚˜zñøéÜA—1B †"¢{OïªùŒ ¸ò	;åŒ»xî¤æò„S&±õæûúl}æ ®rfð>Ø•5†Í‡¼ÜŸ6´?|ÖoØ!EÅùø2X¾d°Ê×ÌV‘ýdÅÉÒšlvîâ¡œÉëè5qÕ—ÄæðAA¿¥~ñ‰/ÛºùGu¶¶>I&Õ—³Ù!<‘·7ñmæfVE>sÈÐc±ŽxÃ„ÄÐ¥SÿÉd³Ãöêƒ¥ÎL©ãhçÊÉÑÆƒwU"a^ünø¡—4Þ J‹Ê-èyÕšÞL©Syå€ŸïˆÜ‚•@ˆ65LÊÔÍÿ4tÚ’qhì{Á”:°¯²©±IïˆçŒ@U?´Þí]÷ûÇøÉ1œšoë·ÑW7TëQ$v™ÿ²Ckñ÷åc@îÎIM¼2gÖÉäI‘Çýåk½µß"mI_Ýx8®ž9“Î÷zúäÐi‹Ûrn¢Â×e#Ò¦é×®—I&O)Ö–Üniy‹»z JOªK’¯žþÐø°åäï:3q¸Aj6Œ@”ð)ŠRÃJ]NQÀÈoïT3a…òY¿¿X	Ç‚á˜Þ^”îˆÍhâ¡„¿|ÕRpéÂ•n‹¥Wo³š×3y	å3¡×¸"·`ñ<ŸS¥g8…áIçÅÿuíêŸÁ6’ªÅ¨Ž{<
+ó+àáXt|â\£þÊµ9ŽÂä*„ÃÙò“×àNÔ;^õ·z0„GooFô>øÇä‚^k_¶«ü†òš—@˜ppi‡ªv;WÃ“&…5¡š”žLîf[ìÍØpþy®ÎB?¯®    IEND®B`‚
\ No newline at end of file
diff --git a/core/modules/shortcut/images/favstar.svg b/core/modules/shortcut/images/favstar.svg
new file mode 100644
index 0000000..cb50c24
--- /dev/null
+++ b/core/modules/shortcut/images/favstar.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="80px"
+	 height="20px" viewBox="0 0 80 20" enable-background="new 0 0 80 20" xml:space="preserve">
+<g id="checked:hover">
+	<path fill="#FEF6A8" d="M69.729,2.259c0.149-0.385,0.394-0.385,0.543,0l1.959,5.049c0.149,0.385,0.609,0.699,1.021,0.699
+		l1.75,0.169c0.412,0,0.493,0.219,0.18,0.487l-1.31,0.981c-0.313,0.268-0.497,0.816-0.407,1.22l1.472,6.562
+		c0.09,0.403-0.118,0.547-0.463,0.319l-3.848-2.539c-0.345-0.228-0.907-0.228-1.252,0l-3.848,2.539
+		c-0.345,0.228-0.553,0.084-0.463-0.319l1.047-4.707c0.09-0.403-0.094-0.952-0.407-1.22l-3.518-3.006
+		c-0.313-0.268-0.232-0.487,0.18-0.487h4.381c0.412,0,0.872-0.314,1.021-0.699L69.729,2.259z"/>
+	<path display="none" fill="#80722D" d="M75.027,13.229l-0.026-0.026l-0.821,0.821l0.757,3.402c0.061,0.273-0.015,0.428-0.178,0.428
+		c-0.077,0-0.174-0.035-0.285-0.108l-3.848-2.539c-0.173-0.114-0.399-0.171-0.626-0.171s-0.453,0.057-0.626,0.171l-3.848,2.539
+		c-0.111,0.073-0.208,0.108-0.285,0.108c-0.163,0-0.238-0.154-0.178-0.428l1.047-4.707c0.09-0.403-0.094-0.952-0.407-1.22
+		l-3.518-3.006c-0.313-0.268-0.232-0.487,0.18-0.487h4.381c0.412,0,0.872-0.314,1.021-0.699l1.961-5.049
+		C69.803,2.066,69.901,1.97,70,1.97s0.197,0.096,0.271,0.289l0.586,1.511l0.773-0.772l-0.427-1.101C70.87,1.037,70.198,0.97,70,0.97
+		s-0.87,0.067-1.204,0.927l-1.961,5.049c-0.01,0.011-0.075,0.055-0.109,0.062l-4.36-0.001c-0.934,0-1.231,0.61-1.3,0.797
+		c-0.069,0.187-0.239,0.844,0.471,1.451l3.518,3.005c0.039,0.043,0.086,0.186,0.079,0.25l-1.046,4.7
+		c-0.132,0.595,0.052,0.983,0.229,1.205c0.224,0.279,0.561,0.439,0.925,0.439c0.279,0,0.562-0.093,0.836-0.273l3.848-2.539
+		c-0.001,0-0.001,0.001,0.001,0.001c0.006,0,0.035-0.007,0.074-0.007c0.048,0,0.081,0.01,0.089,0.014l3.834,2.531
+		c0.274,0.181,0.556,0.273,0.836,0.273c0.364,0,0.701-0.16,0.925-0.439c0.178-0.222,0.361-0.61,0.229-1.206L75.027,13.229z"/>
+	<polygon fill="#807640" points="77.548,5 75.002,7.547 72.456,5 71.041,6.415 73.587,8.961 71.044,11.505 72.457,12.919
+		75.001,10.375 77.546,12.919 78.96,11.505 76.415,8.96 78.962,6.414 	"/>
+	<path fill="#80722D" d="M75.172,13.897c0,0-0.133-0.516-0.651-0.349c-0.516,0.166-0.302,0.674-0.302,0.674l0.719,3.204
+		c0.061,0.273-0.016,0.428-0.178,0.428c-0.078,0-0.174-0.035-0.285-0.107l-3.848-2.539c-0.174-0.115-0.4-0.172-0.627-0.172
+		s-0.453,0.057-0.625,0.172l-3.848,2.539c-0.111,0.072-0.209,0.107-0.285,0.107c-0.164,0-0.24-0.154-0.178-0.428l1.047-4.707
+		c0.09-0.402-0.094-0.951-0.408-1.219l-3.518-3.007c-0.314-0.269-0.232-0.487,0.18-0.487h4.383c0.412,0,0.871-0.314,1.021-0.699
+		l1.959-5.049C69.803,2.066,69.902,1.971,70,1.971s0.197,0.096,0.271,0.288l0.461,1.158c0,0,0.255,0.409,0.635,0.219
+		c0.44-0.221,0.227-0.66,0.227-0.66l-0.389-1.078C70.869,1.037,70.197,0.971,70,0.971s-0.869,0.066-1.203,0.926l-1.961,5.049
+		c-0.01,0.012-0.074,0.056-0.109,0.062l-4.361-0.001c-0.934,0-1.23,0.609-1.301,0.796c-0.068,0.187-0.238,0.844,0.471,1.451
+		l3.52,3.007c0.037,0.041,0.086,0.186,0.078,0.25l-1.045,4.699c-0.133,0.596,0.051,0.984,0.229,1.205
+		c0.225,0.279,0.561,0.439,0.926,0.439c0.279,0,0.561-0.092,0.836-0.273l3.848-2.539c-0.002,0-0.002,0.002,0,0.002
+		c0.006,0,0.035-0.008,0.074-0.008c0.049,0,0.08,0.01,0.088,0.014l3.836,2.531c0.273,0.182,0.557,0.273,0.836,0.273
+		c0.363,0,0.701-0.16,0.924-0.439c0.178-0.221,0.361-0.609,0.23-1.205L75.172,13.897z"/>
+</g>
+<g id="checked">
+	<path fill="#FEF6A8" d="M54.759,18.355c-0.18,0-0.369-0.064-0.561-0.191l-3.848-2.539c-0.083-0.055-0.215-0.088-0.351-0.088
+		s-0.268,0.033-0.351,0.088l-3.848,2.539c-0.191,0.127-0.381,0.191-0.561,0.191c-0.212,0-0.407-0.092-0.535-0.252
+		c-0.109-0.136-0.22-0.383-0.131-0.784l1.047-4.708c0.05-0.222-0.071-0.584-0.243-0.731L41.86,8.874
+		c-0.451-0.386-0.378-0.756-0.326-0.897c0.053-0.141,0.237-0.47,0.831-0.47h4.381c0.206,0,0.48-0.188,0.556-0.38l1.961-5.049
+		C49.476,1.529,49.85,1.47,50,1.47s0.524,0.059,0.737,0.607l1.959,5.049c0.075,0.191,0.35,0.38,0.556,0.38h4.383
+		c0.594,0,0.778,0.329,0.831,0.47c0.052,0.142,0.125,0.512-0.326,0.897l-3.518,3.006c-0.173,0.147-0.294,0.51-0.244,0.731
+		l1.047,4.708c0.089,0.401-0.021,0.647-0.131,0.784C55.166,18.264,54.971,18.355,54.759,18.355z"/>
+	<path fill="#80722D" d="M50,1.97c0.099,0,0.196,0.096,0.271,0.289l1.959,5.049c0.149,0.385,0.609,0.699,1.021,0.699h4.383
+		c0.412,0,0.493,0.219,0.18,0.487L54.297,11.5c-0.313,0.268-0.497,0.816-0.407,1.22l1.047,4.708
+		c0.061,0.273-0.015,0.428-0.178,0.428c-0.077,0-0.174-0.035-0.285-0.108l-3.848-2.539c-0.173-0.113-0.399-0.171-0.626-0.171
+		s-0.453,0.058-0.626,0.171l-3.848,2.539c-0.111,0.073-0.208,0.108-0.285,0.108c-0.163,0-0.238-0.154-0.178-0.428l1.047-4.708
+		c0.09-0.403-0.094-0.952-0.407-1.22l-3.518-3.006c-0.313-0.268-0.232-0.487,0.18-0.487h4.381c0.412,0,0.872-0.314,1.021-0.699
+		l1.961-5.049C49.804,2.066,49.901,1.97,50,1.97 M50,0.97c-0.198,0-0.87,0.067-1.204,0.927l-1.961,5.049
+		c-0.01,0.011-0.075,0.055-0.109,0.062l-4.36-0.001c-0.934,0-1.231,0.61-1.3,0.797c-0.069,0.187-0.239,0.844,0.471,1.451
+		l3.518,3.005c0.039,0.043,0.086,0.186,0.079,0.25l-1.046,4.701c-0.132,0.595,0.052,0.983,0.229,1.205
+		c0.224,0.279,0.561,0.439,0.925,0.439c0.28,0,0.562-0.093,0.836-0.273l3.848-2.539c-0.001,0-0.001,0.001,0.001,0.001
+		c0.006,0,0.035-0.007,0.074-0.007c0.048,0,0.081,0.01,0.089,0.014l3.834,2.531c0.274,0.181,0.557,0.273,0.836,0.273
+		c0.364,0,0.701-0.16,0.925-0.439c0.178-0.222,0.361-0.61,0.229-1.206l-1.046-4.707c-0.006-0.058,0.041-0.2,0.086-0.248l3.512-3
+		c0.71-0.607,0.54-1.264,0.471-1.451c-0.068-0.187-0.366-0.797-1.3-0.797h-4.383c-0.014-0.006-0.079-0.05-0.098-0.08l-1.95-5.03
+		C50.87,1.037,50.198,0.97,50,0.97L50,0.97z"/>
+</g>
+<g id="unchecked:hover">
+	<path opacity="0.7" fill="#5A563B" d="M35.414,14.96c0,0-0.133-0.516-0.651-0.349c-0.516,0.166-0.302,0.674-0.302,0.674
+		l0.477,2.142c0.061,0.273-0.016,0.428-0.178,0.428c-0.078,0-0.174-0.035-0.285-0.107l-3.848-2.539
+		c-0.174-0.115-0.4-0.172-0.627-0.172s-0.453,0.057-0.625,0.172l-3.848,2.539c-0.111,0.072-0.209,0.107-0.285,0.107
+		c-0.164,0-0.24-0.154-0.178-0.428l1.047-4.707c0.09-0.402-0.094-0.951-0.408-1.219l-3.518-3.007
+		c-0.314-0.269-0.232-0.487,0.18-0.487h4.383c0.412,0,0.871-0.314,1.021-0.699l1.959-5.049C29.803,2.066,29.902,1.971,30,1.971
+		s0.197,0.096,0.271,0.288l1.377,3.538c0,0,0.255,0.409,0.635,0.219c0.44-0.221,0.227-0.66,0.227-0.66l-0.607-1.658l-0.697-1.801
+		C30.869,1.037,30.197,0.971,30,0.971s-0.869,0.066-1.203,0.926l-1.961,5.049c-0.01,0.012-0.074,0.056-0.109,0.062l-4.361-0.001
+		c-0.934,0-1.23,0.609-1.301,0.796c-0.068,0.187-0.238,0.844,0.471,1.451l3.52,3.007c0.037,0.041,0.086,0.186,0.078,0.25
+		l-1.045,4.699c-0.133,0.596,0.051,0.984,0.229,1.205c0.225,0.279,0.561,0.439,0.926,0.439c0.279,0,0.561-0.092,0.836-0.273
+		l3.848-2.539c-0.002,0-0.002,0.002,0,0.002c0.006,0,0.035-0.008,0.074-0.008c0.049,0,0.08,0.01,0.088,0.014l3.836,2.531
+		c0.273,0.182,0.557,0.273,0.836,0.273c0.363,0,0.701-0.16,0.924-0.439c0.178-0.221,0.361-0.609,0.23-1.205L35.414,14.96z"/>
+	<polygon fill="#807640" points="39,7.96 36,7.96 36,4.96 34,4.96 34,7.96 31,7.96 31,9.959 34,9.959 34,12.96 36,12.96 36,9.959
+		39,9.959 	"/>
+</g>
+<g id="unchecked">
+	<path opacity="0.7" fill="#5A563B" d="M10,1.97c0.098,0,0.197,0.096,0.271,0.289l1.959,5.049c0.149,0.385,0.609,0.699,1.021,0.699
+		h4.383c0.412,0,0.493,0.219,0.18,0.487L14.297,11.5c-0.313,0.268-0.497,0.816-0.407,1.22l1.047,4.707
+		c0.061,0.273-0.015,0.428-0.178,0.428c-0.077,0-0.174-0.035-0.285-0.108l-3.848-2.539c-0.172-0.114-0.399-0.171-0.626-0.171
+		s-0.454,0.057-0.626,0.171l-3.848,2.539c-0.111,0.073-0.208,0.108-0.285,0.108c-0.163,0-0.239-0.154-0.178-0.428L6.11,12.72
+		c0.09-0.403-0.094-0.951-0.407-1.22L2.185,8.494c-0.313-0.268-0.233-0.487,0.18-0.487h4.382c0.413,0,0.872-0.314,1.021-0.699
+		l1.96-5.049C9.803,2.066,9.901,1.97,10,1.97 M10,0.97c-0.198,0-0.87,0.067-1.204,0.927l-1.96,5.049
+		c-0.01,0.011-0.075,0.055-0.109,0.062L2.365,7.007c-0.934,0-1.231,0.61-1.3,0.796C0.996,7.99,0.826,8.647,1.535,9.254l3.519,3.007
+		c0.038,0.041,0.086,0.185,0.079,0.249l-1.046,4.7c-0.133,0.595,0.051,0.983,0.229,1.205c0.224,0.279,0.561,0.439,0.925,0.439
+		c0.28,0,0.562-0.093,0.836-0.274l3.848-2.538c-0.001,0-0.001,0.001,0,0.001c0.006,0,0.036-0.007,0.075-0.007
+		c0.048,0,0.081,0.01,0.088,0.014l3.834,2.531c0.274,0.181,0.557,0.273,0.836,0.273c0.364,0,0.701-0.16,0.925-0.439
+		c0.178-0.222,0.361-0.61,0.229-1.206l-1.047-4.706c-0.006-0.058,0.041-0.2,0.086-0.248l3.512-3c0.71-0.607,0.54-1.264,0.471-1.451
+		c-0.068-0.187-0.366-0.797-1.3-0.797h-4.383c-0.014-0.006-0.079-0.05-0.098-0.08l-1.95-5.03C10.87,1.037,10.198,0.97,10,0.97
+		L10,0.97z"/>
+</g>
+</svg>
diff --git a/core/modules/shortcut/images/shortcut-add.png b/core/modules/shortcut/images/shortcut-add.png
deleted file mode 100644
index 2924557..0000000
--- a/core/modules/shortcut/images/shortcut-add.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-   IHDR      $   ¤
-   gAMA  ±Ž|ûQ“   “PLTE   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¥¥£ÙÚØááà×ØÖ÷ø÷ÛÛÚÙÙØ¥¥¢~~~‡‡‡NNNlllHHH½½½EEExxx´´´ÉÉÉ¥¥¥££ pql···---±±±ûûûããâcd_KKK_`[ÿÿÿ   |À®   tRNS ÒloÀùÃÏÆùó6e£…  -IDAT(Ï]’YŽƒ0DÛØB&Ù÷…vÈýO7vg,—§>Ðƒ–ZÕO‘ÑdIAäs8~œ/Í±‡>‹`ÿálL²Ð0ú‘KfN.)~ÛA3sÚ˜Fþlòi&È8øA¦Ä­J·*!u³ƒ“bæœ”®{eì¶¦®c}T·ÏÃî„>ëU4±ÿÙø)ËEV÷½ÏÖÏüÕ{ìüT52ºÊÀU†®fàj†JJd,‘ÑU
-®RtµWkpeê:v~*s ðŸŸÕô«Äqß×Ù¢,ù_B¦þ5/ŽÍåüÐÿ2ÕÕæ[ddÊr[·ÌœBÒ¬µƒwÌÌyÇT6VC7B¦%¼ SêV%©[•Ðúd7ÅÌ¹)]wÛ1_M]Çú¨ê¾;<Û<=6¦«aˆ”ðù8ÕmÙÚ´[‘    IEND®B`‚
\ No newline at end of file
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index c628c55..c8006fe 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -200,9 +200,21 @@ pre {
  */
 #branding {
   overflow: hidden;
-  padding: 20px 20px 0 20px; /* LTR */
-  position: relative;
   background-color: #e0e0d8;
+  padding: 24px 0 12px;
+}
+/* This layout styling is a copy of #page.
+ * @TODO: Replace with reuseable layout classes.
+ **/
+.branding__inner {
+  margin-left: 1.25em;
+  margin-right: 1.25em;
+}
+@media screen and (min-width:45em) { /* 720px */
+  .branding__inner {
+    margin-left: 2.5em;
+    margin-right: 2.5em;
+  }
 }
 [dir="rtl"] #branding {
   padding: 20px 20px 0 20px;
@@ -233,16 +245,16 @@ pre {
  * Page title.
  */
 #page-title {
-  background: #333;
   padding-top: 20px;
 }
-#branding h1.page-title {
-  color: #000;
+#branding .page-title {
+  color: #333;
+  display: inline-block;
   margin: 0;
-  padding-bottom: 10px;
-  font-size: 1.385em;
-  font-weight: normal;
-  float: left; /* LTR */
+  font-size: 1.625em;
+  line-height: 1.875em;
+  font-weight: 600;
+  -webkit-font-smoothing: antialiased;
 }
 [dir="rtl"] #branding h1.page-title {
   float: right;
@@ -1033,7 +1045,7 @@ body.in-maintenance #page {
   padding-top: 2em;
   width: 90%;
 }
-body.in-maintenance #branding h1 {
+body.in-maintenance .branding__inner {
   max-width: 770px;
   margin: 0 auto;
   float: none;
@@ -1138,10 +1150,7 @@ h1#overlay-title {
 /* Shortcut theming */
 .add-or-remove-shortcuts a:focus span.text,
 .add-or-remove-shortcuts a:hover span.text {
-  color: #fff;
-  background-color: #5f605b;
-  padding: 0 6px;
-  border-radius: 5px;
+  display: none;
 }
 
 /* Field UI */
diff --git a/core/themes/seven/templates/maintenance-page.html.twig b/core/themes/seven/templates/maintenance-page.html.twig
index ecd7286..28b3e0f 100644
--- a/core/themes/seven/templates/maintenance-page.html.twig
+++ b/core/themes/seven/templates/maintenance-page.html.twig
@@ -24,7 +24,9 @@
   {{ page_top }}
 
   <header id="branding">
-    {% if title %}<h1 class="page-title">{{ title }}</h1>{% endif %}
+    <div class="branding__inner">
+      {% if title %}<h1 class="page-title">{{ title }}</h1>{% endif %}
+    </div>
   </header>
 
   <div id="page">
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
index 5a50431..fb8a6cb 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -66,15 +66,16 @@
  */
 #}
   <header id="branding" class="clearfix">
-    {{ breadcrumb }}
-    {{ title_prefix }}
-    {% if title %}
-      <h1 class="page-title">{{ title }}</h1>
-    {% endif %}
-    {{ title_suffix }}
-    {% if primary_local_tasks %}
-      {{ primary_local_tasks }}
-    {% endif %}
+    <div class="branding__inner">
+      {{ title_prefix }}
+      {% if title %}
+        <h1 class="page-title">{{ title }}</h1>
+      {% endif %}
+      {{ title_suffix }}
+      {% if primary_local_tasks %}
+        {{ primary_local_tasks }}
+      {% endif %}
+    </div>
   </header>
 
   <div id="page">