diff --git a/icons/design/account-box-multiple.design b/icons/design/account-box-multiple.design
new file mode 100644
index 000000000..7baf4271e
Binary files /dev/null and b/icons/design/account-box-multiple.design differ
diff --git a/icons/design/battery-10-bluetooth.design b/icons/design/battery-10-bluetooth.design
new file mode 100644
index 000000000..5b45adef2
Binary files /dev/null and b/icons/design/battery-10-bluetooth.design differ
diff --git a/icons/design/battery-20-bluetooth.design b/icons/design/battery-20-bluetooth.design
new file mode 100644
index 000000000..64afdc627
Binary files /dev/null and b/icons/design/battery-20-bluetooth.design differ
diff --git a/icons/design/battery-30-bluetooth.design b/icons/design/battery-30-bluetooth.design
new file mode 100644
index 000000000..20bb58afa
Binary files /dev/null and b/icons/design/battery-30-bluetooth.design differ
diff --git a/icons/design/battery-40-bluetooth.design b/icons/design/battery-40-bluetooth.design
new file mode 100644
index 000000000..854faa143
Binary files /dev/null and b/icons/design/battery-40-bluetooth.design differ
diff --git a/icons/design/battery-50-bluetooth.design b/icons/design/battery-50-bluetooth.design
new file mode 100644
index 000000000..709167d9f
Binary files /dev/null and b/icons/design/battery-50-bluetooth.design differ
diff --git a/icons/design/battery-60-bluetooth.design b/icons/design/battery-60-bluetooth.design
new file mode 100644
index 000000000..a89a681fb
Binary files /dev/null and b/icons/design/battery-60-bluetooth.design differ
diff --git a/icons/design/battery-70-bluetooth.design b/icons/design/battery-70-bluetooth.design
new file mode 100644
index 000000000..9f3cc9b84
Binary files /dev/null and b/icons/design/battery-70-bluetooth.design differ
diff --git a/icons/design/battery-80-bluetooth.design b/icons/design/battery-80-bluetooth.design
new file mode 100644
index 000000000..132e098b9
Binary files /dev/null and b/icons/design/battery-80-bluetooth.design differ
diff --git a/icons/design/battery-90-bluetooth.design b/icons/design/battery-90-bluetooth.design
new file mode 100644
index 000000000..c149da83a
Binary files /dev/null and b/icons/design/battery-90-bluetooth.design differ
diff --git a/icons/design/battery-alert-bluetooth.design b/icons/design/battery-alert-bluetooth.design
new file mode 100644
index 000000000..623a2e395
Binary files /dev/null and b/icons/design/battery-alert-bluetooth.design differ
diff --git a/icons/design/battery-bluetooth-variant.design b/icons/design/battery-bluetooth-variant.design
new file mode 100644
index 000000000..051948602
Binary files /dev/null and b/icons/design/battery-bluetooth-variant.design differ
diff --git a/icons/design/battery-bluetooth.design b/icons/design/battery-bluetooth.design
new file mode 100644
index 000000000..c22835f37
Binary files /dev/null and b/icons/design/battery-bluetooth.design differ
diff --git a/icons/design/battery-unknown-bluetooth.design b/icons/design/battery-unknown-bluetooth.design
new file mode 100644
index 000000000..aa4a7ddee
Binary files /dev/null and b/icons/design/battery-unknown-bluetooth.design differ
diff --git a/icons/design/calendar-search.design b/icons/design/calendar-search.design
index 1d8aea2b0..70b733657 100644
Binary files a/icons/design/calendar-search.design and b/icons/design/calendar-search.design differ
diff --git a/icons/design/cellphone-key.design b/icons/design/cellphone-key.design
new file mode 100644
index 000000000..3bac710dd
Binary files /dev/null and b/icons/design/cellphone-key.design differ
diff --git a/icons/design/cloud-search-outline.design b/icons/design/cloud-search-outline.design
new file mode 100644
index 000000000..6e983ea95
Binary files /dev/null and b/icons/design/cloud-search-outline.design differ
diff --git a/icons/design/cloud-search.design b/icons/design/cloud-search.design
new file mode 100644
index 000000000..de66f935a
Binary files /dev/null and b/icons/design/cloud-search.design differ
diff --git a/icons/design/cordova.design b/icons/design/cordova.design
new file mode 100644
index 000000000..23724d3aa
Binary files /dev/null and b/icons/design/cordova.design differ
diff --git a/icons/design/desk-lamp.design b/icons/design/desk-lamp.design
new file mode 100644
index 000000000..a78dc0ea4
Binary files /dev/null and b/icons/design/desk-lamp.design differ
diff --git a/icons/design/folder-search-outline.design b/icons/design/folder-search-outline.design
new file mode 100644
index 000000000..5f77023fe
Binary files /dev/null and b/icons/design/folder-search-outline.design differ
diff --git a/icons/design/folder-search.design b/icons/design/folder-search.design
new file mode 100644
index 000000000..8c5b91ae0
Binary files /dev/null and b/icons/design/folder-search.design differ
diff --git a/icons/design/headphones-bluetooth.design b/icons/design/headphones-bluetooth.design
new file mode 100644
index 000000000..80a5ec4ec
Binary files /dev/null and b/icons/design/headphones-bluetooth.design differ
diff --git a/icons/design/home-minus.design b/icons/design/home-minus.design
new file mode 100644
index 000000000..e39eb5aad
Binary files /dev/null and b/icons/design/home-minus.design differ
diff --git a/icons/design/home-plus.design b/icons/design/home-plus.design
new file mode 100644
index 000000000..c876e52ab
Binary files /dev/null and b/icons/design/home-plus.design differ
diff --git a/icons/design/image-search-outline.design b/icons/design/image-search-outline.design
new file mode 100644
index 000000000..a8520f2fc
Binary files /dev/null and b/icons/design/image-search-outline.design differ
diff --git a/icons/design/image-search.design b/icons/design/image-search.design
new file mode 100644
index 000000000..15a78a3af
Binary files /dev/null and b/icons/design/image-search.design differ
diff --git a/icons/design/qi.design b/icons/design/qi.design
new file mode 100644
index 000000000..362777370
Binary files /dev/null and b/icons/design/qi.design differ
diff --git a/icons/design/restore-clock.design b/icons/design/restore-clock.design
new file mode 100644
index 000000000..e30b9de9a
Binary files /dev/null and b/icons/design/restore-clock.design differ
diff --git a/icons/design/restore.design b/icons/design/restore.design
index 4312b306b..1d49fd8f5 100644
Binary files a/icons/design/restore.design and b/icons/design/restore.design differ
diff --git a/icons/design/speaker-bluetooth.design b/icons/design/speaker-bluetooth.design
new file mode 100644
index 000000000..8c067cc53
Binary files /dev/null and b/icons/design/speaker-bluetooth.design differ
diff --git a/icons/design/tumble-dryer.design b/icons/design/tumble-dryer.design
index ad8738eab..1f5627816 100644
Binary files a/icons/design/tumble-dryer.design and b/icons/design/tumble-dryer.design differ
diff --git a/icons/design/two-factor-authentication.design b/icons/design/two-factor-authentication.design
new file mode 100644
index 000000000..78a30c233
Binary files /dev/null and b/icons/design/two-factor-authentication.design differ
diff --git a/icons/design/umbrella-closed.design b/icons/design/umbrella-closed.design
new file mode 100644
index 000000000..2f456f926
Binary files /dev/null and b/icons/design/umbrella-closed.design differ
diff --git a/icons/design/weight-kilogram.design b/icons/design/weight-kilogram.design
index 84936b257..5d73b2d8a 100644
Binary files a/icons/design/weight-kilogram.design and b/icons/design/weight-kilogram.design differ
diff --git a/icons/design/weight-pound.design b/icons/design/weight-pound.design
new file mode 100644
index 000000000..8b687d4b8
Binary files /dev/null and b/icons/design/weight-pound.design differ
diff --git a/icons/svg/account-box-multiple.svg b/icons/svg/account-box-multiple.svg
new file mode 100644
index 000000000..99a0da733
--- /dev/null
+++ b/icons/svg/account-box-multiple.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 4,6L 2,6L 2,20C 2,21.1 2.9,22 4,22L 18,22L 18,20L 4,20L 4,6 Z M 20,2C 21.1,2 22,2.9 22,4L 22,16C 22,17.1 21.1,18 20,18L 8,18C 6.9,18 6,17.1 6,16L 6,4C 6,2.9 6.9,2 8,2L 20,2 Z M 17,7C 17,5.34 15.66,4 14,4C 12.34,4 11,5.34 11,7C 11,8.66 12.34,10 14,10C 15.66,10 17,8.66 17,7 Z M 8,15L 8,16L 20,16L 20,15C 20,13 16,11.9 14,11.9C 12,11.9 8,13 8,15 Z "/>
+</svg>
diff --git a/icons/svg/battery-10-bluetooth.svg b/icons/svg/battery-10-bluetooth.svg
new file mode 100644
index 000000000..b0e8be53d
--- /dev/null
+++ b/icons/svg/battery-10-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 4,6L 12,6L 12,18L 4,18L 4,6 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-20-bluetooth.svg b/icons/svg/battery-20-bluetooth.svg
new file mode 100644
index 000000000..8ffcd5a19
--- /dev/null
+++ b/icons/svg/battery-20-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 4,6L 12,6L 12,17L 4,17L 4,6 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-30-bluetooth.svg b/icons/svg/battery-30-bluetooth.svg
new file mode 100644
index 000000000..8f6b13dce
--- /dev/null
+++ b/icons/svg/battery-30-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 4,6L 12,6L 12,15L 4,15L 4,6 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-40-bluetooth.svg b/icons/svg/battery-40-bluetooth.svg
new file mode 100644
index 000000000..ddaa1a188
--- /dev/null
+++ b/icons/svg/battery-40-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 4,6L 12,6L 12,14L 4,14L 4,6 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-50-bluetooth.svg b/icons/svg/battery-50-bluetooth.svg
new file mode 100644
index 000000000..0e6f2018d
--- /dev/null
+++ b/icons/svg/battery-50-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 4,6L 12,6L 12,13L 4,13L 4,6 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-60-bluetooth.svg b/icons/svg/battery-60-bluetooth.svg
new file mode 100644
index 000000000..18f0b5e12
--- /dev/null
+++ b/icons/svg/battery-60-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 4,6L 12,6L 12,12L 4,12L 4,6 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-70-bluetooth.svg b/icons/svg/battery-70-bluetooth.svg
new file mode 100644
index 000000000..b82f1f7f1
--- /dev/null
+++ b/icons/svg/battery-70-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 4,6L 12,6L 12,10L 4,10L 4,6 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-80-bluetooth.svg b/icons/svg/battery-80-bluetooth.svg
new file mode 100644
index 000000000..33d2f67c7
--- /dev/null
+++ b/icons/svg/battery-80-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 4,6L 12,6L 12,9L 4,9L 4,6 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-90-bluetooth.svg b/icons/svg/battery-90-bluetooth.svg
new file mode 100644
index 000000000..a32a25118
--- /dev/null
+++ b/icons/svg/battery-90-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 4,6L 12,6L 12,8L 4,8L 4,6 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-alert-bluetooth.svg b/icons/svg/battery-alert-bluetooth.svg
new file mode 100644
index 000000000..8310ecb5f
--- /dev/null
+++ b/icons/svg/battery-alert-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 7,9L 9,9L 9,14L 7,14L 7,9 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z M 7,16L 9,16L 9,18L 7,18L 7,16 Z "/>
+</svg>
diff --git a/icons/svg/battery-bluetooth-variant.svg b/icons/svg/battery-bluetooth-variant.svg
new file mode 100644
index 000000000..4a2be28aa
--- /dev/null
+++ b/icons/svg/battery-bluetooth-variant.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="miter" d="M 9,2L 9,4L 7.33008,4C 6.59548,4 5.99996,4.5955 6,5.3301L 6,20.6699C 6,21.3999 6.60008,22 7.33008,22L 16.6699,22C 17.4045,22 18,21.4045 18,20.6699L 18,5.3301C 18,4.6001 17.3999,4 16.6699,4L 15,4L 15,2L 9,2 Z M 11.8262,8L 12.3262,8L 15.1758,10.8496L 13.0371,13L 15.1738,15.1406L 12.3262,18L 11.8262,18L 11.8262,14.2109L 9.53711,16.5L 8.82617,15.7891L 11.6152,13L 8.82617,10.2109L 9.53711,9.5L 11.8262,11.7891L 11.8262,8 Z M 12.8262,9.9102L 12.8262,11.7891L 13.7656,10.8496L 12.8262,9.9102 Z M 12.8262,14.2109L 12.8262,16.0801L 13.7656,15.1406L 12.8262,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-bluetooth.svg b/icons/svg/battery-bluetooth.svg
new file mode 100644
index 000000000..af97cd4bd
--- /dev/null
+++ b/icons/svg/battery-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6699C 2,21.3999 2.60008,22 3.33008,22L 12.6699,22C 13.4045,22 14,21.4046 14,20.6699L 14,5.3301C 14,4.6001 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z "/>
+</svg>
diff --git a/icons/svg/battery-unknown-bluetooth.svg b/icons/svg/battery-unknown-bluetooth.svg
new file mode 100644
index 000000000..7e16427da
--- /dev/null
+++ b/icons/svg/battery-unknown-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 5,2L 5,4L 3.33008,4C 2.59554,4 2.00004,4.5954 2,5.3301L 2,20.6602C 2,21.4002 2.60008,22 3.33008,22L 12.6699,22C 13.3999,22 14,21.4002 14,20.6602L 14,5.3301C 14,4.5901 13.3999,4 12.6699,4L 11,4L 11,2L 5,2 Z M 8,6C 10.2091,6 12,7.7909 12,10C 12,10.88 11.6403,11.68 11.0703,12.25L 10.1699,13.1699C 9.62992,13.7099 9.24984,14.18 9.08984,15L 7.05078,15C 7.16078,14.1 7.55992,13.2799 8.16992,12.6699L 9.41016,11.4102C 9.78016,11.0502 10,10.55 10,10C 10,8.89 9.1,8 8,8C 6.89543,8 6,8.8954 6,10L 4,10C 4,7.7909 5.79086,6 8,6 Z M 19,8L 19,11.7891L 16.7109,9.5L 16,10.2109L 18.7891,13L 16,15.7891L 16.7109,16.5L 19,14.2109L 19,18L 19.5,18L 22.3496,15.1406L 20.2109,13L 22.3496,10.8496L 19.5,8L 19,8 Z M 20,9.9102L 20.9395,10.8496L 20,11.7891L 20,9.9102 Z M 20,14.2109L 20.9395,15.1406L 20,16.0801L 20,14.2109 Z M 7,17L 9,17L 9,19L 7,19L 7,17 Z "/>
+</svg>
diff --git a/icons/svg/calendar-search.svg b/icons/svg/calendar-search.svg
new file mode 100644
index 000000000..b2348f1e9
--- /dev/null
+++ b/icons/svg/calendar-search.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 15.5,12C 17.9853,12 20,14.0147 20,16.5C 20,17.3826 19.7459,18.2059 19.3069,18.9006L 22.3906,21.9844L 20.9844,23.3906L 17.8763,20.3221C 17.1867,20.7518 16.3723,21 15.5,21C 13.0147,21 11,18.9853 11,16.5C 11,14.0147 13.0147,12 15.5,12 Z M 15.5,14C 14.1193,14 13,15.1193 13,16.5C 13,17.8807 14.1193,19 15.5,19C 16.8807,19 18,17.8807 18,16.5C 18,15.1193 16.8807,14 15.5,14 Z M 18.9994,7.99807L 4.9994,7.99807L 4.9994,18.9981L 9.49736,18.9981C 9.80881,19.7456 10.2558,20.4225 10.8077,20.9981L 4.9994,20.9981C 3.8934,20.9981 2.9994,20.1021 2.9994,18.9981L 3.00939,4.99807C 3.00939,3.89307 3.8934,2.99807 4.9994,2.99807L 5.9994,2.99807L 5.9994,0.998072L 7.9994,0.998072L 7.9994,2.99807L 15.9994,2.99807L 15.9994,0.998072L 17.9994,0.998072L 17.9994,2.99807L 18.9994,2.99807C 20.1024,2.99807 20.9994,3.89307 20.9994,4.99807L 20.9994,13.0334C 20.4887,12.2249 19.8046,11.5368 18.9994,11.0214L 18.9994,7.99807 Z "/>
+</svg>
diff --git a/icons/svg/cellphone-key.svg b/icons/svg/cellphone-key.svg
new file mode 100644
index 000000000..c5ac09f33
--- /dev/null
+++ b/icons/svg/cellphone-key.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 7,1C 5.89543,1 5,1.8954 5,3L 5,7L 7,7L 7,4L 17,4L 17,20L 7,20L 7,17L 5,17L 5,21C 5,22.1046 5.89543,23 7,23L 17,23C 18.1046,23 19,22.1046 19,21L 19,3C 19,1.8954 18.1046,1 17,1L 7,1 Z M 6,9C 4.34315,9 3,10.3431 3,12C 3,13.6569 4.34315,15 6,15C 7.31,15 8.42008,14.17 8.83008,13L 11,13L 11,15L 13,15L 13,13L 14,13L 14,11L 8.83008,11C 8.42008,9.83 7.31,9 6,9 Z M 6,11C 6.55229,11 7,11.4477 7,12C 7,12.5523 6.55229,13 6,13C 5.44771,13 5,12.5523 5,12C 5,11.4477 5.44771,11 6,11 Z "/>
+</svg>
diff --git a/icons/svg/cloud-search-outline.svg b/icons/svg/cloud-search-outline.svg
new file mode 100644
index 000000000..237ca75c8
--- /dev/null
+++ b/icons/svg/cloud-search-outline.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 15.5,12C 17.9853,12 20,14.0147 20,16.5C 20,17.3826 19.7459,18.2058 19.3069,18.9006L 22.3906,21.9843L 20.9844,23.3906L 17.8763,20.3221C 17.1867,20.7518 16.3723,21 15.5,21C 13.0147,21 11,18.9853 11,16.5C 11,14.0147 13.0147,12 15.5,12 Z M 15.5,14C 14.1193,14 13,15.1193 13,16.5C 13,17.8807 14.1193,19 15.5,19C 16.8807,19 18,17.8807 18,16.5C 18,15.1193 16.8807,14 15.5,14 Z M 22,13C 22,11.343 20.657,9.99998 19,9.99998L 17.5,9.99998L 17.5,9.49998C 17.5,6.46198 15.037,3.99998 12,3.99998C 9.48301,3.99998 7.36601,5.69297 6.71201,7.99998L 6.00001,7.99998C 3.79101,7.99998 2.00001,9.79096 2.00001,12C 2.00001,14.209 3.79101,16 6.00001,16L 9.01895,16L 9.00001,16.5C 9.00001,17.0162 9.0602,17.5185 9.17394,18L 6.00001,18C 2.686,18 1.01725e-005,15.314 1.01725e-005,12C 1.01725e-005,8.90497 2.34301,6.35997 5.351,6.03599C 6.60301,3.63898 9.10801,1.99998 12,1.99998C 15.641,1.99998 18.674,4.59499 19.355,8.03599C 21.947,8.22101 24,10.36 24,13C 24,14.6451 23.2057,16.1043 21.9799,17.0154L 22,16.5C 22,15.7654 21.8782,15.0594 21.6536,14.4008C 21.8748,13.9827 22,13.506 22,13 Z "/>
+</svg>
diff --git a/icons/svg/cloud-search.svg b/icons/svg/cloud-search.svg
new file mode 100644
index 000000000..2cba9916a
--- /dev/null
+++ b/icons/svg/cloud-search.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 15.5,12C 17.9853,12 20,14.0147 20,16.5C 20,17.3826 19.7459,18.2059 19.3069,18.9006L 22.3906,21.9844L 20.9844,23.3906L 17.8763,20.3221C 17.1867,20.7518 16.3723,21 15.5,21C 13.0147,21 11,18.9853 11,16.5C 11,14.0147 13.0147,12 15.5,12 Z M 15.5,14C 14.1193,14 13,15.1193 13,16.5C 13,17.8807 14.1193,19 15.5,19C 16.8807,19 18,17.8807 18,16.5C 18,15.1193 16.8807,14 15.5,14 Z M 19.3547,8.03388C 21.9467,8.21885 23.9997,10.3579 23.9997,12.9979C 23.9997,14.6427 23.2056,16.1018 21.9801,17.0129L 22,16.5C 22,12.9101 19.0898,10 15.5,10C 11.9101,10 9,12.9101 9,16.5C 9,17.0155 9.06001,17.517 9.17343,17.9979L 5.99968,17.9979C 2.68568,17.9979 -0.000320435,15.3119 -0.000320435,11.9979C -0.000320435,8.90387 2.34268,6.35785 5.35027,6.03485C 6.60268,3.63686 9.10768,1.99787 11.9997,1.99787C 15.6407,1.99787 18.6735,4.59288 19.3547,8.03388 Z "/>
+</svg>
diff --git a/icons/svg/cordova.svg b/icons/svg/cordova.svg
new file mode 100644
index 000000000..dfb096fbb
--- /dev/null
+++ b/icons/svg/cordova.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 20.1818,21.5455L 16.9432,21.5455L 17.1705,18.8181L 15.5795,18.8181L 15.3523,21.5455L 8.64772,21.5455L 8.42038,18.8181L 6.82959,18.8181L 7.05694,21.5455L 3.8181,21.5455L 1.99997,9.7272L 6.54545,2.4545L 17.4545,2.4545L 22,9.7272L 20.1818,21.5455 Z M 16.5455,6.0908L 13.6234,6.0908L 13.8182,7.4545L 10.1818,7.4545L 10.3766,6.0908L 7.45452,6.0908L 5.63631,9.7273L 6.54545,16.9999L 17.4545,16.9999L 18.3637,9.7273L 16.5455,6.0908 Z M 14.9545,14.5863C 14.7035,14.5863 14.5,13.8293 14.5,12.8955C 14.5,11.9616 14.7035,11.2045 14.9545,11.2045C 15.2056,11.2045 15.4091,11.9616 15.4091,12.8955C 15.4091,13.8293 15.2056,14.5863 14.9545,14.5863 Z M 9.21593,14.7273C 8.96491,14.7273 8.76132,13.9702 8.76132,13.0363C 8.76132,12.1025 8.96491,11.3455 9.21593,11.3455C 9.46695,11.3455 9.67046,12.1025 9.67046,13.0363C 9.67046,13.9702 9.46695,14.7273 9.21593,14.7273 Z "/>
+</svg>
diff --git a/icons/svg/desk-lamp.svg b/icons/svg/desk-lamp.svg
new file mode 100644
index 000000000..1a7ac1742
--- /dev/null
+++ b/icons/svg/desk-lamp.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 10.8496,2L 9.18359,4.4941L 10.3203,5.2539L 7.14453,10.0078C 7.09646,10.0035 7.04826,10.0009 7,10C 5.89543,10 5,10.8954 5,12C 5.00068,12.9407 5.65683,13.7538 6.57617,13.9531L 10.6152,20L 7,20L 7,22L 17,22L 17,20L 13.0215,20L 8.5332,13.2832C 8.83452,12.9235 8.99975,12.4693 9,12C 8.99924,11.6988 8.93047,11.4017 8.79883,11.1309L 11.9824,6.3652C 11.7783,8.0454 12.7524,9.8855 14.4453,11.0176L 18.8906,4.3652C 17.1971,3.2353 15.124,3.0399 13.6504,3.8711L 10.8496,2 Z M 18.334,7L 16.666,9.4941C 17.3548,9.9544 18.2858,9.7689 18.7461,9.0801C 19.2063,8.3913 19.0228,7.4602 18.334,7 Z "/>
+</svg>
diff --git a/icons/svg/folder-search-outline.svg b/icons/svg/folder-search-outline.svg
new file mode 100644
index 000000000..bf62422d8
--- /dev/null
+++ b/icons/svg/folder-search-outline.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 16.5,12C 18.9853,12 21,14.0147 21,16.5C 21,17.3826 20.7459,18.2059 20.3069,18.9006L 23.3906,21.9844L 21.9844,23.3906L 18.8763,20.3221C 18.1867,20.7518 17.3723,21 16.5,21C 14.0147,21 12,18.9853 12,16.5C 12,14.0147 14.0147,12 16.5,12 Z M 16.5,14C 15.1193,14 14,15.1193 14,16.5C 14,17.8807 15.1193,19 16.5,19C 17.8807,19 19,17.8807 19,16.5C 19,15.1193 17.8807,14 16.5,14 Z M 18.9994,7.99807L 2.99939,7.99807L 2.99939,17.9981L 10.1735,17.9981C 10.3434,18.7184 10.6332,19.3925 11.0206,19.9981L 2.99939,19.9981C 1.89437,19.9981 0.999389,19.1021 0.999389,17.9981L 1.0094,5.99807C 1.0094,4.89407 1.89437,3.99807 2.99939,3.99807L 8.99939,3.99807L 10.9994,5.99807L 18.9994,5.99807C 20.1034,5.99807 20.9994,6.89407 20.9994,7.99807L 20.9994,11.809C 20.4239,11.2568 19.747,10.8096 18.9994,10.4979L 18.9994,7.99807 Z "/>
+</svg>
diff --git a/icons/svg/folder-search.svg b/icons/svg/folder-search.svg
new file mode 100644
index 000000000..9057735a6
--- /dev/null
+++ b/icons/svg/folder-search.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 16.5,12C 18.9853,12 21,14.0147 21,16.5C 21,17.3826 20.7459,18.2059 20.3069,18.9006L 23.3906,21.9844L 21.9844,23.3906L 18.8763,20.3221C 18.1867,20.7518 17.3723,21 16.5,21C 14.0147,21 12,18.9853 12,16.5C 12,14.0147 14.0147,12 16.5,12 Z M 16.5,14C 15.1193,14 14,15.1193 14,16.5C 14,17.8807 15.1193,19 16.5,19C 17.8807,19 19,17.8807 19,16.5C 19,15.1193 17.8807,14 16.5,14 Z M 8.99936,3.99807L 10.9994,5.99807L 18.9994,5.99807C 20.1029,5.99807 20.9994,6.89406 20.9994,7.99807L 20.9994,11.809C 19.8315,10.6886 18.2462,10 16.5,10C 12.9101,10 10,12.9101 10,16.5C 10,17.7878 10.3745,18.9882 11.0206,19.9981L 2.99936,19.9981C 1.89436,19.9981 0.999362,19.1021 0.999362,17.9981L 1.00936,5.99807C 1.00936,4.89406 1.89436,3.99807 2.99936,3.99807L 8.99936,3.99807 Z "/>
+</svg>
diff --git a/icons/svg/headphones-bluetooth.svg b/icons/svg/headphones-bluetooth.svg
new file mode 100644
index 000000000..bbb8a51f2
--- /dev/null
+++ b/icons/svg/headphones-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 8,6C 4.68629,6 2,8.6863 2,12L 2,16.8008C 2,17.4608 2.53922,18 3.19922,18L 6,18L 6,14L 4,14L 4,12C 4,9.7909 5.79086,8 8,8C 10.2091,8 12,9.7909 12,12L 12,14L 10,14L 10,18L 12.8008,18C 13.4629,17.9996 13.9996,17.4629 14,16.8008L 14,12C 14,8.6863 11.3137,6 8,6 Z M 19,7L 19,10.7891L 16.7109,8.5L 16,9.209L 18.7891,12L 16,14.7891L 16.7109,15.5L 19,13.209L 19,17L 19.5,17L 22.3496,14.1406L 20.2109,12L 22.3496,9.8496L 19.5,7L 19,7 Z M 20,8.9102L 20.9395,9.8496L 20,10.7891L 20,8.9102 Z M 20,13.209L 20.9395,14.1406L 20,15.0801L 20,13.209 Z "/>
+</svg>
diff --git a/icons/svg/home-minus.svg b/icons/svg/home-minus.svg
new file mode 100644
index 000000000..4f09abc30
--- /dev/null
+++ b/icons/svg/home-minus.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 12,3L 2,12L 5,12L 5,20L 19,20L 19,12L 22,12L 12,3 Z M 16,13L 16,15L 8,15L 8,13L 16,13 Z "/>
+</svg>
diff --git a/icons/svg/home-plus.svg b/icons/svg/home-plus.svg
new file mode 100644
index 000000000..1a62cbbe4
--- /dev/null
+++ b/icons/svg/home-plus.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 12,3L 2,12L 5,12L 5,20L 19,20L 19,12L 22,12L 12,3 Z M 11,10L 13,10L 13,13L 16,13L 16,15L 13,15L 13,18L 11,18L 11,15L 8,15L 8,13L 11,13L 11,10 Z "/>
+</svg>
diff --git a/icons/svg/image-search-outline.svg b/icons/svg/image-search-outline.svg
new file mode 100644
index 000000000..0caf0e966
--- /dev/null
+++ b/icons/svg/image-search-outline.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 15.5156,9C 16.2031,9 16.7891,8.7578 17.2734,8.2734C 17.7578,7.7891 18,7.2031 18,6.5156C 18,5.8281 17.7578,5.2344 17.2734,4.7344C 16.7891,4.2344 16.2031,3.9844 15.5156,3.9844C 14.8281,3.9844 14.2344,4.2344 13.7344,4.7344C 13.2344,5.2344 12.9844,5.8281 12.9844,6.5156C 12.9844,7.2031 13.2344,7.7891 13.7344,8.2734C 14.2344,8.7578 14.8281,9 15.5156,9 Z M 19.3125,8.9062L 22.4063,12L 21,13.4062L 17.8594,10.3125C 17.0781,10.7812 16.2813,11.0156 15.4688,11.0156C 14.2188,11.0156 13.1641,10.5781 12.3047,9.7031C 11.4453,8.8281 11.0156,7.7656 11.0156,6.5156C 11.0156,5.2656 11.4531,4.2031 12.3281,3.3281C 13.2031,2.4531 14.2656,2.0156 15.5156,2.0156C 16.7656,2.0156 17.8281,2.4531 18.7031,3.3281C 19.5781,4.2031 20.0156,5.2656 20.0156,6.5156C 20.0156,7.3281 19.7813,8.125 19.3125,8.9062 Z M 16.5,18L 5.48438,18L 8.25,14.4844L 10.2188,16.8281L 12.9375,13.3125L 16.5,18 Z M 18,12.9844L 20.0156,15L 20.0156,20.0156C 20.0156,20.5469 19.8125,21.0078 19.4063,21.3984C 19,21.7891 18.5313,21.9844 18,21.9844L 3.98438,21.9844C 3.45312,21.9844 2.99219,21.7891 2.60156,21.3984C 2.21094,21.0078 2.01563,20.5469 2.01563,20.0156L 2.01563,6C 2.01563,5.4687 2.21094,5 2.60156,4.5937C 2.99219,4.1875 3.45312,3.9844 3.98438,3.9844L 9.51563,3.9844C 9.20312,4.6406 9.03125,5.3125 9,6L 3.98438,6L 3.98438,20.0156L 18,20.0156L 18,12.9844 Z "/>
+</svg>
diff --git a/icons/svg/image-search.svg b/icons/svg/image-search.svg
new file mode 100644
index 000000000..0353a5d86
--- /dev/null
+++ b/icons/svg/image-search.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="miter" d="M 15.5,2C 17.9853,2 20,4.01472 20,6.5C 20,7.38261 19.7459,8.20586 19.3069,8.90061L 22.3906,11.9844L 20.9844,13.3906L 17.8763,10.3221C 17.1867,10.7518 16.3723,11 15.5,11C 13.0147,11 11,8.98528 11,6.5C 11,4.01472 13.0147,2 15.5,2 Z M 15.5,4.00001C 14.1193,4.00001 13,5.1193 13,6.50001C 13,7.88072 14.1193,9 15.5,9C 16.8807,9 18,7.88072 18,6.50001C 18,5.1193 16.8807,4.00001 15.5,4.00001 Z M 7.5,14.5L 4,19L 18,19L 13.5,13L 10,17.5L 7.5,14.5 Z M 20,20C 20,21.1046 19.1046,22 18,22L 4,22C 2.89543,22 2,21.1046 2,20L 2,6.00001C 2,4.89541 2.89543,4.00001 4,4.00001L 9.49816,4.00001C 9.17722,4.7696 9,5.6141 9,6.5C 9,10.0899 11.9101,13 15.5,13C 16.1821,13 16.8397,12.8949 17.4574,12.7001L 20,15.2427L 20,20 Z "/>
+</svg>
diff --git a/icons/svg/map-search-outline.svg b/icons/svg/map-search-outline.svg
new file mode 100644
index 000000000..0fcbbd024
--- /dev/null
+++ b/icons/svg/map-search-outline.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="miter" d="M 15.4994,11.9981C 17.9847,11.9981 19.9994,14.0128 19.9994,16.4981C 19.9994,17.3807 19.7453,18.2039 19.3063,18.8987L 22.39,21.9824L 20.9838,23.3887L 17.8757,20.3202C 17.1861,20.7499 16.3717,20.9981 15.4994,20.9981C 13.0141,20.9981 10.9994,18.9833 10.9994,16.4981C 10.9994,14.0128 13.0141,11.9981 15.4994,11.9981 Z M 15.4994,13.9981C 14.1187,13.9981 12.9994,15.1174 12.9994,16.4981C 12.9994,17.8788 14.1187,18.9981 15.4994,18.9981C 16.8801,18.9981 17.9994,17.8788 17.9994,16.4981C 17.9994,15.1174 16.8801,13.9981 15.4994,13.9981 Z M 19.4994,1.99807C 19.7794,1.99807 19.9994,2.21807 19.9994,2.49807L 19.9994,11.8076C 19.4239,11.2554 18.747,10.808 17.9994,10.4962L 17.9994,4.69807L 14.9994,5.85807L 14.9994,10.017C 14.2954,10.0706 13.6228,10.2362 12.9994,10.4962L 12.9994,5.86807L 8.99939,4.46807L 8.99939,16.1281L 9.00955,16.1316L 8.99939,16.4981C 8.99939,17.1381 9.0919,17.7566 9.26429,18.3408L 7.99939,17.8981L 2.65939,19.9681L 2.49939,19.9981C 2.21939,19.9981 1.99939,19.7781 1.99939,19.4981L 1.99939,4.37807C 1.99939,4.14807 2.14939,3.96807 2.35939,3.89807L 7.99939,1.99807L 13.9994,4.09807L 19.3392,2.02807L 19.4994,1.99807 Z M 3.99939,5.45807L 3.99939,17.3081L 6.99939,16.1481L 6.99939,4.44807L 3.99939,5.45807 Z "/>
+</svg>
diff --git a/icons/svg/map-search.svg b/icons/svg/map-search.svg
new file mode 100644
index 000000000..38f099195
--- /dev/null
+++ b/icons/svg/map-search.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 15.5,12C 17.9853,12 20,14.0147 20,16.5C 20,17.3826 19.7459,18.2059 19.3069,18.9006L 22.3906,21.9844L 20.9844,23.3906L 17.8763,20.3221C 17.1867,20.7518 16.3723,21 15.5,21C 13.0147,21 11,18.9853 11,16.5C 11,14.0147 13.0147,12 15.5,12 Z M 15.5,14C 14.1193,14 13,15.1193 13,16.5C 13,17.8807 14.1193,19 15.5,19C 16.8807,19 18,17.8807 18,16.5C 18,15.1193 16.8807,14 15.5,14 Z M 13.9994,6.10506L 7.99939,3.99807L 7.99939,15.8911L 9.00494,16.2442L 9,16.5C 9,17.1394 9.09231,17.7571 9.26433,18.3408L 7.99939,17.8981L 2.65641,19.9731L 2.49939,19.9981C 2.22339,19.9981 1.99939,19.7741 1.99939,19.4981L 1.99939,4.37608C 1.99939,4.14708 2.1524,3.96607 2.36239,3.89606L 7.99939,1.99807L 13.9994,4.09809L 19.3434,2.02306L 19.4994,1.99807C 19.7764,1.99807 19.9994,2.22108 19.9994,2.49807L 19.9994,11.809C 18.8316,10.6886 17.2462,10 15.5,10C 14.9835,10 14.4811,10.0602 13.9994,10.1741L 13.9994,6.10506 Z "/>
+</svg>
diff --git a/icons/svg/qi.svg b/icons/svg/qi.svg
new file mode 100644
index 000000000..a90306399
--- /dev/null
+++ b/icons/svg/qi.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#231F20" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 12.09,6.56L 12.09,14.64C 12.09,14.7228 12.0228,14.79 11.94,14.79C 9.62317,14.79 7.745,12.9118 7.745,10.595C 7.745,8.2782 9.62317,6.4 11.94,6.4C 12.0228,6.3998 12.0901,6.4668 12.09,6.56 Z M 12.09,17.86L 12.09,20.29C 12.0634,21.691 13.1244,22.8743 14.52,23C 14.6635,23.0056 14.7844,22.8939 14.79,22.73L 14.79,4.47C 14.7824,4.3013 14.6768,4.1527 14.52,4.09C 10.9238,2.671 6.85826,4.4359 5.43925,8.0321C 4.02025,11.6282 5.78517,15.6938 9.38133,17.1128C 10.1555,17.4183 10.9779,17.5833 11.81,17.6C 11.9535,17.5944 12.0744,17.7061 12.08,17.87M 16.19,5.5L 16.19,15.72C 16.19,15.99 16.19,16.2 16.46,15.99L 16.46,15.99C 19.423,13.5068 19.8119,9.0917 17.3287,6.1287C 17.0651,5.8142 16.7745,5.5235 16.46,5.26C 16.19,5.05 16.19,5.26 16.19,5.53M 14.79,2.43C 14.79,1.6568 15.4168,1.03 16.19,1.03C 16.9632,1.03 17.59,1.6568 17.59,2.43C 17.59,3.2032 16.9632,3.83 16.19,3.83L 16.19,3.83C 15.4168,3.83 14.79,3.2032 14.79,2.43"/>
+</svg>
diff --git a/icons/svg/restore-clock.svg b/icons/svg/restore-clock.svg
new file mode 100644
index 000000000..7340dd63a
--- /dev/null
+++ b/icons/svg/restore-clock.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="miter" d="M 13,3C 8.03,3 4,7.03 4,12L 1,12L 4.89,15.89L 4.96,16.03L 9,12L 6,12C 6,8.13 9.13,5 13,5C 16.87,5 20,8.13 20,12C 20,15.87 16.87,19 13,19C 11.07,19 9.32,18.21 8.06,16.94L 6.64,18.36C 8.27,19.99 10.51,21 13,21C 17.97,21 22,16.97 22,12C 22,7.03 17.97,3 13,3 Z M 12,8L 12,13L 16.28,15.54L 17,14.33L 13.5,12.25L 13.5,8L 12,8 Z "/>
+</svg>
diff --git a/icons/svg/restore.svg b/icons/svg/restore.svg
index 97bb7dc25..10a3db9b3 100644
--- a/icons/svg/restore.svg
+++ b/icons/svg/restore.svg
@@ -1,5 +1,5 @@
 <?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
