diff --git a/appinfo/info.xml b/appinfo/info.xml
index e071442..efe6308 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -46,7 +46,7 @@
 		<navigation>
 			<name>Forms</name>
 			<route>forms.page.index</route>
-			<icon>app.svg</icon>
+			<icon>forms.svg</icon>
 			<order>77</order>
 		</navigation>
 	</navigations>
diff --git a/img/answer-checkbox.svg b/img/answer-checkbox.svg
index ccf0a48..77b62ff 100644
--- a/img/answer-checkbox.svg
+++ b/img/answer-checkbox.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-  <path d="M1.5 1c-.277 0-.5.223-.5.5v13c0 .277.223.5.5.5h13c.277 0 .5-.223.5-.5v-13c0-.277-.223-.5-.5-.5h-13zm10.756 3L13.5 5.242 6.773 12 2.5 7.701l1.217-1.226L6.783 9.54 12.256 4z"/>
-</svg>
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M1.5 1c-.277 0-.5.223-.5.5v13c0 .277.223.5.5.5h13c.277 0 .5-.223.5-.5v-13c0-.277-.223-.5-.5-.5h-13zm10.756 3L13.5 5.242 6.773 12 2.5 7.701l1.217-1.226L6.783 9.54 12.256 4z"/></svg>
diff --git a/img/answer-multiple.svg b/img/answer-multiple.svg
index 5c4cb7e..00b9e79 100644
--- a/img/answer-multiple.svg
+++ b/img/answer-multiple.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1">
- <path d="m8 1a7 7 0 0 0 -7 7 7 7 0 0 0 7 7 7 7 0 0 0 7 -7 7 7 0 0 0 -7 -7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1 -6 6 6 6 0 0 1 -6 -6 6 6 0 0 1 6 -6zm0 2c-2.2091 0-4 1.7909-4 4 0 2.209 1.7909 4 4 4 2.209 0 4-1.791 4-4 0-2.2091-1.791-4-4-4z"/>
-</svg>
+<svg width="16px" height="16px" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2c-2.2091 0-4 1.7909-4 4 0 2.209 1.7909 4 4 4 2.209 0 4-1.791 4-4 0-2.2091-1.791-4-4-4z"/></svg>
diff --git a/img/app.svg b/img/app.svg
deleted file mode 100644
index 63cfdc3..0000000
--- a/img/app.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32">
-  <circle cx="6" cy="6" r="3" fill="#fff"/>
-  <circle cx="6" cy="16" r="3" fill="#fff"/>
-  <circle cx="6" cy="26" r="3" fill="#fff"/>
-  <rect width="18" height="4" x="11" y="4" rx="1" ry="1" fill="#fff"/>
-  <rect width="18" height="4" x="11" y="14" rx="1" ry="1" fill="#fff"/>
-  <rect width="18" height="4" x="11" y="24" rx="1" ry="1" fill="#fff"/>
-</svg>
diff --git a/img/drag-handle.svg b/img/drag-handle.svg
index c062d7d..1d5d569 100644
--- a/img/drag-handle.svg
+++ b/img/drag-handle.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10.7 10.7" width="16" height="16">
-  <path d="M1.34 3.34h8.02v1.34H1.34zM1.34 6.02h8.02v1.34H1.34z"/>
-</svg>
+<svg width="16" height="16" viewBox="0 0 10.7 10.7" xmlns="http://www.w3.org/2000/svg"><path d="m1.34 3.34h8.02v1.34h-8.02zm0 2.68h8.02v1.34h-8.02z"/></svg>
diff --git a/img/favicon-mask.svg b/img/favicon-mask.svg
new file mode 100644
index 0000000..4c75e56
--- /dev/null
+++ b/img/favicon-mask.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" enable-background="new 0 0 595.275 311.111" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m2.5 0c-1.385 0-2.5 1.115-2.5 2.5v11c0 1.385 1.115 2.5 2.5 2.5h11c1.385 0 2.5-1.115 2.5-2.5v-11c0-1.385-1.115-2.5-2.5-2.5h-11zm0.5 1.5a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5zm3 0.5h8c0.277 0 0.5 0.223 0.5 0.5v1c0 0.277-0.223 0.5-0.5 0.5h-8c-0.277 0-0.5-0.223-0.5-0.5v-1c0-0.277 0.223-0.5 0.5-0.5zm-3 4.5a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5zm3 0.5h8c0.277 0 0.5 0.223 0.5 0.5v1c0 0.277-0.223 0.5-0.5 0.5h-8c-0.277 0-0.5-0.223-0.5-0.5v-1c0-0.277 0.223-0.5 0.5-0.5zm-3 4.5a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5zm3 0.5h8c0.277 0 0.5 0.223 0.5 0.5v1c0 0.277-0.223 0.5-0.5 0.5h-8c-0.277 0-0.5-0.223-0.5-0.5v-1c0-0.277 0.223-0.5 0.5-0.5z"/></svg>
diff --git a/img/favicon-touch.png b/img/favicon-touch.png
new file mode 100644
index 0000000..823601b
Binary files /dev/null and b/img/favicon-touch.png differ
diff --git a/img/favicon-touch.svg b/img/favicon-touch.svg
new file mode 100644
index 0000000..23cc659
--- /dev/null
+++ b/img/favicon-touch.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" enable-background="new 0 0 595.275 311.111" version="1.1" viewBox="0 0 128 128" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect y="-1.5e-6" width="128" height="128" rx="20" ry="20" fill="#0082c9"/><path d="m24 12a12 12 0 0 0-12 12 12 12 0 0 0 12 12 12 12 0 0 0 12-12 12 12 0 0 0-12-12zm24 4c-2.216 0-4 1.784-4 4v8c0 2.216 1.784 4 4 4h64c2.216 0 4-1.784 4-4v-8c0-2.216-1.784-4-4-4h-64zm-24 36a12 12 0 0 0-12 12 12 12 0 0 0 12 12 12 12 0 0 0 12-12 12 12 0 0 0-12-12zm24 4c-2.216 0-4 1.784-4 4v8c0 2.216 1.784 4 4 4h64c2.216 0 4-1.784 4-4v-8c0-2.216-1.784-4-4-4h-64zm-24 36a12 12 0 0 0-12 12 12 12 0 0 0 12 12 12 12 0 0 0 12-12 12 12 0 0 0-12-12zm24 4c-2.216 0-4 1.784-4 4v8c0 2.216 1.784 4 4 4h64c2.216 0 4-1.784 4-4v-8c0-2.216-1.784-4-4-4h-64z" fill="#fff"/></svg>
diff --git a/img/favicon.ico b/img/favicon.ico
new file mode 100644
index 0000000..9211780
Binary files /dev/null and b/img/favicon.ico differ
diff --git a/img/favicon.png b/img/favicon.png
new file mode 100644
index 0000000..8be3c1c
Binary files /dev/null and b/img/favicon.png differ
diff --git a/img/favicon.svg b/img/favicon.svg
new file mode 100644
index 0000000..480c843
--- /dev/null
+++ b/img/favicon.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" enable-background="new 0 0 595.275 311.111" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect y="-5.2588e-6" width="32" height="32" rx="5" ry="5" fill="#0082c9"/><path d="m5.9492 3a3 3 0 0 0-2.9492 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-0.050781 0zm6.0508 1c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h16c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-16zm-6.0508 9a3 3 0 0 0-2.9492 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-0.050781 0zm6.0508 1c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h16c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-16zm-6.0508 9a3 3 0 0 0-2.9492 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-0.050781 0zm6.0508 1c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h16c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-16z" fill="#fff"/></svg>
diff --git a/img/forms.svg b/img/forms.svg
index 63cfdc3..7d5c8a0 100644
--- a/img/forms.svg
+++ b/img/forms.svg
@@ -1,8 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32">
-  <circle cx="6" cy="6" r="3" fill="#fff"/>
-  <circle cx="6" cy="16" r="3" fill="#fff"/>
-  <circle cx="6" cy="26" r="3" fill="#fff"/>
-  <rect width="18" height="4" x="11" y="4" rx="1" ry="1" fill="#fff"/>
-  <rect width="18" height="4" x="11" y="14" rx="1" ry="1" fill="#fff"/>
-  <rect width="18" height="4" x="11" y="24" rx="1" ry="1" fill="#fff"/>
-</svg>
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m5.9492 3a3 3 0 0 0-2.9492 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-0.050781 0zm6.0508 1c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h16c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-16zm-6.0508 9a3 3 0 0 0-2.9492 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-0.050781 0zm6.0508 1c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h16c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-16zm-6.0508 9a3 3 0 0 0-2.9492 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-0.050781 0zm6.0508 1c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h16c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-16z" fill="#fff"/></svg>
diff --git a/img/share.svg b/img/share.svg
index d67d35c..dec6a38 100644
--- a/img/share.svg
+++ b/img/share.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-1.3565 0-2.4542 1.0977-2.4542 2.4543 0 1.3565 1.0977 2.4542 2.4542 2.4542 0.54607 0 1.0528-0.1755 1.4606-0.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/>
- </g>
-</svg>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -1036.4)"><path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-1.3565 0-2.4542 1.0977-2.4542 2.4543 0 1.3565 1.0977 2.4542 2.4542 2.4542 0.54607 0 1.0528-0.1755 1.4606-0.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/></g></svg>