From f3d48beef7397fc95d5c6112e5432ecc6f5db0df Mon Sep 17 00:00:00 2001
From: Volker E <volker.e@wikimedia.org>
Date: Mon, 12 Feb 2018 12:01:28 -0800
Subject: [PATCH] build: Bring SVGO optimization to build step

Enabling SVGO automation with 'grunt-svgmin' and conservative
plugin settings to build step, among those:
- enable removeRasterImages and sortAttrs,
- disable cleanupIDs, removeDesc, removeTitle, removeViewBox &
  removeXMLProcInst and
- make use of pretty, indent and multipass options.

Also updating SVG accordingly.

Bug: T185596
Change-Id: I0030a711a2947ca8c1eb4e56d8540661c72a2639
---
 Gruntfile.js                               | 42 ++++++++++++++++++++--
 package.json                               |  1 +
 resources/images/cog-sprite.svg            |  4 +--
 resources/images/cog.svg                   |  2 +-
 resources/images/compact-links-ltr.svg     | 12 +++----
 resources/images/compact-links-rtl.svg     | 12 +++----
 resources/images/compact-links-trigger.svg |  2 +-
 resources/images/display.svg               |  2 +-
 resources/images/help.svg                  |  2 +-
 resources/images/input.svg                 |  2 +-
 resources/images/remove-input.svg          |  4 +--
 11 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index aaf8fec6..3aa3dad9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,6 +6,7 @@ module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-eslint' );
 	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
+	grunt.loadNpmTasks( 'grunt-svgmin' );
 
 	grunt.initConfig( {
 		eslint: {
@@ -36,9 +37,46 @@ module.exports = function ( grunt ) {
 				'!vendor/**'
 			]
 		},
-		banana: conf.MessagesDirs
+		banana: conf.MessagesDirs,
+		// SVG Optimization
+		svgmin: {
+			options: {
+				js2svg: {
+					indent: '	',
+					pretty: true
+				},
+				multipass: true,
+				plugins: [ {
+					cleanupIDs: false
+				}, {
+					removeDesc: false
+				}, {
+					removeRasterImages: true
+				}, {
+					removeTitle: false
+				}, {
+					removeViewBox: false
+				}, {
+					removeXMLProcInst: false
+				}, {
+					sortAttrs: true
+				} ]
+			},
+			all: {
+				files: [ {
+					expand: true,
+					cwd: 'resources/images',
+					src: [
+						'**/*.svg'
+					],
+					dest: 'resources/images/',
+					ext: '.svg'
+				} ]
+			}
+		}
 	} );
 
+	grunt.registerTask( 'minify', 'svgmin' );
 	grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'jsonlint', 'banana' ] );
-	grunt.registerTask( 'default', 'test' );
+	grunt.registerTask( 'default', [ 'minify', 'test' ] );
 };
diff --git a/package.json b/package.json
index 3dcc2ca6..276964aa 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "grunt-eslint": "20.1.0",
     "grunt-jsonlint": "1.1.0",
     "grunt-stylelint": "0.9.0",
+    "grunt-svgmin": "5.0.0",
     "stylelint": "8.2.0",
     "stylelint-config-wikimedia": "0.4.2"
   }
diff --git a/resources/images/cog-sprite.svg b/resources/images/cog-sprite.svg
index eaca444a..28621287 100644
--- a/resources/images/cog-sprite.svg
+++ b/resources/images/cog-sprite.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="32" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="14" height="32">
 	<defs>