-	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 13,3C 8.03,3 4,7.03 4,12L 1,12L 4.89,15.89L 4.96,16.03L 9,12L 6,12C 6,8.13 9.13,5 13,5C 16.87,5 20,8.13 20,12C 20,15.87 16.87,19 13,19C 11.07,19 9.32,18.21 8.06,16.94L 6.64,18.36C 8.27,19.99 10.51,21 13,21C 17.97,21 22,16.97 22,12C 22,7.03 17.97,3 13,3 Z M 12,8L 12,13L 16.28,15.54L 17,14.33L 13.5,12.25L 13.5,8L 12,8 Z "/>
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="miter" d="M 13,3C 8.03,3 4,7.03 4,12L 1,12L 4.89,15.89L 4.96,16.03L 9,12L 6,12C 6,8.13 9.13,5 13,5C 16.87,5 20,8.13 20,12C 20,15.87 16.87,19 13,19C 11.07,19 9.32,18.21 8.06,16.94L 6.64,18.36C 8.27,19.99 10.51,21 13,21C 17.97,21 22,16.97 22,12C 22,7.03 17.97,3 13,3 Z "/>
 </svg>
diff --git a/icons/svg/speaker-bluetooth.svg b/icons/svg/speaker-bluetooth.svg
new file mode 100644
index 000000000..f1d1e9038
--- /dev/null
+++ b/icons/svg/speaker-bluetooth.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 4,3C 2.89543,3 2,3.8954 2,5L 2,19C 2,20.1046 2.89543,21 4,21L 12,21C 13.1046,21 14,20.1046 14,19L 14,5C 14,3.8954 13.1046,3 12,3L 4,3 Z M 8,5C 9.10457,5 10,5.8954 10,7C 10,8.1046 9.10457,9 8,9C 6.89543,9 6,8.1046 6,7C 6,5.8954 6.89543,5 8,5 Z M 19,7L 19,10.7891L 16.7109,8.5L 16,9.209L 18.7891,12L 16,14.7891L 16.7109,15.5L 19,13.209L 19,17L 19.5,17L 22.3496,14.1406L 20.2109,12L 22.3496,9.8496L 19.5,7L 19,7 Z M 20,8.9102L 20.9395,9.8496L 20,10.7891L 20,8.9102 Z M 8,11C 10.2091,11 12,12.7909 12,15C 12,17.2091 10.2091,19 8,19C 5.79086,19 4,17.2091 4,15C 4,12.7909 5.79086,11 8,11 Z M 8,13C 6.89543,13 6,13.8954 6,15C 6,16.1046 6.89543,17 8,17C 9.10457,17 10,16.1046 10,15C 10,13.8954 9.10457,13 8,13 Z M 20,13.209L 20.9395,14.1406L 20,15.0801L 20,13.209 Z "/>
+</svg>
diff --git a/icons/svg/tumble-dryer.svg b/icons/svg/tumble-dryer.svg
index 04d950bba..876f57f2c 100644
--- a/icons/svg/tumble-dryer.svg
+++ b/icons/svg/tumble-dryer.svg
@@ -1,5 +1,5 @@
 <?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
