diff --git a/resources/extensions/VisualEditor.article.less b/resources/extensions/VisualEditor.article.less
index 4a34d96..69ec0d5 100644
--- a/resources/extensions/VisualEditor.article.less
+++ b/resources/extensions/VisualEditor.article.less
@@ -2,15 +2,6 @@
 
 @media screen {
 	.client-js {
-		.mw-editsection a {
-			.background-image-svg( '../images/brackets-grey.svg', '../images/brackets-grey.png' );
-			margin-right: 1.25em;
-		}
-
-		.mw-editsection a.mw-editsection-visualeditor {
-			.background-image-svg( '../images/pencil-grey.svg', '../images/pencil-grey.png' );
-		}
-
 		.mw-editsection-divider {
 			display: none;
 		}
@@ -23,7 +14,7 @@
 
 			#ca-edit a {
 				.ca-icon();
-				.background-image-svg( '../images/brackets-grey.svg', '../images/brackets-grey.png' );
+				.background-image-svg( '../images/pencil-source-grey.svg', '../images/pencil-source-grey.png' );
 			}
 		}
 	}
diff --git a/resources/images/editing icons.svg b/resources/images/editing icons.svg
deleted file mode 100644
index 45d8cda..0000000
--- a/resources/images/editing icons.svg	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20.016 20.016">
-	<path id="path4167" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-dasharray="none" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width="65" d="M-30.425 2.002a1.14 1.14 0 0 0-1.143 1.143v.743a6.29 6.29 0 0 0-1.894.784l-.518-.518a1.141 1.141 0 0 0-1.618 0L-36 4.56a1.141 1.141 0 0 0 0 1.618l.522.521a6.29 6.29 0 0 0-.779 1.88H-37a1.14 1.14 0 0 0-1.144 1.143v.574c0 .633.51 1.143 1.144 1.143h.743a6.29 6.29 0 0 0 .784 1.894l-.527.528a1.141 1.141 0 0 0 0 1.617l.404.405a1.14 1.14 0 0 0 1.617 0l.534-.533a6.29 6.29 0 0 0 1.878.778v.744c0 .634.51 1.143 1.143 1.143h.573a1.14 1.14 0 0 0 1.144-1.143v-.744a6.29 6.29 0 0 0 1.88-.776l.531.531c.448.448 1.17.448 1.618 0l.405-.405a1.141 1.141 0 0 0 0-1.617l-.53-.532a6.29 6.29 0 0 0 .785-1.89h.744a1.14 1.14 0 0 0 1.143-1.143V9.72a1.14 1.14 0 0 0-1.143-1.143h-.744a6.29 6.29 0 0 0-.777-1.88l.522-.521a1.141 1.141 0 0 0 0-1.618l-.405-.405a1.141 1.141 0 0 0-1.618 0l-.52.52a6.29 6.29 0 0 0-1.891-.786v-.743a1.14 1.14 0 0 0-1.144-1.143h-.573zm.287 4.448a3.558 3.558 0 0 1 3.558 3.558 3.558 3.558 0 0 1-3.558 3.558 3.558 3.558 0 0 1-3.559-3.558 3.558 3.558 0 0 1 3.559-3.558z" opacity="1"/>
-	<g id="g4" transform="translate(-57.03 -52.738)">
-		<path id="path6" fill="none" stroke="#aaa" stroke-linecap="round" stroke-width="2.55" d="M92.5 69.3l-5.04-2.23-4.81 2.69.568-5.48-4.04-3.74 5.39-1.15 2.31-5 2.76 4.77 5.47.649-3.68 4.1z" transform="matrix(.781 .0353 -.0351 .786 21.1 10)"/>
-	</g>
-	<path fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-dasharray="none" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width="3" d="M-16 2v16h13V7.01L-8 2zm2 2h4.994v4H-5v8h-9z" opacity="1" transform="scale(1.00079)"/>
-	<path id="path4178" fill="none" fill-opacity="1" fill-rule="evenodd" stroke="#aaa" stroke-dasharray="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width="2.252" d="M-50.278 10.673h.031c3.202 0 5.798-1.642 5.798-3.667 0-2.026-2.596-3.668-5.798-3.668-3.201 0-5.797 1.642-5.797 3.668" opacity="1"/>
-	<ellipse id="path4180" cx="-55.251" cy="11.188" fill="none" fill-opacity="1" fill-rule="evenodd" stroke="#aaa" stroke-dasharray="none" stroke-linecap="square" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width="2.252" opacity="1" rx="5.004" ry="3.428"/>
-	<path id="path4190" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="0" stroke-width="1.069" d="M-57.753 15.066c.588 1.557-.103 2.54-1 3.428 3.464-.732 3.444-2.136 4.003-3.428z"/>
-	<path id="path4190-0" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="0" stroke-width="1.069" d="M-46.744 11.13c-.587 1.558.104 2.54 1 3.429-3.464-.733-3.443-2.137-4.002-3.429z"/>
-	<path id="path4214" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="1" stroke-width="1" d="M53.993 1.98l-8.907 8.907 4.953 4.954 8.907-8.907zm0 2.831l2.123 2.123-6.077 6.076-2.123-2.123z"/>
-	<path id="path4219" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="#000" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="0" stroke-width="1.001" d="M48.624 17.256H43.67v-4.953z"/>
-	<path id="path4221" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-dasharray="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="0" stroke-width="2.25" d="M-76.06 1a8.006 8.006 0 0 0-8.006 8.007 8.006 8.006 0 0 0 8.006 8.006 8.006 8.006 0 0 0 8.006-8.006 8.006 8.006 0 0 0-8.006-8.006zm0 2.002a6.005 6.005 0 0 1 6.005 6.005 6.005 6.005 0 0 1-6.005 6.005 6.005 6.005 0 0 1-6.005-6.005 6.005 6.005 0 0 1 6.005-6.005z" opacity="1"/>
-	<path id="path4226" fill="none" fill-rule="evenodd" stroke="#aaa" stroke-dasharray="none" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width="2.002" d="M-76.06 5.004v4.003h2.002"/>
-	<path fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-dasharray="none" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width="2.002" d="M65 5v3.271A2 2 0 0 1 66 8a2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-1-.27V15h10V5H65z" opacity="1" transform="scale(1.00079)"/>
-	<circle id="circle54-1" cx="76.061" cy="10.008" r="2.002" fill="#aaa" fill-opacity="1" fill-rule="evenodd"/>
-	<circle id="circle54-1-8" cx="70.056" cy="4.003" r="2.002" fill="#aaa" fill-opacity="1" fill-rule="evenodd"/>
-	<circle id="circle54-1-8-5" cx="70.055" cy="16.013" r="2.002" fill="#aaa" fill-opacity="1" fill-rule="evenodd"/>
-	<rect width="2.552" height="12.009" x="84.517" y="4.003" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-dasharray="none" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width="2.502" opacity="1" ry=".964"/>
-	<rect width="2.552" height="12.009" x="8.732" y="-91.797" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-dasharray="none" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width="2.502" opacity="1" ry=".964" transform="rotate(90)"/>
-	<path fill="#aaa" fill-opacity="1" stroke="#aaa" stroke-dasharray="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width=".2" d="M5.164 2.242c-1.44 3.333-2.91 6.53-4.427 9.848.18-.045.675-.045.84-.045.166 0 .495 0 .675.045.225-.886.676-2.072 1.186-3.333.57-.015 1.456-.031 1.996-.031.48 0 .992.016 1.487.03.706 1.892 1.036 3.018 1.126 3.334.256-.045.961-.045 1.216-.045s1.111 0 1.366.045c-.75-1.517-2.823-6.56-4.114-9.848h-1.35zm.03 2.387h.091a88.55 88.55 0 0 1 1.32 3.287c-.42.015-.9.014-1.245.014-.436 0-1.095.001-1.576-.014l1.41-3.287z" font-family="Linux Biolinum" font-size="15.012" font-stretch="normal" font-style="normal" font-variant="normal" font-weight="700" letter-spacing="1.001" word-spacing="0" style="line-height:125%;"/>
-	<path fill="#aaa" fill-opacity="1" stroke="#aaa" stroke-dasharray="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width=".2" d="M11.748 5.272a.151.151 0 0 0-.128.11c-.084.084-.084.275 0 .572.128.254.128.952 0 2.095-.55.085-1.038.15-1.462.192H9.08c-.38-.042-.55 0-.508.127.085.127.317.232.698.317.381.084.72.127 1.016.127.34 0 .763-.02 1.271-.063-.042.89-.085 1.714-.127 2.477-1.652 1.185-2.668 2.224-3.05 3.113-.338.89-.38 1.588-.126 2.096.254.466.53.72.826.762.34.042.656.022.952-.062.297-.127.593-.297.89-.509a9.5 9.5 0 0 0 1.016-.889c.339.805.635 1.206.89 1.206.254-.042.423-.127.508-.254.084-.17.022-.36-.19-.57-.17-.213-.36-.551-.573-1.017.509-.72.932-1.398 1.27-2.033.34-.635.636-1.398.89-2.287 1.06-.042 1.844.147 2.352.57.55.424.867.997.952 1.717.084.678-.043 1.355-.381 2.033-.34.635-.847 1.206-1.525 1.714-.72.466-1.44.805-2.16 1.016-.678.255-.994.424-.952.509 0 .042.36-.02 1.079-.19.762-.127 1.525-.403 2.287-.827.762-.466 1.335-.994 1.716-1.587.424-.635.678-1.25.763-1.843.084-.636.042-1.186-.128-1.652a2.329 2.329 0 0 0-.889-1.206 2.999 2.999 0 0 0-1.398-.635c-.465-.127-1.016-.192-1.651-.192.085-.38-.043-.635-.381-.762-.34-.127-.509-.085-.509.127.043.17.063.403.063.7a8.658 8.658 0 0 0-1.841.635c.042-.72.105-1.482.19-2.287 2.329-.635 3.579-1.039 3.748-1.208.17-.17.105-.317-.191-.444-.297-.127-.698-.064-1.206.19-.508.212-1.27.446-2.287.7.084-.805.212-1.313.381-1.525.212-.254.212-.466 0-.635-.254-.212-.508-.339-.762-.381a.5.5 0 0 0-.254-.047zm2.16 5.637c-.382 1.27-.932 2.392-1.652 3.366a22.724 22.724 0 0 1-.127-2.604c.593-.38 1.186-.635 1.778-.762zm-2.415 1.143c0 1.398.063 2.372.19 2.923-.678.762-1.186 1.228-1.525 1.397-.38.127-.72.127-1.016 0-.254-.127-.339-.466-.254-1.016.042-.55.318-1.123.827-1.716a9.163 9.163 0 0 1 1.778-1.588z" font-family="KaiTi" font-size="16.263" font-stretch="normal" font-style="normal" font-variant="normal" font-weight="400" letter-spacing="1.001" word-spacing="0" style="line-height:125%;-inkscape-font-specification:KaiTi"/>
-	<text x="1.947" y="-33.133" fill="#aaa" fill-opacity="1" stroke="none" stroke-dasharray="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width=".2" font-family="Linux Biolinum" font-size="15.012" font-stretch="normal" font-style="normal" font-variant="normal" font-weight="700" letter-spacing="1.001" word-spacing="0" xml:space="preserve" style="line-height:125%;">
-		<tspan id="tspan4373-1" x="1.947" y="-14.368" stroke="none" stroke-width=".2">A</tspan>
-	</text>
-	<text x="6.906" y="-8.706" fill="#aaa" fill-opacity="1" stroke="none" stroke-dasharray="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" stroke-opacity="1" stroke-width=".2" font-family="KaiTi" font-size="16.263" font-stretch="normal" font-style="normal" font-variant="normal" font-weight="400" letter-spacing="1.001" word-spacing="0" xml:space="preserve" style="line-height:125%;-inkscape-font-specification:KaiTi">
-		<tspan id="tspan4377-5" x="6.906" y="-8.706" stroke="none" stroke-width=".2">あ</tspan>
-	</text>
-	<path fill="#666" fill-opacity=".588" fill-rule="evenodd" stroke="none" stroke-dasharray="none" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="4" stroke-opacity="1" stroke-width="1.001" d="M-105.083 0h20.016v20.016h-20.016z" opacity=".4"/>
-	<path id="path4530" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="1" stroke-width="1.001" d="M-103.081 3.002h3.002v1.001h-1v12.01h1v1h-3.002z"/>
-	<path id="path4532" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="1" stroke-width="1.001" d="M-87.069 3.002v14.011h-3.002v-1h1V4.003h-1v-1z"/>
-	<path id="path4530-7" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="1" stroke-width="1.001" d="M-99.078 3.002h3.002v1.001h-1v12.01h1v1h-3.002z"/>
-	<path id="path4532-5" fill="#aaa" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="1" stroke-width="1.001" d="M-91.072 3.002v14.011h-3.002v-1h1V4.003h-1v-1z"/>
-</svg>
diff --git a/resources/images/pencil-source-grey.png b/resources/images/pencil-source-grey.png
new file mode 100644
index 0000000..d05d056
Binary files /dev/null and b/resources/images/pencil-source-grey.png differ
diff --git a/resources/images/pencil-source-grey.svg b/resources/images/pencil-source-grey.svg
new file mode 100644
index 0000000..8454695
--- /dev/null
+++ b/resources/images/pencil-source-grey.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   viewBox="0 0 20 20"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="pencil-source-grey.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1338"
+     inkscape:window-height="1032"
+     id="namedview10"
+     showgrid="true"
+     inkscape:zoom="32"
+     inkscape:cx="13.880951"
+     inkscape:cy="1.7618881"
+     inkscape:window-x="503"
+     inkscape:window-y="4"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+  </sodipodi:namedview>
+  <g
+     transform="matrix(0.5,0,0,0.5,10,9.5)"
+     style="fill:#aaaaaa;stroke:none"
+     id="g10">
+    <path
+       style="stroke-width:0.5"
+       d="m 14.65625,11 -1,1 H 14 v 5 h -0.5 v 1 H 16 V 11 Z M 16.5,11 v 1 H 17 v 5 h -0.5 v 1 H 19 v -7 z m -4.5,2.65625 -2,2 V 18 h 2.5 V 17 H 12 Z"
+       transform="matrix(2,0,0,2,-20,-19)"
+       id="path4-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccccccccccc" />
+  </g>
+  <g
+     style="fill:#aaaaaa;stroke:#ffffff"
+     id="g6-5">
+    <path
+       inkscape:connector-curvature="0"
+       d="M 6.95,18 H 2 v -4.95 z"
+       id="path4-2"
+       style="stroke:#ffffff" />
+  </g>
+  <g
+     fill="#aaa"
+     stroke="none"
+     id="g6">
+    <path
+       d="M12.314 2.736l-8.9 8.9 4.95 4.95 8.9-8.9zm0 2.829l2.121 2.121-6.071 6.072-2.121-2.122z"
+       id="path2" />
+    <path
+       d="M6.95 18H2v-4.95z"
+       id="path4" />
+  </g>
+</svg>
diff --git a/resources/screen-common.less b/resources/screen-common.less
index e94d75c..84ab1f1 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -327,13 +327,15 @@ a.mw-selflink {
 
 .mw-editsection {
 	font-family: @fonts;
+	.background-image-svg( 'images/pencil-grey.svg', 'images/pencil-grey.png' );
+	background-repeat: no-repeat;
+	background-position: left bottom;
+	padding-left: 20px;
 
 	a {
-		.background-image-svg( 'images/pencil-grey.svg', 'images/pencil-grey.png' );
-		background-repeat: no-repeat;
-		background-position: left bottom;
 		display: inline-block;
-		padding: 0.5em 0 0.25em 1.75em;
+		padding: 0.5em 0 0.25em;
+		margin-right: 1em;
 	}
 }
 
diff --git a/resources/screen-mobile.less b/resources/screen-mobile.less
index 927f0b5..290316d 100644
--- a/resources/screen-mobile.less
+++ b/resources/screen-mobile.less
@@ -200,6 +200,11 @@ h1.firstHeading {
 	.background-image-svg( 'images/plus-grey.svg', 'images/plus-grey.png' );
 }
 
+#ca-viewsource a {
+	.ca-icon();
+	.background-image-svg( 'images/brackets-grey.svg', 'images/brackets-grey.png' );
+}
+
 *[ id^='ca-nstab-' ] a {
 	.ca-icon();
 	.background-image-svg( 'images/page-grey.svg', 'images/page-grey.png' );