-		<path id="a" d="M14 9.3V6.73l-1.575-.264c-.117-.44-.292-.848-.496-1.2l.93-1.285-1.81-1.84-1.31.908c-.38-.205-.79-.38-1.196-.497L8.284 1H5.716l-.263 1.578c-.437.117-.816.293-1.196.497L2.975 2.17 1.137 3.98l.934 1.287c-.2.38-.376.79-.493 1.228L0 6.73V9.3l1.575.264c.117.438.292.818.496 1.198l-.93 1.315L2.95 13.89l1.312-.938c.38.205.787.38 1.224.497L5.746 15h2.566l.263-1.578c.408-.117.817-.293 1.196-.497l1.315.935 1.81-1.812-.935-1.315c.203-.38.38-.76.495-1.2L14 9.303zm-7 1.404c-1.488 0-2.683-1.2-2.683-2.69S5.542 5.327 7 5.327c1.458 0 2.683 1.198 2.683 2.69 0 1.49-1.195 2.688-2.683 2.688z"/>
+		<path id="a" d="M14 9.3V6.73l-1.575-.264a4.947 4.947 0 0 0-.496-1.2l.93-1.285-1.81-1.84-1.31.908c-.38-.205-.79-.38-1.196-.497L8.284 1H5.716l-.263 1.578a5.489 5.489 0 0 0-1.196.497L2.975 2.17 1.137 3.98l.934 1.287c-.2.38-.376.79-.493 1.228L0 6.73V9.3l1.575.264c.117.438.292.818.496 1.198l-.93 1.315L2.95 13.89l1.312-.938c.38.205.787.38 1.224.497L5.746 15h2.566l.263-1.578a6.13 6.13 0 0 0 1.196-.497l1.315.935 1.81-1.812-.935-1.315c.203-.38.38-.76.495-1.2L14 9.303zm-7 1.404c-1.488 0-2.683-1.2-2.683-2.69S5.542 5.327 7 5.327a2.698 2.698 0 0 1 2.683 2.69A2.678 2.678 0 0 1 7 10.705z"/>
 	</defs>
 	<use fill="#72777d" xlink:href="#a"/>
 	<use fill="#54595d" transform="translate(0 16)" xlink:href="#a"/>
diff --git a/resources/images/cog.svg b/resources/images/cog.svg
index 91968ee9..ad8165b0 100644
--- a/resources/images/cog.svg
+++ b/resources/images/cog.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="20" height="14" viewBox="0 0 20 14">
-	<path fill="#54595d" d="M17 8.3V5.73l-1.575-.264c-.117-.44-.292-.848-.496-1.2l.933-1.285-1.81-1.84-1.31.906c-.38-.205-.79-.38-1.197-.497L11.283 0H8.717l-.263 1.578c-.437.117-.817.293-1.196.497L5.975 1.17 4.138 2.98l.933 1.287c-.203.38-.378.79-.495 1.228L3 5.73V8.3l1.575.264c.117.438.292.818.496 1.198l-.933 1.315 1.81 1.812 1.31-.936c.38.205.79.38 1.226.497L8.746 14h2.566l.263-1.578c.408-.117.817-.293 1.196-.497l1.313.935 1.81-1.812-.935-1.315c.204-.38.38-.76.496-1.2L17 8.302zm-7 1.404c-1.487 0-2.683-1.2-2.683-2.69S8.542 4.327 10 4.327c1.458 0 2.683 1.198 2.683 2.69 0 1.49-1.195 2.688-2.683 2.688z"/>
+	<path fill="#54595d" d="M17 8.3V5.73l-1.575-.264a4.947 4.947 0 0 0-.496-1.2l.933-1.285-1.81-1.84-1.31.906c-.38-.205-.79-.38-1.197-.497L11.283 0H8.717l-.263 1.578a5.468 5.468 0 0 0-1.196.497L5.975 1.17 4.138 2.98l.933 1.287c-.203.38-.378.79-.495 1.228L3 5.73V8.3l1.575.264c.117.438.292.818.496 1.198l-.933 1.315 1.81 1.812 1.31-.936c.38.205.79.38 1.226.497L8.746 14h2.566l.263-1.578a6.13 6.13 0 0 0 1.196-.497l1.313.935 1.81-1.812-.935-1.315c.204-.38.38-.76.496-1.2L17 8.302zm-7 1.404c-1.487 0-2.683-1.2-2.683-2.69S8.542 4.327 10 4.327a2.698 2.698 0 0 1 2.683 2.69A2.678 2.678 0 0 1 10 9.705z"/>
 </svg>