-	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 6,2C 4.89543,2 4,2.8954 4,4L 4,20C 4,21.1046 4.89543,22 6,22L 18,22C 19.1046,22 20,21.1046 20,20L 20,4C 20,2.8954 19.1046,2 18,2L 6,2 Z M 7,4C 7.55228,4 8,4.4477 8,5C 8,5.5523 7.55228,6 7,6C 6.44772,6 6,5.5523 6,5C 6,4.4477 6.44772,4 7,4 Z M 10,4C 10.5523,4 11,4.4477 11,5C 11,5.5523 10.5523,6 10,6C 9.44772,6 9,5.5523 9,5C 9,4.4477 9.44772,4 10,4 Z M 12,8C 15.3137,8 18,10.6863 18,14C 18,17.3137 15.3137,20 12,20C 8.68629,20 6,17.3137 6,14C 6,10.6863 8.68629,8 12,8 Z M 9.32422,10C 8.91245,10.8888 8.5,11.7768 8.5,12.666C 8.5,13.5548 9.32422,14.4452 9.32422,15.334C 9.32422,16.2232 8.5,17.1112 8.5,18L 9.73438,18C 9.73438,17.1112 10.5586,16.2232 10.5586,15.334C 10.5586,14.4452 9.73438,13.5548 9.73438,12.666C 9.73438,11.7768 10.1468,10.8888 10.5586,10L 9.32422,10 Z M 11.7949,10C 11.3832,10.8888 10.9707,11.7768 10.9707,12.666C 10.9707,13.5548 11.7949,14.4452 11.7949,15.334C 11.7949,16.2232 10.9707,17.1112 10.9707,18L 12.2051,18C 12.2051,17.1112 13.0293,16.2232 13.0293,15.334C 13.0293,14.4452 12.2051,13.5548 12.2051,12.666C 12.2051,11.7768 12.6175,10.8888 13.0293,10L 11.7949,10 Z M 14.2656,10C 13.8539,10.8888 13.4414,11.7768 13.4414,12.666C 13.4414,13.5548 14.2656,14.4452 14.2656,15.334C 14.2656,16.2232 13.4414,17.1112 13.4414,18L 14.6758,18C 14.6758,17.1112 15.5,16.2232 15.5,15.334C 15.5,14.4452 14.6758,13.5548 14.6758,12.666C 14.6758,11.7768 15.0882,10.8888 15.5,10L 14.2656,10 Z "/>
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 6,2L 18,2C 19.1046,2 20,2.8954 20,4L 20,20C 20,21.1046 19.1046,22 18,22L 6,22C 4.89543,22 4,21.1046 4,20L 4,4C 4,2.8954 4.89543,2 6,2 Z M 7,4C 6.44772,4 6,4.4477 6,5C 6,5.5523 6.44772,6 7,6C 7.55228,6 8,5.5523 8,5C 8,4.4477 7.55228,4 7,4 Z M 10,4C 9.44772,4 9,4.4477 9,5C 9,5.5523 9.44772,6 10,6C 10.5523,6 11,5.5523 11,5C 11,4.4477 10.5523,4 10,4 Z M 12,8C 8.68629,8 6,10.6863 6,14C 6,17.3137 8.68629,20 12,20C 15.3137,20 18,17.3137 18,14C 18,10.6863 15.3137,8 12,8 Z M 8.10742,10.5L 9.99805,10.5C 9.7582,11.8798 9.99813,12.6691 10.5781,13.2891C 11.6784,14.3594 12.1592,15.7103 11.8887,17.5L 9.99805,17.5C 10.2379,16.1202 9.99797,15.3309 9.41797,14.7109C 8.31766,13.6404 7.84883,12.2897 8.10742,10.5 Z M 12.1074,10.5L 13.998,10.5C 13.7582,11.8798 13.9981,12.6691 14.5781,13.2891C 15.6784,14.3594 16.1592,15.7103 15.8887,17.5L 13.998,17.5C 14.2379,16.1202 13.998,15.3309 13.418,14.7109C 12.3177,13.6404 11.8488,12.2897 12.1074,10.5 Z "/>
 </svg>
