diff --git a/.version b/.version
index 3c95f37..185285a 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-v5.5.2
+v6.0
diff --git a/resources/svg/add-circled-outline.svg b/resources/svg/add-circle.svg
similarity index 100%
rename from resources/svg/add-circled-outline.svg
rename to resources/svg/add-circle.svg
diff --git a/resources/svg/antenna-signal-rounded.svg b/resources/svg/antenna-signal-tag.svg
similarity index 100%
rename from resources/svg/antenna-signal-rounded.svg
rename to resources/svg/antenna-signal-tag.svg
diff --git a/resources/svg/arrow-bl-circled.svg b/resources/svg/arrow-bl-circle.svg
similarity index 100%
rename from resources/svg/arrow-bl-circled.svg
rename to resources/svg/arrow-bl-circle.svg
diff --git a/resources/svg/arrow-br-circled.svg b/resources/svg/arrow-br-circle.svg
similarity index 100%
rename from resources/svg/arrow-br-circled.svg
rename to resources/svg/arrow-br-circle.svg
diff --git a/resources/svg/arrow-down-circled.svg b/resources/svg/arrow-down-circle.svg
similarity index 100%
rename from resources/svg/arrow-down-circled.svg
rename to resources/svg/arrow-down-circle.svg
diff --git a/resources/svg/arrow-email-forward.svg b/resources/svg/arrow-email-forward.svg
new file mode 100644
index 0000000..3ce9c96
--- /dev/null
+++ b/resources/svg/arrow-email-forward.svg
@@ -0,0 +1,3 @@
+
diff --git a/resources/svg/arrow-left-circled.svg b/resources/svg/arrow-left-circle.svg
similarity index 100%
rename from resources/svg/arrow-left-circled.svg
rename to resources/svg/arrow-left-circle.svg
diff --git a/resources/svg/arrow-right-circled.svg b/resources/svg/arrow-right-circle.svg
similarity index 100%
rename from resources/svg/arrow-right-circled.svg
rename to resources/svg/arrow-right-circle.svg
diff --git a/resources/svg/arrow-tl-circled.svg b/resources/svg/arrow-tl-circle.svg
similarity index 100%
rename from resources/svg/arrow-tl-circled.svg
rename to resources/svg/arrow-tl-circle.svg
diff --git a/resources/svg/arrow-tr-circled.svg b/resources/svg/arrow-tr-circle.svg
similarity index 100%
rename from resources/svg/arrow-tr-circled.svg
rename to resources/svg/arrow-tr-circle.svg
diff --git a/resources/svg/arrow-up-circled.svg b/resources/svg/arrow-up-circle.svg
similarity index 100%
rename from resources/svg/arrow-up-circled.svg
rename to resources/svg/arrow-up-circle.svg
diff --git a/resources/svg/behance-squared.svg b/resources/svg/behance-tag.svg
similarity index 100%
rename from resources/svg/behance-squared.svg
rename to resources/svg/behance-tag.svg
diff --git a/resources/svg/bluetooth-rounded.svg b/resources/svg/bluetooth-tag.svg
similarity index 100%
rename from resources/svg/bluetooth-rounded.svg
rename to resources/svg/bluetooth-tag.svg
diff --git a/resources/svg/bold-square-outline.svg b/resources/svg/bold-square.svg
similarity index 100%
rename from resources/svg/bold-square-outline.svg
rename to resources/svg/bold-square.svg
diff --git a/resources/svg/bookmark-circled.svg b/resources/svg/bookmark-circle.svg
similarity index 100%
rename from resources/svg/bookmark-circled.svg
rename to resources/svg/bookmark-circle.svg
diff --git a/resources/svg/bus-outline.svg b/resources/svg/bus.svg
similarity index 100%
rename from resources/svg/bus-outline.svg
rename to resources/svg/bus.svg
diff --git a/resources/svg/cable-rounded.svg b/resources/svg/cable-tag.svg
similarity index 100%
rename from resources/svg/cable-rounded.svg
rename to resources/svg/cable-tag.svg
diff --git a/resources/svg/car-outline.svg b/resources/svg/car.svg
similarity index 100%
rename from resources/svg/car-outline.svg
rename to resources/svg/car.svg
diff --git a/resources/svg/check-circled-outline.svg b/resources/svg/check-circle.svg
similarity index 100%
rename from resources/svg/check-circled-outline.svg
rename to resources/svg/check-circle.svg
diff --git a/resources/svg/clock-outline.svg b/resources/svg/clock.svg
similarity index 100%
rename from resources/svg/clock-outline.svg
rename to resources/svg/clock.svg
diff --git a/resources/svg/credit-card-2.svg b/resources/svg/credit-card-2.svg
deleted file mode 100644
index ba6e6fa..0000000
--- a/resources/svg/credit-card-2.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/resources/svg/database-rounded.svg b/resources/svg/database-tag.svg
similarity index 100%
rename from resources/svg/database-rounded.svg
rename to resources/svg/database-tag.svg
diff --git a/resources/svg/delete-circled-outline.svg b/resources/svg/delete-circle.svg
similarity index 100%
rename from resources/svg/delete-circled-outline.svg
rename to resources/svg/delete-circle.svg
diff --git a/resources/svg/download-circled-outline.svg b/resources/svg/download-circle.svg
similarity index 100%
rename from resources/svg/download-circled-outline.svg
rename to resources/svg/download-circle.svg
diff --git a/resources/svg/download-square-outline.svg b/resources/svg/download-square.svg
similarity index 100%
rename from resources/svg/download-square-outline.svg
rename to resources/svg/download-square.svg
diff --git a/resources/svg/emoji-look-bottom.svg b/resources/svg/emoji-look-down.svg
similarity index 100%
rename from resources/svg/emoji-look-bottom.svg
rename to resources/svg/emoji-look-down.svg
diff --git a/resources/svg/emoji-look-top.svg b/resources/svg/emoji-look-up.svg
similarity index 100%
rename from resources/svg/emoji-look-top.svg
rename to resources/svg/emoji-look-up.svg
diff --git a/resources/svg/ev-rounded.svg b/resources/svg/ev-tag.svg
similarity index 100%
rename from resources/svg/ev-rounded.svg
rename to resources/svg/ev-tag.svg
diff --git a/resources/svg/facebook-squared.svg b/resources/svg/facebook-tag.svg
similarity index 100%
rename from resources/svg/facebook-squared.svg
rename to resources/svg/facebook-tag.svg
diff --git a/resources/svg/fast-arrow-top.svg b/resources/svg/fast-arrow-up.svg
similarity index 100%
rename from resources/svg/fast-arrow-top.svg
rename to resources/svg/fast-arrow-up.svg
diff --git a/resources/svg/fast-bottom-circle.svg b/resources/svg/fast-down-circle.svg
similarity index 100%
rename from resources/svg/fast-bottom-circle.svg
rename to resources/svg/fast-down-circle.svg
diff --git a/resources/svg/fast-top-circle.svg b/resources/svg/fast-up-circle.svg
similarity index 100%
rename from resources/svg/fast-top-circle.svg
rename to resources/svg/fast-up-circle.svg
diff --git a/resources/svg/fingerprint-circled-ok.svg b/resources/svg/fingerprint-check-circle.svg
similarity index 100%
rename from resources/svg/fingerprint-circled-ok.svg
rename to resources/svg/fingerprint-check-circle.svg
diff --git a/resources/svg/fingerprint-circled.svg b/resources/svg/fingerprint-circle.svg
similarity index 100%
rename from resources/svg/fingerprint-circled.svg
rename to resources/svg/fingerprint-circle.svg
diff --git a/resources/svg/fingerprint-circled-error.svg b/resources/svg/fingerprint-error-circle.svg
similarity index 100%
rename from resources/svg/fingerprint-circled-error.svg
rename to resources/svg/fingerprint-error-circle.svg
diff --git a/resources/svg/fingerprint-circled-lock.svg b/resources/svg/fingerprint-lock-circle.svg
similarity index 100%
rename from resources/svg/fingerprint-circled-lock.svg
rename to resources/svg/fingerprint-lock-circle.svg
diff --git a/resources/svg/fingerprint-squared.svg b/resources/svg/fingerprint-square.svg
similarity index 100%
rename from resources/svg/fingerprint-squared.svg
rename to resources/svg/fingerprint-square.svg
diff --git a/resources/svg/finger-print-window.svg b/resources/svg/fingerprint-window.svg
similarity index 100%
rename from resources/svg/finger-print-window.svg
rename to resources/svg/fingerprint-window.svg
diff --git a/resources/svg/forward-outline.svg b/resources/svg/forward-outline.svg
deleted file mode 100644
index e659d77..0000000
--- a/resources/svg/forward-outline.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/resources/svg/forward.svg b/resources/svg/forward.svg
index 3ce9c96..e659d77 100644
--- a/resources/svg/forward.svg
+++ b/resources/svg/forward.svg
@@ -1,3 +1,4 @@
-