diff --git a/resources/images/compact-links-ltr.svg b/resources/images/compact-links-ltr.svg
index 18bf0986..65ef981c 100644
--- a/resources/images/compact-links-ltr.svg
+++ b/resources/images/compact-links-ltr.svg
@@ -5,16 +5,14 @@
 			<path d="M0 0v152l12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10V0z"/>
 		</clipPath>
 	</defs>
-	<g clip-path="url(#jagged-edge)" fill="#eaecf0">
+	<g fill="#eaecf0" clip-path="url(#jagged-edge)">
 		<path id="background" fill="#fff" d="M0 0h264v162H0"/>
-        <path id="logo" d="M11 22c0-8 6-14 14-14s14 6 14 14-6 14-14 14-14-6-14-14M38 45v-5H13v5h25"/>
+		<path id="logo" d="M11 22c0-8 6-14 14-14s14 6 14 14-6 14-14 14-14-6-14-14m27 23v-5H13v5h25"/>
 		<path id="sidebar" d="M38 130V58H13v72h25z"/>
 		<path id="personal-tools" d="M233 5h26v6h-26V5zm-24 0h22v6h-22zm-24 0h22v6h-22zm-23 0h13v6h-13zm15 0h6v6h-6zm-23 0h6v6h-6z"/>
-		<g id="search">
-			<path id="input" d="M258 16v4h-92v-4h92m1-1h-94v6h94v-6z"/>
-			<path id="icon" d="M168 17h2v2h-2z"/>
-		</g>
-        <path id="article" d="M252 162V29H48v133z"/>
+		<path id="search-input" d="M258 16v4h-92v-4h92m1-1h-94v6h94v-6z"/>
+		<path id="search-icon" d="M168 17h2v2h-2z"/>
+		<path id="article" d="M252 162V29H48v133z"/>
 		<path id="border" d="M0 0v162h264V0zm1 1h262v150.533l-11 9.166-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-11-9z"/>
 		<path fill="#36c" d="M38 132.625v-35H13v35h25z"/>
 		<rect width="19" height="2" x="16" y="108.59" fill="#eaf3ff" rx=".151" ry=".107"/>
diff --git a/resources/images/compact-links-rtl.svg b/resources/images/compact-links-rtl.svg
index a132e6e4..0fd7bc02 100644
--- a/resources/images/compact-links-rtl.svg
+++ b/resources/images/compact-links-rtl.svg
@@ -5,16 +5,14 @@
 			<path d="M0 0v152l12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10V0z"/>
 		</clipPath>
 	</defs>
-	<g clip-path="url(#jagged-edge)" fill="#eaecf0" transform="matrix(-1 0 0 1 264 0)">
+	<g fill="#eaecf0" clip-path="url(#jagged-edge)" transform="matrix(-1 0 0 1 264 0)">
 		<path id="background" fill="#fff" d="M0 0h264v162H0"/>
-		<path id="logo" d="M11 22c0-8 6-14 14-14s14 6 14 14-6 14-14 14-14-6-14-14M38 45v-5H13v5h25"/>
+		<path id="logo" d="M11 22c0-8 6-14 14-14s14 6 14 14-6 14-14 14-14-6-14-14m27 23v-5H13v5h25"/>
 		<path id="sidebar" d="M38 130V58H13v72h25z"/>
 		<path id="personal-tools" d="M233 5h26v6h-26V5zm-24 0h22v6h-22zm-24 0h22v6h-22zm-23 0h13v6h-13zm15 0h6v6h-6zm-23 0h6v6h-6z"/>
-		<g id="search">
-			<path id="input" d="M258 16v4h-92v-4h92m1-1h-94v6h94v-6z"/>
-			<path id="icon" d="M168 17h2v2h-2z"/>
-		</g>
-        <path id="article" d="M252 162V29H48v133z"/>
+		<path id="search-input" d="M258 16v4h-92v-4h92m1-1h-94v6h94v-6z"/>
+		<path id="search-icon" d="M168 17h2v2h-2z"/>
+		<path id="article" d="M252 162V29H48v133z"/>
 		<path id="border" d="M0 0v162h264V0zm1 1h262v150.533l-11 9.166-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-11-9z"/>
 		<path fill="#36c" d="M38 132.625v-35H13v35h25z"/>
 		<rect width="19" height="2" x="16" y="108.59" fill="#eaf3ff" rx=".151" ry=".107"/>