diff --git a/icons/svg/two-factor-authentication.svg b/icons/svg/two-factor-authentication.svg
new file mode 100644
index 000000000..a2ef78481
--- /dev/null
+++ b/icons/svg/two-factor-authentication.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 2,7L 2,9L 6,9L 6,11L 4,11C 2.89543,11 2,11.8954 2,13L 2,17L 8,17L 8,15L 4,15L 4,13L 6,13C 7.10457,13 8,12.1046 8,11L 8,9C 8,7.89 7.1,7 6,7L 2,7 Z M 9,7L 9,17L 11,17L 11,13L 14,13L 14,11L 11,11L 11,9L 15,9L 15,7L 9,7 Z M 18,7C 16.8954,7 16,7.8954 16,9L 16,17L 18,17L 18,14L 20,14L 20,17L 22,17L 22,9C 22,7.8954 21.1046,7 20,7L 18,7 Z M 18,9L 20,9L 20,12L 18,12L 18,9 Z "/>
+</svg>
diff --git a/icons/svg/umbrella-closed.svg b/icons/svg/umbrella-closed.svg
new file mode 100644
index 000000000..a869a954f
--- /dev/null
+++ b/icons/svg/umbrella-closed.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 12,1.53L 17.5,15L 13,15L 13,19C 13,20.6569 11.6569,22 10,22C 8.3431,22 7,20.6569 7,19L 7,18L 9,18L 9,19C 9,19.5523 9.4477,20 10,20C 10.5523,20 11,19.5523 11,19L 11,15L 6.5,15L 12,1.53 Z "/>
+</svg>
diff --git a/icons/svg/weight-kilogram.svg b/icons/svg/weight-kilogram.svg
index 940ed1476..8095fa1aa 100644
--- a/icons/svg/weight-kilogram.svg
+++ b/icons/svg/weight-kilogram.svg
@@ -1,5 +1,5 @@
 <?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
-	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 12,3C 14.2091,3 16,4.79086 16,6.99999C 16,7.72857 15.8052,8.41165 15.4649,9L 18,9C 18.9523,9 19.7491,9.66555 19.9507,10.5569C 21.9645,18.5682 22,18.78 22,19C 22,20.1046 21.1046,21 20,21L 4,21C 2.89543,21 2,20.1046 2,19C 2,18.78 2.03554,18.5682 4.04926,10.5569C 4.25088,9.66555 5.04771,9 6,9L 8.53513,9C 8.19479,8.41165 8,7.72857 8,6.99999C 8,4.79086 9.79086,3 12,3 Z M 12,5.00001C 10.8954,5.00001 9.99999,5.89544 9.99999,7.00001C 9.99999,8.10458 10.8954,9.00001 12,9.00001C 13.1046,9.00001 14,8.10458 14,7.00001C 14,5.89544 13.1046,5.00001 12,5.00001 Z M 9.03733,15.44L 10.396,18L 12.112,18L 10.0707,14.6573L 11.9507,11.9413L 10.2,11.9413L 8.86667,14.3307L 8.388,14.3307L 8.388,11.9413L 6.97467,11.9413L 6.97467,18L 8.388,18L 8.388,15.44L 9.03733,15.44 Z M 17.3133,17.1627L 17.3133,14.928L 14.9467,14.928L 14.9467,16.0373L 15.9013,16.0373L 15.9013,16.7947L 15.5513,16.9267L 14.9427,16.976C 14.5871,16.976 14.3107,16.8496 14.1133,16.5967C 13.916,16.3438 13.8173,16.0098 13.8173,15.5947L 13.8173,14.3387C 13.8173,13.9342 13.9173,13.6042 14.1173,13.3487C 14.3173,13.0931 14.5813,12.9653 14.9093,12.9653C 15.2373,12.9653 15.4811,13.0458 15.6407,13.2067C 15.8002,13.3676 15.9036,13.6071 15.9507,13.9253L 17.272,13.9253L 17.28,13.9C 17.2276,13.268 17.0069,12.7693 16.618,12.404C 16.2291,12.0387 15.6444,11.856 14.864,11.856C 14.144,11.856 13.5556,12.0876 13.0987,12.5507C 12.6418,13.0138 12.4133,13.6098 12.4133,14.3387L 12.4133,15.6027C 12.4133,16.3378 12.6473,16.9353 13.1153,17.3953C 13.5833,17.8553 14.1924,18.0853 14.9427,18.0853C 15.5347,18.0853 16.0264,17.9924 16.418,17.8067C 16.8096,17.6209 17.108,17.4062 17.3133,17.1627 Z "/>
+	<path fill="#000000" fill-opacity="1" stroke-width="1.33333" stroke-linejoin="miter" d="M 12,3C 14.2091,3 16,4.7909 16,7C 16,7.73 15.81,8.41 15.46,9L 18,9C 18.95,9 19.75,9.67 19.95,10.56C 21.96,18.57 22,18.78 22,19C 22,20.1046 21.1046,21 20,21L 4,21C 2.89543,21 2,20.1046 2,19C 2,18.78 2.04,18.57 4.05,10.56C 4.25,9.67 5.05,9 6,9L 8.54,9C 8.19,8.41 8,7.73 8,7C 8,4.7909 9.79086,3 12,3 Z M 12,5C 10.8954,5 10,5.8954 10,7C 10,8.1046 10.8954,9 12,9C 13.1046,9 14,8.1046 14,7C 14,5.8954 13.1046,5 12,5 Z M 6,11L 6,19L 8,19L 8,16.5L 9,17.5L 9,19L 11,19L 11,17L 9,15L 11,13L 11,11L 9,11L 9,12.5L 8,13.5L 8,11L 6,11 Z M 15,11C 13.892,11 13,11.892 13,13L 13,17C 13,18.108 13.892,19 15,19L 18,19L 18,14L 16,14L 16,17L 15,17L 15,13L 18,13L 18,11L 15,11 Z "/>
 </svg>