diff --git a/resources/images/compact-links-trigger.svg b/resources/images/compact-links-trigger.svg
index 728036db..3a62fe8c 100644
--- a/resources/images/compact-links-trigger.svg
+++ b/resources/images/compact-links-trigger.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24">
-	<path fill="#72777d" d="M13 19l.8-3h5.3l.9 3h2.2l-4.2-13h-3l-4.2 13h2.2zm3.5-11l2 6h-4l2-6zM5 4l.938 1.906h-4.938v2.094h1.594c.6 1.8 1.406 3.206 2.406 4.406-1.1.7-4.313 1.781-4.313 1.781l1.313 1.813s3.487-1.387 4.688-2.188c1 .7 2.319 1.188 3.719 1.688l.594-2c-1-.3-1.988-.688-2.688-1.188 1.1-1.1 1.9-2.506 2.5-4.406h2.188l.5-2h-5.563l-.938-1.906h-2zm-.188 4h3.781c-.4 1.3-.906 2-1.906 3-1.1-1-1.475-1.7-1.875-3z"/>
+	<path fill="#72777d" d="M13 19l.8-3h5.3l.9 3h2.2L18 6h-3l-4.2 13H13zm3.5-11l2 6h-4l2-6zM5 4l.938 1.906H1V8h1.594C3.194 9.8 4 11.206 5 12.406c-1.1.7-4.313 1.781-4.313 1.781L2 16s3.487-1.387 4.688-2.188c1 .7 2.319 1.188 3.719 1.688l.594-2c-1-.3-1.988-.688-2.688-1.188 1.1-1.1 1.9-2.506 2.5-4.406h2.188l.5-2H7.938L7 4H5zm-.188 4h3.781c-.4 1.3-.906 2-1.906 3-1.1-1-1.475-1.7-1.875-3z"/>
 </svg>
diff --git a/resources/images/display.svg b/resources/images/display.svg
index e41633bc..098503cb 100644
--- a/resources/images/display.svg
+++ b/resources/images/display.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-	<path fill="#222" d="M.002 2.275v12.945h8.405c.535 1.624-.975 1.786-1.902 2.505 0 0 2.293-.024 3.439-.024 1.144 0 3.432.024 3.432.024-.905-.688-2.355-.868-1.902-2.505h8.527v-12.945h-20zm6.81 1.84h.797l3.313 8.466h-1.043l-1.043-2.638h-3.374l-1.043 2.638h-.982zm.368 1.104c-.084.369-.211.785-.368 1.227l-.982 2.577h2.699l-.982-2.577c-.128-.33-.234-.747-.368-1.227zm7.117.982c.753 0 1.295.157 1.656.491.365.334.552.858.552 1.595v4.294h-.675l-.184-.859h-.062c-.315.396-.605.655-.92.798-.311.138-.758.184-1.227.184-.626 0-1.115-.168-1.472-.491-.353-.323-.491-.754-.491-1.35 0-1.275 1.028-1.963 3.068-2.025h1.043v-.429c0-.495-.091-.87-.307-1.104-.211-.238-.574-.307-1.043-.307-.526 0-1.115.107-1.779.429l-.307-.675c.311-.169.674-.333 1.043-.429.373-.096.732-.123 1.104-.123zm.307 3.313c-.761.027-1.318.157-1.656.368-.334.207-.491.54-.491.982 0 .346.1.617.307.798.211.181.544.245.92.245.595 0 1.012-.164 1.35-.491.342-.326.552-.762.552-1.35v-.552z"/>
+	<path fill="#222" d="M.002 2.275V15.22h8.405c.535 1.624-.975 1.786-1.902 2.505 0 0 2.293-.024 3.439-.024 1.144 0 3.432.024 3.432.024-.905-.688-2.355-.868-1.902-2.505h8.527V2.275h-20zm6.81 1.84h.797l3.313 8.466H9.879L8.836 9.943H5.462l-1.043 2.638h-.982zm.368 1.104c-.084.369-.211.785-.368 1.227L5.83 9.023h2.699l-.982-2.577c-.128-.33-.234-.747-.368-1.227zm7.117.982c.753 0 1.295.157 1.656.491.365.334.552.858.552 1.595v4.294h-.675l-.184-.859h-.062c-.315.396-.605.655-.92.798-.311.138-.758.184-1.227.184-.626 0-1.115-.168-1.472-.491-.353-.323-.491-.754-.491-1.35 0-1.275 1.028-1.963 3.068-2.025h1.043v-.429c0-.495-.091-.87-.307-1.104-.211-.238-.574-.307-1.043-.307-.526 0-1.115.107-1.779.429l-.307-.675a4.748 4.748 0 0 1 1.043-.429 4.334 4.334 0 0 1 1.104-.123zm.307 3.313c-.761.027-1.318.157-1.656.368-.334.207-.491.54-.491.982 0 .346.1.617.307.798.211.181.544.245.92.245.595 0 1.012-.164 1.35-.491.342-.326.552-.762.552-1.35v-.552z"/>
 </svg>