diff --git a/icons/svg/weight-pound.svg b/icons/svg/weight-pound.svg
new file mode 100644
index 000000000..aa19b7c2c
--- /dev/null
+++ b/icons/svg/weight-pound.svg
@@ -0,0 +1,5 @@
+<?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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="24" height="24" viewBox="0 0 24.00 24.00" enable-background="new 0 0 24.00 24.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 12,3C 14.2091,3 16,4.79086 16,6.99999C 16,7.72857 15.8052,8.41165 15.4649,9L 18,9C 18.9523,9 19.7491,9.66555 19.9507,10.5569C 21.9645,18.5682 22,18.78 22,19C 22,20.1046 21.1046,21 20,21L 4,21C 2.89543,21 2,20.1046 2,19C 2,18.78 2.03554,18.5682 4.04926,10.5569C 4.25088,9.66555 5.04771,9 6,9L 8.53513,9C 8.19479,8.41165 8,7.72857 8,6.99999C 8,4.79086 9.79086,3 12,3 Z M 12,5.00001C 10.8954,5.00001 10,5.89544 10,7.00001C 10,8.10458 10.8954,9.00001 12,9.00001C 13.1046,9.00001 14,8.10458 14,7.00001C 14,5.89544 13.1046,5.00001 12,5.00001 Z M 6,11L 6,19L 11,19L 11,17L 8,17L 8,11L 6,11 Z M 13,11L 13,19L 16,19C 17.108,19 18,18.108 18,17L 18,16.5C 18,15.926 17.752,15.379 17.32,15C 17.752,14.621 18,14.074 18,13.5L 18,13C 18,11.892 17.108,11 16,11L 13,11 Z M 15,13L 16,13L 16,14L 15,14L 15,13 Z M 15,16L 16,16L 16,17L 15,17L 15,16 Z "/>
+</svg>
diff --git a/templates/icon/template.design b/templates/icon/template.design
index 8978d3174..f54ea0bfa 100644
Binary files a/templates/icon/template.design and b/templates/icon/template.design differ