diff --git a/resources/images/help.svg b/resources/images/help.svg
index c8cf6e6f..c2b741a6 100644
--- a/resources/images/help.svg
+++ b/resources/images/help.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
-	<path fill="#54595d" d="M9 1.5c-4.141 0-7.5 3.358-7.5 7.5 0 4.142 3.359 7.501 7.5 7.501 4.143 0 7.5-3.359 7.5-7.501s-3.356-7.5-7.5-7.5zm-.001 11.943c-.613 0-1.067-.49-1.067-1.08 0-.614.454-1.093 1.067-1.093.59 0 1.068.479 1.068 1.093 0 .589-.479 1.08-1.068 1.08zm1.522-4.639c-.515.405-.712.663-.712 1.239v.356h-1.571v-.43c0-1.081.32-1.522.822-1.915.504-.393.811-.602.811-1.166 0-.479-.295-.749-.883-.749-.504 0-.946.135-1.412.454l-.749-1.287c.613-.43 1.375-.737 2.381-.737 1.362 0 2.505.749 2.505 2.184-.001 1.019-.566 1.559-1.192 2.049z"/>
+	<path fill="#54595d" d="M9 1.5a7.5 7.5 0 1 0 .002 15.002A7.5 7.5 0 0 0 9 1.5zm-.001 11.943c-.613 0-1.067-.49-1.067-1.08 0-.614.454-1.093 1.067-1.093.59 0 1.068.479 1.068 1.093a1.08 1.08 0 0 1-1.068 1.08zm1.522-4.639c-.515.405-.712.663-.712 1.239v.356H8.238v-.43c0-1.081.32-1.522.822-1.915.504-.393.811-.602.811-1.166 0-.479-.295-.749-.883-.749-.504 0-.946.135-1.412.454l-.749-1.287c.613-.43 1.375-.737 2.381-.737 1.362 0 2.505.749 2.505 2.184-.001 1.019-.566 1.559-1.192 2.049z"/>
 </svg>
diff --git a/resources/images/input.svg b/resources/images/input.svg
index bac7a761..b0dac628 100644
--- a/resources/images/input.svg
+++ b/resources/images/input.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-	<path fill="#222" d="M9 1.281c-.124.259-.185.599-.5.688-.55.081-1.133.018-1.688 0-.866-.032-1.733-.148-2.594 0-.588.157-.953.727-1.188 1.25-.178.416-.271.836-.344 1.281h-2.688v11.5h20v-11.5h-16.344c.109-.52.203-1.057.563-1.469.222-.231.587-.17.875-.188 1.212.003 2.415.179 3.625.063.463-.058.812-.455.969-.875l.188-.438-.875-.313zm-7.125 5.844h1.563c.094 0 .188.093.188.188v1.531c0 .094-.093.188-.188.188h-1.563c-.094 0-.156-.093-.156-.188v-1.531c0-.094.062-.188.156-.188zm2.844 0h1.563c.094 0 .156.093.156.188v1.531c0 .094-.062.188-.156.188h-1.563c-.094 0-.156-.093-.156-.188v-1.531c0-.094.062-.188.156-.188zm2.844 0h1.563c.094 0 .156.093.156.188v1.531c0 .094-.062.188-.156.188h-1.563c-.094 0-.188-.093-.188-.188v-1.531c0-.094.093-.188.188-.188zm2.813 0h1.563c.094 0 .188.093.188.188v1.531c0 .094-.093.188-.188.188h-1.563c-.094 0-.156-.093-.156-.188v-1.531c0-.094.062-.188.156-.188zm2.844 0h1.563c.094 0 .156.093.156.188v1.531c0 .094-.062.188-.156.188h-1.563c-.094 0-.156-.093-.156-.188v-1.531c0-.094.062-.188.156-.188zm2.844 0h1.531c.094 0 .188.093.188.188v1.531c0 .094-.093.188-.188.188h-1.531c-.094 0-.188-.093-.188-.188v-1.531c0-.094.093-.188.188-.188zm-12.844 3h1.563c.094 0 .156.093.156.188v1.563c0 .094-.062.156-.156.156h-1.563c-.094 0-.156-.062-.156-.156v-1.563c0-.094.062-.188.156-.188zm2.906 0h1.563c.094 0 .188.093.188.188v1.563c0 .094-.093.156-.188.156h-1.563c-.094 0-.156-.062-.156-.156v-1.563c0-.094.062-.188.156-.188zm2.938 0h1.531c.094 0 .188.093.188.188v1.563c0 .094-.093.156-.188.156h-1.531c-.094 0-.188-.062-.188-.156v-1.563c0-.094.093-.188.188-.188zm2.906 0h1.563c.094 0 .156.093.156.188v1.563c0 .094-.062.156-.156.156h-1.563c-.094 0-.188-.062-.188-.156v-1.563c0-.094.093-.188.188-.188zm2.906 0h1.563c.094 0 .156.093.156.188v1.563c0 .094-.062.156-.156.156h-1.563c-.094 0-.156-.062-.156-.156v-1.563c0-.094.062-.188.156-.188zm-10.875 3.563h12c.088 0 .156.068.156.156v.844c0 .088-.068.156-.156.156h-12c-.088 0-.156-.068-.156-.156v-.844c0-.088.068-.156.156-.156z"/>
+	<path fill="#222" d="M9 1.281c-.124.259-.185.599-.5.688-.55.081-1.133.018-1.688 0-.866-.032-1.733-.148-2.594 0-.588.157-.953.727-1.188 1.25-.178.416-.271.836-.344 1.281H-.002V16h20V4.5H3.654c.109-.52.203-1.057.563-1.469.222-.231.587-.17.875-.188 1.212.003 2.415.179 3.625.063.463-.058.812-.455.969-.875l.188-.438-.875-.313zM1.875 7.125h1.563c.094 0 .188.093.188.188v1.531a.201.201 0 0 1-.188.188H1.875c-.094 0-.156-.093-.156-.188V7.313c0-.094.062-.188.156-.188zm2.844 0h1.563c.094 0 .156.093.156.188v1.531c0 .094-.062.188-.156.188H4.719c-.094 0-.156-.093-.156-.188V7.313c0-.094.062-.188.156-.188zm2.844 0h1.563c.094 0 .156.093.156.188v1.531c0 .094-.062.188-.156.188H7.563a.201.201 0 0 1-.188-.188V7.313c0-.094.093-.188.188-.188zm2.813 0h1.563c.094 0 .188.093.188.188v1.531a.201.201 0 0 1-.188.188h-1.563c-.094 0-.156-.093-.156-.188V7.313c0-.094.062-.188.156-.188zm2.844 0h1.563c.094 0 .156.093.156.188v1.531c0 .094-.062.188-.156.188H13.22c-.094 0-.156-.093-.156-.188V7.313c0-.094.062-.188.156-.188zm2.844 0h1.531c.094 0 .188.093.188.188v1.531a.201.201 0 0 1-.188.188h-1.531a.201.201 0 0 1-.188-.188V7.313c0-.094.093-.188.188-.188zm-12.844 3h1.563c.094 0 .156.093.156.188v1.563c0 .094-.062.156-.156.156H3.22c-.094 0-.156-.062-.156-.156v-1.563c0-.094.062-.188.156-.188zm2.906 0h1.563c.094 0 .188.093.188.188v1.563c0 .094-.093.156-.188.156H6.126c-.094 0-.156-.062-.156-.156v-1.563c0-.094.062-.188.156-.188zm2.938 0h1.531c.094 0 .188.093.188.188v1.563c0 .094-.093.156-.188.156H9.064c-.094 0-.188-.062-.188-.156v-1.563c0-.094.093-.188.188-.188zm2.906 0h1.563c.094 0 .156.093.156.188v1.563c0 .094-.062.156-.156.156H11.97c-.094 0-.188-.062-.188-.156v-1.563c0-.094.093-.188.188-.188zm2.906 0h1.563c.094 0 .156.093.156.188v1.563c0 .094-.062.156-.156.156h-1.563c-.094 0-.156-.062-.156-.156v-1.563c0-.094.062-.188.156-.188zM4.001 13.688h12c.088 0 .156.068.156.156v.844a.154.154 0 0 1-.156.156h-12a.154.154 0 0 1-.156-.156v-.844c0-.088.068-.156.156-.156z"/>
 </svg>
diff --git a/resources/images/remove-input.svg b/resources/images/remove-input.svg
index d6270540..a192a26b 100644
--- a/resources/images/remove-input.svg
+++ b/resources/images/remove-input.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="20" height="16" viewBox="0 0 20 16">
-	<path fill="#222" d="M9 1.281c-.124.259-.185.599-.5.688-.55.081-1.133.018-1.688 0-.866-.032-1.733-.148-2.594 0-.588.157-.953.727-1.188 1.25-.178.416-.271.836-.344 1.281h-2.688v11.5h20v-11.5h-16.344c.109-.52.203-1.057.563-1.469.222-.231.587-.17.875-.188 1.212.003 2.415.179 3.625.063.463-.058.812-.455.969-.875l.188-.438-.875-.313zm-7.125 5.844h1.563c.094 0 .188.093.188.188v1.531c0 .094-.093.188-.188.188h-1.563c-.094 0-.156-.093-.156-.188v-1.531c0-.094.062-.188.156-.188zm2.844 0h1.563c.094 0 .156.093.156.188v1.531c0 .094-.062.188-.156.188h-1.563c-.094 0-.156-.093-.156-.188v-1.531c0-.094.062-.188.156-.188zm2.844 0h1.563c.094 0 .156.093.156.188v1.531c0 .094-.062.188-.156.188h-1.563c-.094 0-.188-.093-.188-.188v-1.531c0-.094.093-.188.188-.188zm2.813 0h1.563c.094 0 .188.093.188.188v1.531c0 .094-.093.188-.188.188h-1.563c-.094 0-.156-.093-.156-.188v-1.531c0-.094.062-.188.156-.188zm2.844 0h1.563c.094 0 .156.093.156.188v1.531c0 .094-.062.188-.156.188h-1.563c-.094 0-.156-.093-.156-.188v-1.531c0-.094.062-.188.156-.188zm2.844 0h1.531c.094 0 .188.093.188.188v1.531c0 .094-.093.188-.188.188h-1.531c-.094 0-.188-.093-.188-.188v-1.531c0-.094.093-.188.188-.188zm-12.844 3h1.563c.094 0 .156.093.156.188v1.563c0 .094-.062.156-.156.156h-1.563c-.094 0-.156-.062-.156-.156v-1.563c0-.094.062-.188.156-.188zm2.906 0h1.563c.094 0 .188.093.188.188v1.563c0 .094-.093.156-.188.156h-1.563c-.094 0-.156-.062-.156-.156v-1.563c0-.094.062-.188.156-.188zm2.938 0h1.531c.094 0 .188.093.188.188v1.563c0 .094-.093.156-.188.156h-1.531c-.094 0-.188-.062-.188-.156v-1.563c0-.094.093-.188.188-.188zm2.906 0h1.563c.094 0 .156.093.156.188v1.563c0 .094-.062.156-.156.156h-1.563c-.094 0-.188-.062-.188-.156v-1.563c0-.094.093-.188.188-.188zm2.906 0h1.563c.094 0 .156.093.156.188v1.563c0 .094-.062.156-.156.156h-1.563c-.094 0-.156-.062-.156-.156v-1.563c0-.094.062-.188.156-.188zm-10.875 3.563h12c.088 0 .156.068.156.156v.844c0 .088-.068.156-.156.156h-12c-.088 0-.156-.068-.156-.156v-.844c0-.088.068-.156.156-.156z" transform="matrix(.8 0 0 .8 2 -.2)"/>
-	<path stroke="#222" stroke-width="1.2" d="M2.719 15.279l14.561-14.559"/>
+	<path fill="#222" d="M9.2.825c-.1.207-.148.479-.4.55-.44.065-.906.015-1.35 0-.693-.025-1.387-.118-2.076 0-.47.126-.762.582-.95 1A4.323 4.323 0 0 0 4.149 3.4h-2.15v9.2h16V3.4H4.922c.087-.416.163-.846.45-1.175.178-.185.47-.136.7-.15.97.002 1.933.143 2.9.05.371-.047.65-.364.776-.7l.15-.35-.7-.251zM3.5 5.5h1.25a.16.16 0 0 1 .15.15v1.225a.16.16 0 0 1-.15.15H3.5c-.075 0-.125-.074-.125-.15V5.65c0-.075.05-.15.125-.15zm2.275 0h1.25c.076 0 .125.074.125.15v1.225c0 .075-.05.15-.124.15h-1.25c-.076 0-.126-.074-.126-.15V5.65c0-.075.05-.15.125-.15zm2.275 0H9.3c.076 0 .126.074.126.15v1.225c0 .075-.05.15-.125.15H8.05a.161.161 0 0 1-.151-.15V5.65a.16.16 0 0 1 .15-.15zm2.25 0h1.251a.16.16 0 0 1 .15.15v1.225a.16.16 0 0 1-.15.15h-1.25c-.075 0-.125-.074-.125-.15V5.65c0-.075.05-.15.125-.15zm2.276 0h1.25c.076 0 .125.074.125.15v1.225c0 .075-.05.15-.125.15h-1.25c-.075 0-.125-.074-.125-.15V5.65c0-.075.05-.15.125-.15zm2.275 0h1.225a.16.16 0 0 1 .15.15v1.225a.16.16 0 0 1-.15.15h-1.225a.161.161 0 0 1-.15-.15V5.65a.16.16 0 0 1 .15-.15zM4.576 7.9h1.25c.076 0 .125.074.125.15V9.3c0 .076-.05.126-.125.126h-1.25c-.075 0-.125-.05-.125-.125V8.05c0-.076.05-.151.125-.151zm2.325 0h1.25a.16.16 0 0 1 .15.15V9.3c0 .076-.074.126-.15.126h-1.25c-.075 0-.125-.05-.125-.125V8.05c0-.076.05-.151.125-.151zm2.35 0h1.225a.16.16 0 0 1 .15.15V9.3c0 .076-.074.126-.15.126H9.251c-.075 0-.15-.05-.15-.125V8.05c0-.076.074-.151.15-.151zm2.325 0h1.25c.076 0 .125.074.125.15V9.3c0 .076-.05.126-.125.126h-1.25c-.075 0-.15-.05-.15-.125V8.05c0-.076.074-.151.15-.151zm2.325 0h1.25c.075 0 .125.074.125.15V9.3c0 .076-.05.126-.125.126h-1.25c-.075 0-.125-.05-.125-.125V8.05c0-.076.05-.151.125-.151zm-8.7 2.85h9.6c.07 0 .125.055.125.125v.675c0 .07-.055.125-.125.125H5.2a.123.123 0 0 1-.125-.125v-.675c0-.07.054-.125.125-.125z"/>
+	<path stroke="#222" stroke-width="1.2" d="M2.719 15.279L17.28.72"/>
 </svg>