diff --git a/src/img/icons/about.svg b/src/img/icons/about.svg
index 9dfca7b..f36b9f7 100644
--- a/src/img/icons/about.svg
+++ b/src/img/icons/about.svg
@@ -4,17 +4,22 @@
 <svg version="1.1" id="_x2014_ŽÓť_x5F_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 	 x="0px" y="0px" viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
 <g>
-	<path fill="#535353" d="M355.3,298c3.1,0,7.3,0,11.6,1c25.2,2.1,53.5,25.2,57.7,69.3V382c0,2.1,0,4.2-1,6.3v1c0,2.1-1,4.2-1,6.3
-		c0,0,0,0,0,1c-1,4.2-2.1,9.4-4.2,13.7l0,0c-12.6,33.6-43,73.5-106,119.7c-1,0-1,1-2.1,1c-2.1,1-3.1,2.1-5.3,4.2
-		c-2.1,2.1-5.3,4.2-8.4,5.3c-3.1-2.1-5.3-4.2-8.4-5.3c-2.1-1-3.1-2.1-5.3-4.2c-1,0-1-1-2.1-1c-63-46.2-93.4-86.1-106-119.7l0,0
-		c-2.1-5.3-3.1-9.4-4.2-13.7c0,0,0,0,0-1c0-2.1-1-4.2-1-6.3v-1c0-2.1,0-4.2,0-6.3v-14.7c3.1-44.1,32.5-67.2,57.7-69.3
-		c4.2,0,7.3,0,11.6,0l0,0c4.2,0,8.4,0,12.6,1c21,3.1,32.5,14.7,46.2,30.4c13.7-15.7,25.2-27.3,46.2-30.4
-		C346.9,298,351.1,298,355.3,298 M356.6,284.6c-5.4,0-9.7,0-15,1.1c-20.4,3.2-34.3,13.9-45.1,25.7c-10.7-11.8-24.7-22.5-45.1-25.7
-		c-4.3-1.1-9.7-1.1-13.9-1.1c-4.3,0-8.6,0-12.9,1.1c-30,2.1-64.3,29-68.6,80.5l0,0l0,0v15l0,0l0,0c0,2.1,0,4.3,1.1,6.4v1.1
-		c0,2.1,1.1,4.3,1.1,6.4l0,0l0,0c1.1,5.4,2.1,9.7,4.3,13.9l0,0l1.1,4.3c15,40.8,51.5,82.6,111.6,127.7l1.1,1.1l1.1,1.1l2.1,1.1
-		l3.2,2.1c3.2,2.1,5.4,4.3,8.6,6.4l6.4,4.3l6.4-4.3c3.2-2.1,5.4-4.3,8.6-6.4c2.1-1.1,3.2-3.2,5.4-4.3l2.1-1.1
-		c57.9-42.9,94.4-82.6,109.5-122.3l0,0l2.1-5.4c0,0,0-1.1,1.1-1.1l0,0l0,0c1.1-4.3,3.2-9.7,4.3-13.9l0,0v-1.1c0-2.1,1.1-4.3,1.1-7.5
-		l0,0v-1.1c0-3.2,1.1-5.4,1.1-7.5l0,0l0,0v-15l0,0l0,0c-4.3-51.5-38.6-77.3-68.7-80.5C365.2,284.6,360.9,284.6,356.6,284.6
-		L356.6,284.6z"/>
+	<path d="M297.2,557.2C296.7,557.2,296.7,557.2,297.2,557.2l-6.8-4.5c-1.8-0.9-3.2-2.3-4.5-3.2c-1.4-0.9-2.7-2.3-4.1-3.2l-3.2-2.3
+		l-2.3-0.9l0,0l-2.3-2.3c-60-45-96.3-86.8-111.3-127.2l0,0l-0.9-4.1c-2.3-4.1-3.2-8.6-4.1-14.1l0,0c0-0.9-0.5-1.8-0.5-3.2
+		c-0.5-0.9-0.5-2.3-0.5-3.2v-0.9c-0.9-2.3-0.9-4.5-0.9-6.4v-15.4l0,0c1.8-23.6,10.4-44.1,24.5-59.1c12.3-12.7,28.2-20.9,44.1-21.8
+		c4.5-0.9,8.6-0.9,12.7-0.9c4.1,0,9.5,0,14.1,0.9c17.3,2.7,31.3,10.9,45,25.4c13.6-14.5,27.7-22.7,45-25.4c5.5-0.9,9.5-0.9,15-0.9
+		c4.1,0,8.6,0,14.1,0.9c16.4,1.8,31.8,9.5,44.1,22.3c14.1,14.5,22.7,35,25,58.6l0,0v15c0,0.9-0.5,2.3-0.5,3.2
+		c-0.5,1.4-0.5,2.7-0.5,4.5v0.9c0,1.8-0.5,3.2-0.5,4.5c-0.5,0.9-0.5,1.8-0.5,2.7v0.9l0,0c-0.5,2.3-1.4,4.5-2.3,6.8
+		c-0.9,2.3-1.8,5-2.3,7.3c0,0.5-0.5,0.5-0.5,0.5c-0.5,0-0.5,0-0.5,0.5c0,0,0,0,0,0.5l-2.3,5.5c-7.7,20-20,39.5-38.6,60
+		c-18.2,20-40.9,40.4-70.4,62.2l0,0l-2.3,0.9c-0.9,0.5-1.8,1.4-2.7,2.3c-0.9,0.9-1.8,1.8-2.7,2.3c-1.4,0.9-2.7,2.3-4.1,3.2
+		c-1.4,0.9-2.7,2.3-4.5,3.2L297.2,557.2L297.2,557.2z M287.6,534.1c2.3,0.9,4.1,2.3,5.9,3.6c0.5,0.5,1.4,0.9,2.3,1.4
+		c2.7-0.9,5.9-2.7,7.7-5c0.5-0.5,0.5-0.5,0.9-0.9c1.8-1.8,2.7-2.7,4.5-3.6c0,0,0,0,0.5,0s0.5,0,0.5-0.5c0.5-0.5,0.5-0.5,1.4-0.5
+		c29.5-21.8,53.6-43.2,71.3-64.1c15.9-18.6,27.3-36.8,33.6-54.5l0,0c1.8-3.6,2.7-8.2,3.6-12.3c0-0.5,0-0.9,0.5-1.4v-0.9
+		c0-0.9,0.5-2.3,0.5-3.2c0.5-0.9,0.5-1.8,0.5-3.2v-0.9c0,0,0,0,0-0.5c0.9-1.8,0.9-4.1,0.9-5.9v-13.6c-4.1-44.1-32.3-66.3-56.8-68.1
+		l0,0c-4.1-0.9-8.2-0.9-11.4-0.9c-4.1,0-8.2,0-10.9,0.9l0,0c-20.4,3.2-31.8,14.5-45.4,30l-0.5,0.5c0,0-0.5,0-0.5-0.5
+		c-13.6-15.4-25-26.8-45.4-30l0,0c-4.1-0.9-8.2-0.9-12.3-0.9h-12.3c-13.2,0.9-26.3,7.7-36.3,18.6c-11.8,12.7-19.1,30-20.4,49.5v21.8
+		c0,0.9,0.5,1.8,0.5,3.2c0.5,0.9,0.5,2.3,0.5,3.2v0.9v0.5c0.9,4.1,1.8,7.7,4.1,12.7c6.8,17.7,18.2,36.3,33.6,54.5
+		c17.7,20.9,41.8,42.2,71.3,64.1c0.5,0,0.9,0.5,1.4,0.9c0.5,0,0.5,0.5,0.5,0.5h0.5c0.5,0.5,0.5,0.5,0.9,0.9
+		C285.4,532.2,286.3,533.1,287.6,534.1z"/>
 </g>
 </svg>
diff --git a/src/img/icons/account.svg b/src/img/icons/account.svg
index 08edf6c..ded5b74 100644
--- a/src/img/icons/account.svg
+++ b/src/img/icons/account.svg
@@ -4,19 +4,15 @@
 <svg version="1.1" id="Isolationsmodus" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
 	 y="0px" viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
 <g>
-	<g>
-		<g>
-			<path fill="#79C9EC" d="M422,529.3c0-7.4-5-76.7-21-94.1l-1.2-1.2c0,0-14.9-9.9-28.5-13.6c-6.2-1.2-23.5-6.2-32.2-16.1l-1.2-1.2
-				l-1.2-11.1c2.5-3.7,6.2-9.9,8.7-18.6c2.5-2.5,7.4-8.7,6.2-21v-8.7l-1.2-1.2l-1.2-1.2c1.2-13.6,0-39.6-16.1-50.8
-				c-2.5-2.5-12.4-11.1-35.9-11.1c-21,0-30.9,7.4-33.4,9.9c-17.3,11.1-17.3,38.4-17.3,52c-1.2,0-1.2,1.2-1.2,1.2l-1.2,1.2v6.2
-				c-1.2,13.6,3.7,19.8,6.2,22.3c2.5,8.7,7.4,16.1,8.7,18.6l-1.2,11.1l-1.2,1.2c-9.9,11.1-32.2,16.1-32.2,16.1
-				c-13.6,3.7-28.5,13.6-28.5,13.6l-1.2,1.2c-16.1,17.3-19.8,86.6-21,94.1v2.5l2.5,1.2c2.5,3.7,42.1,30.9,122.5,30.9
-				s120.1-27.2,121.3-28.5l2.5-1.2V529.3z M298.3,551.5c-65.6,0-102.7-18.6-112.6-24.8c1.2-22.3,6.2-70.6,17.3-82.9
-				c2.5-1.2,13.6-8.7,23.5-11.1c1.2,0,26-5,38.4-19.8l3.7-5l1.2-19.8v-1.2c0,0-5-7.4-8.7-17.3l-2.5-23.5c-1.2-9.9-2.5-38.4,11.1-47
-				l1.2-1.2c0,0,7.4-7.4,27.2-8.7c19.8,1.2,27.2,8.7,27.2,8.7l0,0l1.2,1.2c13.6,8.7,12.4,37.1,11.1,48.3l-2.5,22.3
-				c-3.7,9.9-8.7,17.3-8.7,17.3l-1.2,1.2l1.2,19.8l3.7,5c12.4,14.9,37.1,19.8,38.4,19.8c11.1,2.5,22.3,9.9,24.8,11.1
-				c9.9,12.4,16.1,61.9,17.3,82.9C401,533,363.9,551.5,298.3,551.5z"/>
-		</g>
-	</g>
+	<path d="M298.1,562.7c-77.9,0-116.5-25.5-122-30.6l-2.3-0.9l-1.4-2.3v-2.3c0-1.4,0.5-4.2,0.9-7.9c1.9-21.3,6.5-71.5,20.4-86.3
+		l1.4-1.4c0.9-0.5,15.3-10.2,29.2-13.9c0.5,0,21.3-5.1,30.6-15.3l0.9-0.9l0.9-9.3c0-0.5-0.5-0.9-0.9-1.4c-1.9-3.2-5.6-9.3-7.4-16.2
+		c-5.1-5.1-7.4-13.5-6.5-23.2v-6l0.5-1.9l0.5-0.5c0-0.5,0.5-0.9,0.9-1.4c0-13.9,0.5-40.4,17.6-51.5c2.3-1.9,12.1-10.2,34.3-10.2
+		c22.7,0,33.4,7.9,37.1,11.6c18.1,12.5,17.2,42.2,16.7,50.6l2.3,1.4l1.4,1.9v8.4c0,11.1-3.2,18.1-7,21.8c-1.9,6.5-5.1,12.1-8.4,17.6
+		l0.9,9.3l0.5,0.5c7.9,8.8,23.2,13.9,30.6,15.3c13.9,3.7,28.3,13.5,28.8,13.9l1.4,1.4c16.2,18.1,21.8,84.9,21.8,93.7l0.9,0.5v3.7
+		l-1.9,2.3l-2.8,1.4C412.7,538.6,374.7,562.7,298.1,562.7z M189.5,523.7c8.8,5.1,44.1,23.2,108.1,23.2c65.4,0,100.7-18.6,108.1-23.2
+		c-1.4-21.8-7.4-66.8-16.2-78.4c-0.5-0.5-1.4-0.5-1.9-0.9c-4.2-2.3-13-7.4-21.3-9.3c-3.7-0.5-26.9-6-39-20.4l-3.7-5.1l-0.5-1.4
+		l-1.4-19.5l0.5-1.9l1.4-1.4c0,0,4.6-7,7.9-15.8l2.3-21.8c1.9-16.7,0.5-38.5-9.7-45.5l-0.5-0.5l-1.4-1.4c0,0-7-6.5-25.1-7.9
+		c-18.1,1.4-25.1,7.9-25.1,7.9l-1.4,1.4l-0.5,0.5c-11.1,7-11.6,31.1-9.7,44.1l2.3,22.7c3.2,9.3,7,16.2,7,16.2l-0.5,1.4v1.4v19.5v1.4
+		l-3.2,5.1c-12.1,14.4-35.3,20-39,20.4c-7.4,1.9-15.3,6.5-19.5,9.3c-0.9,0.5-1.9,0.9-2.3,1.4C195.6,456.9,190.5,501,189.5,523.7z"/>
 </g>
 </svg>
diff --git a/src/img/icons/back.svg b/src/img/icons/back.svg
old mode 100755
new mode 100644
index ccdf221..e191139
--- a/src/img/icons/back.svg
+++ b/src/img/icons/back.svg
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="32" viewBox="0 0 18 32">
-<g id="icomoon-ignore">
-	<line stroke-width="1" x1="" y1="" x2="" y2="" stroke="#449FDB" opacity=""></line>
-</g>
-	<path d="M-0 16l16-16 1.485 1.485-16 16-1.485-1.485zM1.485 14.515l16 16-1.485 1.485-16-16 1.485-1.485z" fill="#000000"></path>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="684.8 369 470.1 841.9" enable-background="new 684.8 369 470.1 841.9" xml:space="preserve">
+<polygon points="783,789.9 1154.9,1161.8 1105.8,1210.9 684.8,789.9 724.1,750.7 1105.8,369 1154.9,418.1 "/>
+</svg>
diff --git a/src/img/icons/bug.svg b/src/img/icons/bug.svg
index 23d02bc..b01c3bb 100644
--- a/src/img/icons/bug.svg
+++ b/src/img/icons/bug.svg
@@ -4,26 +4,25 @@
 <svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
 <g>
-	<path fill="#565F73" d="M433.6,411l-40.2-1.7c15.9-23,13-55.2-8.1-76.3c-20.9-20.9-52.7-23.9-75.5-8.7l-1.6-38.6
-		c0-3.4-2.8-6-6.2-5.8c-3.4,0-6,2.8-5.8,6.2l2,48.4v0.5v0c-0.1,0-0.3,0-0.4,0c-5.4-0.5-10.8-0.4-16,0.1c0,0,0,0,0-0.1
-		c0-0.7-0.2-1.4-0.5-2l-18.2-36.6c-1.4-2.8-5-4-8-2.6c-2.8,1.4-4,5-2.6,8l17.6,35.3l0,0.1c-6.8,1.7-13.3,4.1-19.5,7.5
-		c-1.6,0.9-3.2,1.9-4.8,2.9c0.3-0.2,0.6-0.5,0.9-0.7c1.3-0.8,2.6-1.5,3.9-2.2l-31.8-30.2c-2.4-2.4-6.2-2.2-8.4,0.2
-		c-2.2,2.4-2,6.2,0.2,8.4l29.9,28.3c-2.7,2.1-5.3,4.4-7.9,6.9l-62.1,62c-33.1,32.9,1.4,117.7,2.8,121.3c0.4,0.8,0.8,1.4,1.4,2
-		c0.6,0.6,1.2,1,2,1.4c3.6,1.4,88.3,35.9,121.4,2.8l62.1-62.1c2.5-2.5,4.8-5.1,6.9-7.9l29.7,31.3c2.4,2.2,6,2.4,8.6,0.4
-		c2.4-2.2,2.4-6,0.2-8.4l-31.8-33.6l-0.1-0.1c3.2-6,5.7-12.3,7.3-18.9c0,0,0.1,0,0.1,0.1c0,0,0,0,0.1,0l36.6,18.2
-		c3,1.6,6.6,0.4,8-2.6c1.6-3,0.4-6.6-2.6-8L386.2,438c-1.1-0.6-2.3-0.8-3.5-0.7c0,0-0.1,0-0.1,0c0.6-5.5,0.7-11,0.2-16.6h-0.2
-		c0,0,0.1-0.1,0.2-0.1c0,0,0.1-0.1,0.1-0.1c0,0.1,0,0.2,0,0.3l50.2,2.1c3.2,0,6-2.4,6.2-5.8C439.4,414,437,411.2,433.6,411z
-		 M309.1,349c-1.6-0.4-3.1-0.7-4.7-1c0,0,0,0,0,0l0,0c-0.5,0-1-0.1-1.5-0.2c-0.1,0-0.2,0-0.4,0c0.1,0,0.2,0,0.3,0l0,0
-		c0.5,0.1,1,0.2,1.6,0.3l0,0l0,0l0,0C306,348.2,307.5,348.6,309.1,349z M299.5,347.2c-0.2,0-0.5,0-0.8-0.1
-		C299,347.1,299.3,347.2,299.5,347.2z M253.3,356.7c-0.4,0.4-0.9,0.7-1.4,0.9C252.4,357.3,252.9,357,253.3,356.7z M178.8,428.6
-		l62.1-62.1c1.7-1.7,3.5-3.3,5.3-4.8c7.2,23,20.2,44.7,37.9,63.6L181,528.5C171.4,501.5,158.5,449,178.8,428.6z M351.5,477.3
-		l-62.1,62c-20.3,20.3-73.1,7.2-100.1-2.4l103.1-103.1c19,17.8,40.8,30.9,64,37.9C354.9,473.7,353.3,475.5,351.5,477.3z M363,461.3
-		c-23.8-7-46.6-20.5-65.7-39.4c-0.2-0.2-0.4-0.4-0.6-0.6c-0.2-0.2-0.5-0.5-0.7-0.7c-18.9-19.1-32.4-41.6-39.3-65.6
-		c28.4-15.2,65.7-8.8,90.3,15.8C371.8,395.6,378.2,432.9,363,461.3z M310.3,349.3c1.2,0.3,2.3,0.7,3.5,1c1,0.3,1.9,0.6,2.8,1
-		c-0.9-0.3-1.9-0.6-2.8-1C312.6,349.9,311.4,349.6,310.3,349.3z M326.7,355.7c7.3,3.8,14.3,8.9,20.5,15.1c3.3,3.4,6.3,7,9,10.7
-		c-2.7-3.8-5.7-7.3-9-10.7C341.1,364.7,334.2,359.6,326.7,355.7z M381.1,408.8c-2.2-10.1-6.1-20-11.7-29.1
-		C375,388.8,379,398.7,381.1,408.8L381.1,408.8z M380.7,405.9c-4.2-16.2-12.8-31.4-25-43.6c-1.5-1.5-3-2.9-4.5-4.2
-		c1.5,1.3,2.9,2.7,4.3,4.1c5.2,5.2,9.7,10.9,13.4,16.8c-3.7-5.9-8.2-11.5-13.4-16.7c-13-13.1-28.9-21.6-45.3-25.3l0,0
-		c4,0.9,7.9,2.1,11.8,3.6c-3.2-1.2-6.6-2.3-9.9-3.2c18.2-15.6,46.5-14,64.5,4C394.6,359.4,396.2,387.6,380.7,405.9z"/>
+	<path fill="#1A171B" d="M434.1,411l-40.1-1.9c16-23.1,13.2-55.1-8-76.4c-20.7-20.7-52.8-24-75.4-9l-1.4-38.7c0-3.3-2.8-6.1-6.1-5.7
+		c-3.3,0-6.1,2.8-5.7,6.1l1.9,48.5v0.5l0,0h-0.5c-5.2-0.5-10.8-0.5-16,0l0,0c0-0.9,0-1.4-0.5-1.9L264,296c-1.4-2.8-5.2-4.2-8-2.4
+		c-2.8,1.4-4.2,5.2-2.4,8L271,337l0,0c-6.6,1.9-13.2,4.2-19.3,7.5c-1.4,0.9-3.3,1.9-4.7,2.8c0.5,0,0.5-0.5,0.9-0.9
+		c1.4-0.9,2.4-1.4,3.8-2.4l-32.1-30.2c-2.4-2.4-6.1-2.4-8.5,0c-2.4,2.4-1.9,6.1,0,8.5l30.2,28.3c-2.8,1.9-5.2,4.2-8,7.1l-63.2,62.7
+		c-33,33,1.4,117.8,2.8,121.6c0.5,0.9,0.9,1.4,1.4,1.9c0.5,0.5,1.4,0.9,1.9,1.4c3.8,1.4,88.6,35.8,121.6,2.8l62.2-62.2
+		c2.4-2.4,4.7-5.2,7.1-8l29.7,31.1c2.4,2.4,6.1,2.4,8.5,0.5c2.4-2.4,2.4-6.1,0-8.5l-32.1-33.5l0,0c3.3-6.1,5.7-12.3,7.5-18.9l0,0
+		l0,0l36.8,18.4c2.8,1.4,6.6,0.5,8-2.4c1.4-2.8,0.5-6.6-2.4-8L386,438.4c-0.9-0.5-2.4-0.9-3.3-0.9l0,0c0.5-5.7,0.9-10.8,0-16.5l0,0
+		l0,0l0,0c0,0,0,0,0,0.5l50.4,1.9c3.3,0,6.1-2.4,6.1-5.7C439.8,413.8,437.4,411,434.1,411z M309.2,348.8c-1.4-0.5-3.3-0.9-4.7-0.9
+		l0,0l0,0c-0.5,0-0.9,0-1.4,0c0,0,0,0-0.5,0c0,0,0,0,0.5,0l0,0c0.5,0,0.9,0,1.4,0.5l0,0l0,0l0,0
+		C305.9,348.3,307.8,348.3,309.2,348.8z M299.8,346.9c0,0-0.5,0-0.9,0C298.8,346.9,299.3,346.9,299.8,346.9z M253.1,356.8
+		c-0.5,0.5-0.9,0.9-1.4,0.9C252.2,357.3,253.1,356.8,253.1,356.8z M178.7,428.5l62.2-62.2c1.9-1.9,3.3-3.3,5.2-4.7
+		c7.1,23.1,20.3,44.8,38.2,63.6L181,528.4C171.1,501.5,158.4,449.2,178.7,428.5z M351.6,477.5l-62.2,62.2
+		c-20.3,20.3-73.1,7.1-100.4-2.4l103.2-103.2c18.9,17.9,41,31.1,64.1,38.2C354.9,473.7,353.5,475.6,351.6,477.5z M363,461.4
+		c-24-7.1-46.7-20.7-66-39.6l-0.5-0.5c0,0-0.5-0.5-0.9-0.9C276.7,401.1,263,379,256,354.9c28.3-15.1,66-9,90.5,16
+		C371.9,395.5,378.5,433.2,363,461.4z M310.6,349.3c1.4,0.5,2.4,0.9,3.3,0.9c0.9,0.5,1.9,0.5,2.8,0.9c-0.9-0.5-1.9-0.5-2.8-0.9
+		C312.5,349.7,311.6,349.7,310.6,349.3z M326.7,355.9c7.5,3.8,14.1,9,20.7,15.1c3.3,3.3,6.1,7.1,9,10.8c-2.8-3.8-5.7-7.5-9-10.8
+		C341.3,364.8,334.2,359.6,326.7,355.9z M381.3,408.7c-2.4-9.9-6.1-19.8-11.8-29.2C375.2,388.9,379.5,398.8,381.3,408.7L381.3,408.7
+		z M380.9,405.8c-4.2-16-12.7-31.6-25-43.8c-1.4-1.4-2.8-2.8-4.7-4.2c1.4,1.4,2.8,2.8,4.2,4.2c5.2,5.2,9.9,10.8,13.2,17
+		c-3.8-6.1-8-11.3-13.2-16.5c-13.2-13.2-28.8-21.7-45.3-25.5l0,0c4.2,0.9,8,1.9,11.8,3.8c-3.3-1.4-6.6-2.4-9.9-3.3
+		c18.4-15.6,46.7-14.1,64.6,4.2C395,359.2,396.4,387.4,380.9,405.8z"/>
 </g>
 </svg>
diff --git a/src/img/icons/contact.svg b/src/img/icons/contact.svg
index c51b159..9aae439 100644
--- a/src/img/icons/contact.svg
+++ b/src/img/icons/contact.svg
@@ -3,41 +3,51 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Isolationsmodus" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
 	 y="0px" viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<g>
-				<path fill="#79C9EC" d="M356.7,510c0-0.9,0-2.3-0.5-3.6c-0.9-14.5-5-59.5-16.4-72.7l-0.9-0.9c-0.5-0.5-11.8-8.2-23.2-10.9
-					c-1.8-0.5-5-1.4-9.1-2.7c-3.6-1.4-7.3-3.2-10.9-5.5c-2.3-1.4-4.5-3.2-6.4-5l-1.4-1.4l-0.5-10c1.8-2.3,5-8.2,7.3-15.4
-					c2.3-2.3,6.4-7.3,5.5-17.7v-5.5l-0.9-0.9c0-0.5-0.9-0.9-1.4-1.4c0.5-10.9,0-32.3-13.6-41.3c-2.3-2.3-10-8.6-28.6-9.5
-					c-18.2,0.9-26.3,7.3-28.2,9.5c-13.2,9.1-14.1,30.9-13.6,41.3c-0.9,0.5-1.4,0.9-1.4,1.4l-0.9,0.9v5.9
-					c-0.9,10.4,3.2,15.4,5.5,17.7c2.3,7.3,5.9,12.7,7.3,15.4l-0.9,9.5l-0.9,1.4c-7.7,9.1-25.4,12.7-25.9,13.2
-					c-11.4,2.7-22.7,10.9-23.2,10.9l-0.9,0.9c-13.2,14.1-16.4,70-16.8,76.3v2.3l2.3,1.4c1.4,0.9,33.2,22.7,98.6,22.7
-					c63.1,0,94.9-20.4,98.1-22.7l0,0l2.3-1.4L356.7,510z M256.3,527.7c-53.1,0-83.1-15.4-90.9-20c0.9-17.7,5.5-57.2,13.6-67.7
-					c2.3-1.4,11.4-7.3,19.5-9.5c0.9,0,20.9-4.5,31.3-15.9l3.2-3.6l0.9-15.9l-0.9-1.4c0,0-4.1-5.5-6.8-13.6l-2.3-18.6
-					c-1.4-8.6-1.8-31.8,9.5-39.1l0.9-0.9c0,0,5.9-6.4,21.8-6.8c16.4,0.5,22.3,6.8,22.3,6.8l0.9,0.9c10.9,7.3,10.4,30.4,9.5,39.1
-					l-2.3,18.2c-2.7,8.2-6.8,13.6-6.8,13.6l-1.4,1.8l1.4,15.9l3.2,3.6c0.9,1.4,2.3,2.3,3.6,3.6c2.3,2.3,5,3.6,7.7,5
-					c9.5,5,19.1,7.3,20,7.3c8.6,2.3,17.7,8.2,20,9.5c8.2,10,12.3,47.7,13.6,65.9c0,0.5,0,0.9,0,1.8c-2.3,1.4-6.4,3.6-11.8,5.9
-					C320.8,519.5,294.5,527.7,256.3,527.7z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<g>
-			<g>
-				<path fill="#79C9EC" d="M439.4,490.4c-0.5-5.5-3.2-54.1-14.5-67.2l-0.9-0.5c-0.5-0.5-10.4-7.3-20.4-10
-					c-4.5-0.9-17.3-4.5-23.2-11.4l-0.9-1.4l-0.9-8.2c1.4-2.3,4.5-7.3,6.4-13.6c2.3-1.8,5.5-6.4,5-15.4v-5l-0.9-0.9
-					c0-0.5-0.5-0.9-1.4-1.4c0.5-9.5,0-28.6-11.8-36.3c-1.8-1.8-9.1-7.7-25.4-8.2c-15.9,0.5-23.2,6.4-25,8.2
-					c-11.8,8.2-12.3,27.3-11.8,36.3c-0.5,0.5-0.9,0.9-1.4,1.4l-0.9,0.9v4.5c-0.5,9.1,2.7,13.6,5,15.4c2.3,6.4,5,11.4,6.4,13.6
-					l-0.5,8.2l-0.9,1.4c-7.3,8.2-23.2,11.4-23.2,11.4c-0.9,0-1.8,0.5-2.7,0.9c-3.6,0.9-6.8,2.7-9.5,4.1c2.3,2.3,5,3.6,7.7,5
-					c2.3-0.9,4.5-1.8,6.4-2.3c0.5,0,2.7-0.5,6.4-1.8c6.4-2.3,15.4-5.9,21.4-12.3l2.7-3.2l0.9-13.6l-0.9-1.4c0,0-3.6-5-5.9-11.8
-					l-1.8-15.9c-0.9-7.3-1.4-28.2,8.2-34.1l0.9-0.9c0,0,5-5.5,19.1-5.9c14.5,0.5,19.5,5.9,19.5,5.9l0,0l0.9,0.9
-					c9.5,6.4,9.1,26.8,8.2,34.1l-2.3,15.9c-2.3,7.3-5.9,12.3-5.9,12.3l-0.9,1.4l0.9,13.6l2.7,3.2c9.1,10,26.8,14.1,27.3,14.1
-					c7.7,1.8,15.4,6.8,17.3,8.2c7.7,9.1,11.4,44.1,12.3,59.5c-6.8,4.1-31.3,16.4-74.5,17.7c-1.8,0-3.6,0-5.5,0c-1.4,0-2.7,0-3.6,0
-					c0,0.5,0,0.9,0,1.8c-2.3,1.4-6.4,3.6-11.8,5.9c5,0.5,10,0.5,15.9,0.5c0.9,0,2.3,0,3.2,0c55-0.9,81.8-19.1,83.1-20l1.8-1.4V490.4
-					z"/>
-			</g>
-		</g>
-	</g>
-</g>
+<path d="M258.2,535.7c-60,0-91.7-18.5-97.4-22.3l-3-1.5c-0.8-0.4-1.9-1.1-1.9-1.9v-2.3l0.8-0.8c1.1-18.5,5.7-62.7,17.4-75.5l1.1-0.8
+	l1.1-0.4c0,0,0.8-0.4,1.1-0.8c3.8-2.3,12.5-7.5,21.5-9.8c0.4,0,0.8-0.4,1.9-0.8c4.2-1.1,16.6-4.9,22.6-11.7l0.4-0.8l0.8-7.9
+	c-0.4-0.4-0.4-0.8-0.8-1.5c-1.9-3-4.2-7.5-6-12.8c-4.5-4.5-6.4-10.6-5.7-18.5v-5.7c0-0.8,0.4-1.1,0.8-1.5l0.4-0.4
+	c0.4-0.4,0.8-1.1,1.1-1.5c-0.4-9.8,0.8-31.3,14.3-40.8c1.1-1.1,8.7-8.7,28.7-9.8c6.4,0.4,21.5,1.9,29.4,9.8
+	c12.5,8.3,14.3,26.8,14,40.8c0.4,0.4,0.8,0.8,1.1,1.1l0.8,0.4c0.4,0.4,0.8,1.1,0.8,1.5v5.3c0,7.5-1.1,13.6-5.7,18.5
+	c-2.3,6.4-4.9,11.7-6.8,14.3l0.4,8.3l0.8,0.8c1.5,1.5,3,2.6,4.2,3.4c0.8-0.4,1.9-0.8,2.6-0.8c2.3-0.4,15.1-3.8,21.1-10.2l0.4-0.8
+	l0.4-6.8c-1.5-2.6-3.4-7.2-5.3-12.5c-2.3-1.9-4.5-6.8-4.5-16.6v-4.2c0-0.8-0.4-1.1,0-1.5l1.1-1.5c-0.4-4.5-0.4-10.9,1.1-17.7
+	c1.9-8.7,5.7-14.7,10.9-18.9c1.1-1.1,8.7-7.9,25.7-8.3c16.2,0.4,23.8,6,26.4,8.7c11.3,7.5,12.8,25.3,12.5,35.9
+	c0.4,0.4,0.8,0.8,1.1,1.5v0.4c0.4,0.4,0.4,1.1,0.4,1.5v4.9c0,9.8-3,14.3-4.9,16.2c-1.9,5.7-4.2,10.2-5.7,12.5l0.8,6.8l0.8,0.8
+	c4.5,5.3,15.1,9.1,21.1,10.2c10.9,3,20.8,10.2,20.8,10.2l0.8,0.4l0.4,0.4c7.2,8.3,12.1,29.4,14.7,64.5c0,0.4,0,1.1,0,1.1
+	c0.4,0.4,0.4,0.8,0.4,1.1v2.3c0,0.8-0.4,1.1-0.8,1.9c-1.1,0.8-1.5,1.1-1.9,1.5l0,0c-1.1,0.8-8.3,5.3-21.5,10.2
+	c-17.7,6-38.5,9.4-60.8,9.8C347.7,518,316.3,535.7,258.2,535.7z M171.4,504.4c8.7,4.9,37.4,18.5,86.4,18.5c28.3,0,53.2-4.5,77-13.6
+	l0,0c4.9-2.3,9.8-4.2,9.8-4.9V504c0-7.2-1.5-21.1-4.2-34.7c-3-17.7-6-24.9-8.3-27.9c-0.4,0-0.8-0.4-1.1-0.8
+	c-3.4-1.9-10.6-6.4-17.4-8.3c-1.5,0-11.3-2.6-20-7.2l-0.8-0.4c-2.3-1.1-4.9-2.6-7.5-4.9c-0.4-0.4-0.8-0.4-0.8-0.8l-0.4-0.4
+	c-0.8-0.8-1.9-1.5-2.6-2.6l-3-3.4c-0.4-0.4-0.4-0.8-0.4-1.5l-1.5-15.5c0-0.8,0-1.1,0.4-1.5l1.5-1.9c0,0,3.8-4.9,6.4-12.5l2.3-17.4
+	c0.4-2.3,0.8-10.6-0.4-18.9c-1.1-8.7-3.8-14.3-7.9-17l0,0h-0.4l-0.8-0.8c-1.5-1.5-7.9-5.7-20.4-6c-11.7,0.4-18.1,4.5-19.6,6
+	l-0.8,0.8l-0.4,0.4c-9.4,6-9.8,27.2-8.3,35.9l2.3,18.1c2.3,7.2,6,12.1,6,12.1l1.1,1.5c0.4,0.4,0.4,0.8,0.4,1.1l-0.8,15.5
+	c0,0.4-0.4,1.1-0.8,1.5l-3,3.4c-10.6,11.3-29.4,15.9-32.1,16.2c-6.4,1.9-14.3,6.4-17.4,8.3l-0.4,0.4
+	C176.7,450.8,172.5,487.8,171.4,504.4z M316.3,419.8c11.3,2.6,23,10.6,23.8,11.3l0.8,0.8c11.3,13.2,15.5,54.7,16.6,69.8
+	c17.4-0.8,33.2-3,47.6-7.5c10.9-3.4,18.1-6.8,21.5-8.7c-1.1-18.5-4.9-47.9-11.3-55.5c-2.3-1.9-9.1-5.7-15.9-7.2
+	c-2.3-0.4-18.9-4.9-27.9-14.3l-2.6-3c-0.4-0.4-0.4-0.8-0.4-1.1l-0.8-13.6c0-0.4,0-0.8,0.4-1.5l0.8-1.5l0.4,0.4l0.4-0.4l-0.4-0.4l0,0
+	c0,0,3.4-4.5,5.3-11.3l2.3-15.1c0.8-6.4,1.1-25.7-7.2-31l0,0h-0.4l-0.8-0.8c-1.1-1.5-6.8-4.9-17.4-5.3c-10.6,0.4-15.9,3.8-17,4.9
+	l-1.1,1.1l-0.4,0.4c-8.3,4.9-7.5,24.5-6.8,31l1.9,15.5c1.9,4.9,4.5,9.4,5.3,10.6l0,0l0,0l0.8,1.5c0.4,0.4,0.4,0.8,0.4,1.1l-0.8,13.2
+	c0,0.4,0,0.8-0.4,1.1l-2.6,3.4c-4.9,5.3-11.3,8.3-17.4,10.9C313.3,418.7,316.3,419.8,316.3,419.8z"/>
+<path d="M257.8,534c-59.6,0-91-18.5-96.6-22.3l0,0l-2.3-1.5c-0.4,0-0.4-0.4-0.4-0.8v-1.9l0,0v-0.4c1.1-18.1,4.9-62.3,16.6-74.4
+	l0.8-0.8h0.4c0,0,0.8-0.4,1.5-0.8c3.8-2.3,12.5-7.5,21.1-9.8c0.4,0,0.8-0.4,1.9-0.8c4.5-1.5,17-4.9,23-12.1l0.8-1.1l0.8-9.1
+	c-0.4-0.4-0.8-1.1-1.1-1.9c-1.5-3-4.2-7.5-6-12.8c-4.2-4.5-6-10.2-5.3-17.7v-5.7c0,0,0-0.4,0.4-0.4l0.8-0.8c0-0.8,0.8-1.1,1.1-1.5
+	c-0.4-9.4,0.4-31.3,13.6-40.4c1.1-1.1,8.3-8.3,27.9-9.4l0,0c6,0.4,20.8,1.9,28.3,9.4c12.1,8.3,14,26.4,13.6,40.4c0,0,0.4,0,0.4,0.4
+	c0.4,0.4,0.8,0.8,1.1,1.1l0.8,0.8l0.4,0.4v5.3c0.8,7.5-1.1,13.2-5.3,17.7c-1.9,6.4-4.9,12.1-7.2,14.7l0.4,9.1l1.1,1.1
+	c1.9,1.5,3.4,3,5.3,4.2l0,0h0.4c0.8-0.4,1.5-0.8,2.3-0.8c1.1-0.4,15.5-3.4,22.3-10.9l0.8-1.1l0.4-7.5c-1.5-2.6-4.2-7.2-6-13.2
+	c-1.9-1.5-5.7-5.7-4.9-15.5v-4.5c0,0,0-0.4,0.4-0.4l1.9-1.9c-0.4-4.5,0-11.3,1.1-17.7c1.9-8.3,5.3-14.3,10.6-17.7
+	c1.5-1.5,8.7-7.5,24.9-8.3l0,0c16.2,0.4,23.4,6.4,25.3,8.3c11.3,7.5,12.5,25.3,11.7,35.5c0.8,0.4,1.1,0.8,1.1,1.5l0.8,0.8l0.4,0.4
+	v4.9c0.4,9.8-3,14-4.9,15.5c-1.9,6-4.9,10.6-6,13.2l0.8,7.5l0.8,1.1c5.3,6,17,9.8,22.3,10.9l0,0c9.8,2.6,18.9,9.1,20,9.8l0.8,0.4
+	l0,0c6.8,7.9,11.7,29.4,14,63.8c0,0.8,0,1.1,0,1.5c0.4,0,0.4,0.4,0.4,0.8v2.3c0,0.4,0,0.4-0.4,0.4l-1.9,1.5
+	c-0.8,0.4-7.5,5.3-21.1,9.8c-17.7,6-38.1,9.4-60.4,9.8h-0.4C349.2,514.7,317.8,534,257.8,534z M169.5,504.9
+	c8.3,4.9,37.4,19.3,87.9,19.3c28.3,0,53.6-4.5,77.4-13.6l0,0c5.7-2.3,9.4-4.5,10.9-5.3v-1.5l0,0c-0.4-5.7-1.5-20.8-4.2-35.1
+	c-2.6-14.7-5.7-24.5-9.1-28.7c-0.4,0-0.8-0.4-1.1-0.8c-3.4-1.9-10.9-6.4-18.1-8.3c-1.5,0-10.9-2.6-19.6-7.2l-0.8-0.4
+	c-2.3-1.1-4.9-2.6-7.2-4.5c-0.4-0.4-0.8-0.8-1.1-1.1c-0.8-0.8-1.5-1.5-2.3-2.3l-3-3.4v-0.4l-1.5-15.5v-0.4l1.5-1.9
+	c0,0,3.8-5.3,6.4-12.8l2.3-17.7c0.4-2.3,0.8-10.6-0.4-19.2c-1.1-9.1-4.2-15.1-8.7-18.1l0,0l-0.8-0.8c-1.9-1.9-9.1-6-21.1-6.4
+	c-12.1,0.4-18.9,4.2-20.8,6.4l-0.8,0.8l0,0c-10.2,6.8-10.6,27.9-9.1,37.4l2.3,18.1c2.6,7.5,6.4,12.8,6.4,12.8l0,0l0.8,1.5v0.4
+	l-0.8,15.5v0.4l-3,3.4c-10.2,10.9-29.1,15.5-31,15.9c-7.2,1.9-15.1,6.8-18.1,8.7c-0.4,0-0.4,0.4-0.8,0.4
+	C174.8,450.2,170.3,488.3,169.5,504.9z M306.9,418.5c3.8,1.1,6.4,1.9,8.7,2.6c11.3,2.6,22.6,10.2,23,10.9l0.8,0.8l0,0
+	c11.7,13.6,15.5,59.3,16.2,70.2c17.7-0.4,34.3-3,49.1-7.5c12.1-3.8,19.6-7.5,22.6-9.4c-1.1-16.2-4.5-48.7-11.7-57
+	c-2.3-1.5-9.4-6-16.6-7.9c-1.9-0.4-18.5-4.5-27.2-14l-2.6-3v-0.4l-0.8-13.2v-0.4l0.8-1.5l0,0c0,0,3.4-4.9,5.7-11.7l2.3-15.5
+	c0.8-7.2,1.1-26.8-7.5-32.5l0,0l-0.8-0.8c-1.5-1.9-7.5-5.3-18.5-5.7c-10.6,0.4-16.6,3.8-18.1,5.7l-0.8,0.8l0,0
+	c-9.1,5.7-8.7,25.3-7.5,32.5l1.9,15.5c2.3,6.4,5.7,11.3,5.7,11.3l0,0l0.8,1.5v0.4l-0.8,13.2v0.4l-2.6,3
+	C322.4,412.5,314.1,415.8,306.9,418.5z"/>
 </svg>
diff --git a/src/img/icons/decrypted.svg b/src/img/icons/decrypted.svg
index b05ee22..6afaa8a 100644
--- a/src/img/icons/decrypted.svg
+++ b/src/img/icons/decrypted.svg
@@ -2,14 +2,14 @@
 <!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="-404.2 279.2 283.5 283.5" enable-background="new -404.2 279.2 283.5 283.5" xml:space="preserve">
+	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
 <g>
-	<g id="icomoon-ignore">
-		<line fill="none" stroke="#449FDB" x1="-404.2" y1="291.4" x2="-404.2" y2="291.4"/>
+	<g id="icomoon-ignore_1_">
+		<line fill="none" stroke="#449FDB" x1="155.9" y1="291.3" x2="155.9" y2="291.3"/>
 	</g>
-	<path d="M-120.8,368.3v30.3H-160v-30.3c0-20.7-16.3-37-36.3-37s-36.3,17-36.3,37v30.3h-39.2v-30.3c0-42.2,34-77,75.5-77
-		S-120.8,326.2-120.8,368.3z M-404.2,413.5v136.9h193.9V413.5H-404.2z M-326.5,534.1l5.9-49.6l1.5-10.4c-5.2-3.7-8.9-10.4-8.9-17.8
-		c0-3,0.7-5.2,1.5-8.1c3-8.1,10.4-13.3,19.2-13.3c8.9,0,16.3,5.2,19.2,13.3c0.7,2.2,1.5,5.2,1.5,8.1c0,7.4-3.7,14.1-8.9,17.8
-		l1.5,10.4l5.9,49.6C-288,534.1-326.5,534.1-326.5,534.1z"/>
+	<path d="M439.4,368.2v30.2h-39.3v-30.2c0-20.7-16.4-37.2-36.3-37.2c-19.9,0-36.3,16.9-36.3,37.2v30.2h-39.3v-30.2
+		c0-42.3,34.1-76.9,75.6-76.9S439.4,326.3,439.4,368.2z M155.9,413.6v137h194v-137H155.9z M233.7,534.2l6-49.7l1.3-10.4
+		c-5.2-3.9-9.1-10.4-9.1-17.7c0-3,0.9-5.2,1.3-8.2c3-8.2,10.4-13.4,19-13.4c9.1,0,16.4,5.2,19,13.4c0.9,2.2,1.3,5.2,1.3,8.2
+		c0,7.3-3.9,14.3-9.1,17.7l1.3,10.4l6,49.7C272.1,534.2,233.7,534.2,233.7,534.2z"/>
 </g>
 </svg>
diff --git a/src/img/icons/delete.svg b/src/img/icons/delete.svg
index 3db176a..919e45d 100644
--- a/src/img/icons/delete.svg
+++ b/src/img/icons/delete.svg
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
-<g id="icomoon-ignore">
-	<line fill="none" stroke="#449FDB" x1="297.6" y1="420.9" x2="297.6" y2="420.9"/>
-</g>
-<path d="M397.3,318.2c7.1,0,13.3,6.2,13.3,13.3v8.9c0,6.2-4.4,11.5-9.7,13.3v187.8c0,11.5-9.7,21.3-23,21.3H218.4
-	c-13.3,0-23.9-9.7-23.9-21.3V352.7c-5.3-0.9-9.7-7.1-9.7-12.4v-8.9c0-7.1,6.2-13.3,13.3-13.3h39v-15.9c0-13.3,9.7-23,21.3-23h77.1
-	c13.3,0,23,9.7,23,23v15.9H397.3L397.3,318.2z M371.6,537c1.8,0,2.7-1.8,2.7-2.7V352.7H221v180.7c0,1.8,1.8,2.7,2.7,2.7h147.9V537z
-	 M251.1,521.9c-7.1,0-13.3-6.2-13.3-13.3V380.2c0-7.1,6.2-11.5,13.3-11.5h2.7c7.1,0,13.3,6.2,13.3,11.5v129.3
-	c0,7.1-6.2,13.3-13.3,13.3h-2.7V521.9z M258.2,299.6c-1.8,0-2.7,0-2.7,2.7v15.9h84.2v-15.9c0-1.8-1.8-2.7-2.7-2.7H258.2z
-	 M296.3,521.9c-7.1,0-13.3-6.2-13.3-13.3V380.2c0-7.1,6.2-11.5,13.3-11.5h1.8c7.1,0,13.3,6.2,13.3,11.5v129.3
-	c0,7.1-6.2,13.3-13.3,13.3h-1.8V521.9z M340.6,521.9c-7.1,0-13.3-6.2-13.3-13.3V380.2c0-7.1,6.2-11.5,13.3-11.5h2.7
-	c7.1,0,13.3,6.2,13.3,11.5v129.3c0,7.1-6.2,13.3-13.3,13.3h-2.7V521.9z"/>
+<path fill="#0A0A0A" d="M214.6,562.9c-12.3,0-22.2-9.9-22.2-21.8V344.5c0-0.5-0.5-0.9-0.9-0.9c-3.8,0-8-2.8-8-10.9
+	c0-6.6,7.1-7.6,12.3-7.6H234c0.5,0,0.9-0.5,0.9-0.9v-23.6c0-5.7,2.4-11.3,6.6-15.1c4.3-4.3,9.9-6.1,16.1-6.1h79.9
+	c6.1,0,11.8,2.4,15.6,6.1c4.3,4.3,6.6,9.5,6.6,15.1v23.6c0,0.5,0.5,0.9,0.9,0.9h38.8c5.7,0,12.3,1.9,12.3,7.6c0,5.2-2.8,9.9-8,9.9
+	c-0.5,0-0.9,0.5-0.9,0.9v197.2c0,11.8-9.9,21.8-22.7,21.8L214.6,562.9L214.6,562.9z M212.3,337.9c-3.8,0-7.1,3.3-7.1,7.1v197.7
+	c0,2.4,3.8,7.6,6.6,7.6l172.6,1.4c2.4,0,6.1-4.3,6.1-6.6l-0.9-199.1c0-3.8-3.3-7.1-7.1-7.1L212.3,337.9z M253,291
+	c-2.4,0-4.3,1.4-4.3,3.8v29.3c0,0.5,0.5,0.9,0.9,0.9h95.5c0.5,0,0.9-0.5,0.9-0.9v-29.3c0-2.4-1.9-3.8-4.3-3.8H253z M346.1,514.2
+	c-1.4,0-2.4-0.5-3.3-1.4c-3.3-3.3-2.8-10.9-2.8-10.9V383.2l0,0c0,0-0.5-7.1,2.4-9.9c0.9-0.9,1.9-1.4,3.3-1.4c1.4,0,2.4,0.5,3.3,1.4
+	c2.8,3.3,2.8,9.9,2.8,9.9v118.2l0,0c0,0,0.5,7.6-2.8,10.9C348.5,513.8,347.5,514.2,346.1,514.2z M298.3,514.2
+	c-1.4,0-2.4-0.5-3.3-1.4c-3.3-3.3-2.8-10.9-2.8-10.9V383.2l0,0c0,0-0.5-7.1,2.4-9.9c0.9-0.9,1.9-1.4,3.3-1.4c1.4,0,2.4,0.5,3.3,1.4
+	c2.8,3.3,2.8,9.9,2.8,9.9v118.2l0,0c0,0,0.5,7.6-2.8,10.9C300.7,513.8,299.8,514.2,298.3,514.2z M251.1,514.2
+	c-1.4,0-2.4-0.5-3.3-1.4c-3.3-3.3-2.8-10.9-2.8-10.9V383.2l0,0c0,0-0.5-7.1,2.4-9.9c0.9-0.9,1.9-1.4,3.3-1.4s2.4,0.5,3.3,1.4
+	c2.8,3.3,2.8,9.9,2.8,9.9v118.2l0,0c0,0,0.5,7.6-2.8,10.9C253.4,513.8,252,514.2,251.1,514.2z"/>
 </svg>
diff --git a/src/img/icons/encrypted.svg b/src/img/icons/encrypted.svg
index 755eb9b..02d53c4 100644
--- a/src/img/icons/encrypted.svg
+++ b/src/img/icons/encrypted.svg
@@ -4,11 +4,10 @@
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
 <g>
-	<path fill="#1A171B" d="M329.1,369.1v30.8h-38.9v-30.8c0-21-16.2-37.2-37.2-37.2c-19.4,0-37.2,16.2-37.2,37.2v30.8H177v-30.8
-		c0-43.7,34-77.7,76.1-77.7S329.1,325.4,329.1,369.1z"/>
-	<line fill="none" x1="269.2" y1="398.3" x2="236.9" y2="398.3"/>
-	<path fill="#1A171B" d="M155.9,414.5v136h194.3v-136H155.9z M233.6,534.3l6.5-48.6l1.6-11.3c-4.9-3.2-9.7-9.7-9.7-17.8
-		c0-3.2,0-4.9,1.6-8.1c3.2-8.1,11.3-13,19.4-13c8.1,0,16.2,4.9,19.4,13c1.6,3.2,1.6,4.9,1.6,8.1c0,8.1-3.2,13-9.7,17.8l1.6,11.3
-		l6.5,48.6H233.6z"/>
+	<path fill="#1A171B" d="M380.8,364.3v33.5h-42.5v-33.5c0-23.1-18-40.6-40.6-40.6c-21.3,0-40.6,18-40.6,40.6v33.5h-42.5v-33.5
+		c0-47.7,37.3-85,83.1-85S380.8,316.5,380.8,364.3z"/>
+	<path fill="#1A171B" d="M191.3,413.9v148.8h212.6V413.9H191.3z M276.4,544.7l7.1-52.9l1.9-12.3c-5.2-3.3-10.4-10.4-10.4-19.4
+		c0-3.3,0-5.2,1.9-9c3.3-9,12.3-14.2,21.3-14.2c9,0,18,5.2,21.3,14.2c1.9,3.3,1.9,5.2,1.9,9c0,9-3.3,14.2-10.4,19.4l1.9,12.3
+		l7.1,52.9H276.4L276.4,544.7z"/>
 </g>
 </svg>
diff --git a/src/img/icons/forward_light.svg b/src/img/icons/forward_light.svg
index f9dabfe..313c7de 100644
--- a/src/img/icons/forward_light.svg
+++ b/src/img/icons/forward_light.svg
@@ -2,10 +2,7 @@
 <!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="-406.7 279.2 283.5 283.5" enable-background="new -406.7 279.2 283.5 283.5" xml:space="preserve">
-<g id="icomoon-ignore">
-	<line fill="none" stroke="#449FDB" x1="-265" y1="420.9" x2="-265" y2="420.9"/>
-</g>
-<path d="M-279.5,563.1v-75.8h-127.2V349.8l127.2-0.9v-70.2l128.2,117.9l28.1,27.1C-123.3,423.7-279.5,563.1-279.5,563.1z
-	 M-389.9,470.5h127.2v55.2l114.1-102l-15-15l-99.2-91.7v48.6l-127.2,0.9C-389.9,366.6-389.9,470.5-389.9,470.5z"/>
+	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
+<path d="M277.7,563.1v-62H162.7V351.5l115.1,0.4v-72.7l154.9,143.4L277.7,563.1z M179.1,484.7h115.1v41.5L408,422.6L294.1,317v51.4
+	L179.1,368V484.7z"/>
 </svg>
diff --git a/src/img/icons/key.svg b/src/img/icons/key.svg
index 93ac618..3c77697 100644
--- a/src/img/icons/key.svg
+++ b/src/img/icons/key.svg
@@ -3,16 +3,17 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Isolationsmodus" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
 	 y="0px" viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
-<path d="M213.3,562.7l-40.8-1c-2.4,0-4.8-1.9-5.3-4.8l-6.7-56.1c0-1.4,0.5-2.9,1.4-4.3c1-1,2.4-1.4,3.8-1.4h23.5v-22.5
-	c0-1.4,0.5-2.9,1.4-3.8c1-1,2.4-1.4,3.8-1.4h22.1v-22.1c0-1.4,0.5-2.9,1.4-3.8c1-1,2.4-1.4,3.8-1.4H244l-0.5-30.7
-	c0-1.4,0.5-2.9,1.4-3.8l20.6-20.6c-7.2-28.8,1.4-59.5,22.5-80.6c15.8-15.8,37.4-24.9,60.4-24.9s44.6,9.1,60.9,24.9
-	c33.6,33.6,33.6,87.8,0,121.3c-15.8,15.8-37.4,24.9-60.4,24.9c-6.7,0-13-1-19.2-1.9L217.2,561.2
-	C216.2,562.2,214.8,562.7,213.3,562.7L213.3,562.7z M185,551.2l26.4,1l113.2-113.2c1.4-1.4,3.4-1.9,5.3-1.4c6.2,1.4,13,2.4,19.7,2.4
-	c20.1,0,38.9-7.7,52.8-21.6c29.3-29.3,29.3-77.2,0-106.5c-14.4-14.4-33.1-22.1-53.2-22.1c-20.1,0-38.9,7.7-53.2,22.1
-	c-18.7,18.7-26.4,47-18.7,73.4c0.5,1.9,0,3.8-1.4,5.3l-21.1,21.1l0.5,33.6c0,1.4-0.5,2.9-1.4,3.8c-1,1-2.4,1.4-3.8,1.4h-22.1v22.1
-	c0,1.4-0.5,2.9-1.4,3.8c-1,1-2.4,1.4-3.8,1.4h-22.1v22.5c0,1.4-0.5,2.9-1.4,3.8c-1,1-2.4,1.4-3.8,1.4h-22.5l4.8,39.3l103.1-104.1
-	c1.9-1.9,5.3-1.9,7.7,0c1.9,1.9,1.9,5.3,0,7.7L185,551.2L185,551.2z M370.7,370.8c-7.2,0-14.4-2.9-19.7-8.2c-11-11-11-28.3,0-39.3
-	c5.3-5.3,12-8.2,19.7-8.2c7.2,0,14.4,2.9,19.7,8.2s8.2,12,8.2,19.7s-2.9,14.4-8.2,19.7C385.1,367.9,377.9,370.8,370.7,370.8
-	L370.7,370.8z M370.7,325.7c-4.8,0-9.1,1.9-12,4.8c-6.7,6.7-6.7,17.7,0,24.5c3.4,3.4,7.7,4.8,12,4.8c4.8,0,9.1-1.9,12-4.8
-	c3.4-3.4,4.8-7.7,4.8-12c0-4.8-1.9-9.1-4.8-12C379.3,327.7,375,325.7,370.7,325.7L370.7,325.7z"/>
+<path fill="#1A171B" d="M212.5,561.6l-40.3-0.9c-2.3,0-4.7-1.9-5.2-4.7l-6.6-55.7c0-1.4,0.5-2.8,1.4-4.2c0.9-0.9,2.3-1.4,3.7-1.4
+	h23.4v-22.5c0-1.4,0.5-2.8,1.4-3.7c0.9-0.9,2.3-1.4,3.7-1.4h22v-22c0-1.4,0.5-2.8,1.4-3.7c0.9-0.9,2.3-1.4,3.7-1.4h22l-0.5-30.4
+	c0-1.4,0.5-2.8,1.4-3.7L265,385c-7-28.6,1.4-59,22.5-80.1c15.5-15.5,37-24.8,59.9-24.8s44,8.9,60.4,24.8
+	c33.2,33.2,33.2,87.1,0,120.3c-15.5,15.5-37,24.8-59.9,24.8c-6.6,0-13.1-0.9-19.2-1.9L217.2,559.7
+	C215.3,561.1,213.9,561.6,212.5,561.6L212.5,561.6z M184.4,550.3l26.2,0.9L323,438.9c1.4-1.4,3.3-1.9,5.2-1.4
+	c6.1,1.4,13.1,2.3,19.7,2.3c20.1,0,38.4-7.5,52.4-21.5c29-29,29-76.8,0-105.8c-14-14-32.8-22-52.9-22s-38.4,7.5-52.9,22
+	c-18.7,18.7-26.2,46.8-18.7,72.6c0.5,1.9,0,3.7-1.4,5.2l-21.1,21.1l0.5,33.2c0,1.4-0.5,2.8-1.4,3.7c-0.9,0.9-2.3,1.4-3.7,1.4H227v22
+	c0,1.4-0.5,2.8-1.4,3.7c-0.9,0.9-2.3,1.4-3.7,1.4h-22v22.5c0,1.4-0.5,2.8-1.4,3.7c-0.9,0.9-2.3,1.4-3.7,1.4h-22.5l4.7,38.9
+	L279,439.8c1.9-1.9,5.2-1.9,7.5,0c1.9,1.9,1.9,5.2,0,7.5L184.4,550.3L184.4,550.3z M368.5,371.4c-7,0-14-2.8-19.7-8
+	c-10.8-10.8-10.8-28.1,0-38.9c5.2-5.2,11.7-8,19.7-8c7,0,14,2.8,19.7,8c5.2,5.2,8,11.7,8,19.7s-2.8,14-8,19.7
+	C383,368.2,376,371.4,368.5,371.4L368.5,371.4z M368.5,326.5c-4.7,0-8.9,1.9-11.7,4.7c-6.6,6.6-6.6,17.3,0,24.4
+	c3.3,3.3,7.5,4.7,11.7,4.7c4.7,0,8.9-1.9,11.7-4.7c3.3-3.3,4.7-7.5,4.7-11.7c0-4.7-1.9-8.9-4.7-11.7
+	C377.4,328.3,373.1,326.5,368.5,326.5L368.5,326.5z"/>
 </svg>
diff --git a/src/img/icons/logout.svg b/src/img/icons/logout.svg
new file mode 100644
index 0000000..b2d957c
--- /dev/null
+++ b/src/img/icons/logout.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<g>
+				<path fill="#010202" d="M314.4,475.6c0,0,0,32.4,0,48.7c-13.7,0-27,0-40.7,0c0,4.9,0,9.6,0,14.3c0.9,0.1,1.7,0,2.4,0
+					c16.4,0,32.9-0.1,49.3,0c2.4,0-2.2,0,3,0c-0.1-19,0-62.9,0-62.9H314.4z"/>
+				<path fill="#010202" d="M314.4,366.8c0,0,0-32.4,0-48.7c-13.7,0-27,0-40.7,0c0-4.9,0-9.6,0-14.3c0.9-0.1,1.7,0,2.4,0
+					c16.4,0,32.9,0.1,49.3,0c2.4,0-2.2,0,3,0c-0.1,19,0,62.9,0,62.9H314.4z"/>
+			</g>
+			<polygon fill="#010202" points="345.1,491.6 345.1,458.8 274.7,458.8 274.7,383.2 345.1,383.4 345.1,346.2 424.3,419.7 			"/>
+		</g>
+	</g>
+	<path fill="#010202" d="M248.7,298.4V542L185,518V315.5L248.7,298.4 M262.8,280L171,304.7v223.1l91.8,34.5V280L262.8,280z"/>
+</g>
+</svg>
diff --git a/src/img/icons/outbox.svg b/src/img/icons/outbox.svg
new file mode 100644
index 0000000..f1b4e24
--- /dev/null
+++ b/src/img/icons/outbox.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
+<g>
+	<path fill="#010202" d="M420.8,471.1l-21.2-83.7l-10.6,8.5l19,73.6h-62.6c-2.8,0-5.3,2.9-6.1,6.2c-2.4,20.2-19.6,35.8-40,35.8
+		c-20.5,0-37.6-15-40-35.2c-0.6-3.1-3-5.2-5.9-5.2l-62.4,0.2L221,350.4c1.2-4.7,6.7-9.1,10.7-9.1h42c4-4,7.7-8.1,12.9-12.1h-55
+		c-10.3,0-20.6,8.3-22.9,18.3L178,470.6l-1.7,75.3c0,9.8,7.8,16.4,19.4,16.4h208.1c10,0,17.6-6.8,17.6-16.7L420.8,471.1z
+		 M409.5,546.7c0,3.4-2.2,4.5-5.6,4.5h-209c-3.4,0-6.3-1.8-6.3-5.2v-63l59.2-0.1c2.5,11.4,9.5,21.7,18.7,29.1
+		c9.3,7.6,21,11.6,33,11.6c11.7,0,23.3-4.1,32.7-11.6c9.3-7.5,15.9-17.8,18.4-29l59-0.2V546.7L409.5,546.7z"/>
+	<g>
+		<path fill="#010202" d="M438.4,348.6l-40.2,33.9l-10.6,8.9l-25.5,21.5l1.5-35.6c-5-1.5-16.2-3.5-29-3.5
+			c-26.3,0-60.9,8.6-76.2,51.3l-8.1,23.5c0,0,0-24.9,0.1-25c0-0.4-0.7-47.8,31.2-80.3c4-4.2,8.7-8.1,13.9-11.6
+			c8.7-5.9,19-10.7,31.2-13.9c0,0,25.6-5,39.9-4.5l1.5-33.9L438.4,348.6z"/>
+	</g>
+</g>
+</svg>
diff --git a/src/img/icons/reply.svg b/src/img/icons/reply.svg
index b90e31f..d96b3da 100644
--- a/src/img/icons/reply.svg
+++ b/src/img/icons/reply.svg
@@ -2,10 +2,12 @@
 <!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="-398.7 279.2 283.5 283.5" enable-background="new -398.7 279.2 283.5 283.5" xml:space="preserve">
-<g id="icomoon-ignore">
-	<line fill="none" stroke="#449FDB" x1="-257" y1="420.9" x2="-257" y2="420.9"/>
+	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
+<g id="icomoon-ignore_3_">
+	<line fill="none" stroke="#449FDB" x1="297.6" y1="420.9" x2="297.6" y2="420.9"/>
+</g>
+<g>
+	<path d="M439.4,548.4L427,513c-23-64.4-75-77.2-114.7-77.2c-19.2,0-35.8,3-43.5,5.5l2.1,53.7l-115.1-97.2l105.7-104.4l2.1,51.2
+		c21.3-0.9,60.1,6.8,60.1,6.8C441.1,382.2,438.9,510,438.9,510.9C439.4,510.5,439.4,548.4,439.4,548.4z"/>
 </g>
-<path d="M-398.7,397.3l101.4-93v47.2c195.8,0,181.9,186.1,181.9,186.1c-38.9-129.1-181.9-91.6-181.9-91.6v47.2
-	C-297.4,493.1-398.7,397.3-398.7,397.3z"/>
 </svg>
diff --git a/src/img/icons/reply_all_light.svg b/src/img/icons/reply_all_light.svg
index 2ecba10..f8692e0 100644
--- a/src/img/icons/reply_all_light.svg
+++ b/src/img/icons/reply_all_light.svg
@@ -2,13 +2,14 @@
 <!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="-396.7 279.2 283.5 283.5" enable-background="new -396.7 279.2 283.5 283.5" xml:space="preserve">
-<g id="icomoon-ignore">
-	<line fill="none" stroke="#449FDB" x1="-255" y1="420.9" x2="-255" y2="420.9"/>
+	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
+<g>
+	<path d="M243.9,444.2l-10.6-8.4v17.6l-60.5-51l60.2-59.5v21.5l10.9-10.2v-38l-88,86.5l88,73.9L243.9,444.2L243.9,444.2z"/>
+	<g>
+		<path d="M439.1,495.2c0-0.7,1.8-106.2-95-131.6c0,0-32-6.3-49.6-5.6l-1.8-42.2l-87.2,86.2l94.6,80.2l-1.8-44.3
+			c6.3-1.8,20.1-4.6,35.9-4.6c32.7,0,75.6,10.6,94.6,63.7l10.2,29.2C439.5,526.5,439.5,495.2,439.1,495.2z M334.6,422
+			c-23.9,0-42.9,5.6-42.9,5.6l-4.6,1.4l1.4,26.4l-65.8-55.6l60.2-58l1.4,29.2h5.6c19,0,33.1,0.4,48.5,3.5l0,0
+			c58,14.4,81.3,60.2,87.2,91.1C401.5,430.8,364.2,422,334.6,422z"/>
+	</g>
 </g>
-<path d="M-113.3,528.2l-10.3-29.6c-19.3-54-63-64.9-96.4-64.9c-16.1,0-30.2,2.6-36.6,4.5l1.9,45l-96.4-81.6l88.7-88.1l1.9,42.4
-	c18-0.6,34.1,1.3,48.8,5.1h1.3l0.6,0.6c98.3,25.7,96.4,134.3,96.4,135C-113.3,496.7-113.3,528.2-113.3,528.2z M-220,422.2
-	c30.2,0,68.1,8.4,92.6,43.7c-6.4-31.5-26.4-78.4-85.5-93.2l-1.3-0.6c-14.8-3.9-32.1-5.1-51.4-4.5h-5.8l-1.3-28.3l-61.1,60.4
-	l66.8,56.6l-1.3-27l4.5-1.3C-263.7,428-244.4,422.2-220,422.2L-220,422.2z M-299.7,482.6l-97.1-81.6l88.7-87.4l2.6,36l-11.6,1.3
-	l-1.3-10.9l-61.1,60.4l66.2,55.9l-0.6-10.3l11.6-1.3L-299.7,482.6z"/>
 </svg>
diff --git a/src/img/icons/reply_light.svg b/src/img/icons/reply_light.svg
index 2a36d7b..5e2ba08 100644
--- a/src/img/icons/reply_light.svg
+++ b/src/img/icons/reply_light.svg
@@ -2,12 +2,11 @@
 <!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="-404.7 279.2 283.5 283.5" enable-background="new -404.7 279.2 283.5 283.5" xml:space="preserve">
-<g id="icomoon-ignore">
-	<line fill="none" stroke="#449FDB" x1="-263" y1="420.9" x2="-263" y2="420.9"/>
+	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
+<g>
+	<path d="M439.4,511c0-0.9,2.1-128.9-115.3-159.7c0,0-38.8-7.7-60.2-6.8l-2.1-51.2L155.9,397.9l114.8,97.3l-2.1-53.8
+		c7.7-2.1,24.3-5.5,43.5-5.5c39.7,0,91.8,12.8,114.8,77.3l12.4,35.4C439.4,549,439.4,511,439.4,511z M312.2,422.2
+		c-29,0-52.1,6.8-52.1,6.8l-5.5,1.7l1.7,32l-79.8-67.5l73-70.4l1.7,35.4h6.8c23.1,0,40.1,0.4,58.9,4.3l0,0
+		c70.4,17.5,98.6,73,105.9,110.6C393.3,432.9,348,422.2,312.2,422.2z"/>
 </g>
-<path d="M-124.5,554.5l-10.7-35C-156.5,449.4-212.8,435-257,435c-16,0-28.9,2.3-35.8,3v54.1l-111.9-104.3l111.9-100.5V339
-	c55.6,1.5,98.2,18.3,127.9,50.3c48.7,52.5,43.4,125.7,43.4,128.7L-124.5,554.5L-124.5,554.5z M-256.2,420.5
-	c32.7,0,87.6,8.4,118.8,58.6c-3.8-24.4-13.7-55.6-37.3-81.5c-28.2-30.5-70.1-45.7-124.1-45.7h-6.8v-34.3l-78.4,70.1l78.4,72.3v-33.5
-	l5.3-1.5C-300.4,425.1-282.1,420.5-256.2,420.5L-256.2,420.5z"/>
 </svg>
diff --git a/src/img/icons/search.svg b/src/img/icons/search.svg
index 0af1c22..e4147b4 100644
--- a/src/img/icons/search.svg
+++ b/src/img/icons/search.svg
@@ -2,12 +2,17 @@
 <!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="-406.7 279.2 283.5 283.5" enable-background="new -406.7 279.2 283.5 283.5" xml:space="preserve">
-<g id="icomoon-ignore">
-	<line fill="none" stroke="#449FDB" x1="-265" y1="420.9" x2="-265" y2="420.9"/>
+	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
+<g>
+	<g>
+		<path d="M264.3,493.4c-45.4,0-86.1-28.7-101.9-71.3c-15.8-42.1-2.4-91.8,32.5-121c19.6-16.3,44-25.3,69.3-25.3
+			c45.4,0,86.1,28.7,101.9,71.3c15.8,42.1,2.4,91.8-32.5,121C314.1,484.8,289.2,493.4,264.3,493.4z M264.3,295.4
+			c-37.3,0-71.7,24.4-84.2,59.3c-12.4,35.4-1.4,75.1,27.7,99.5c15.8,12.9,35.9,20.1,56.9,20.1c16.3,0,32-4.3,45.9-12.9
+			c32-19.6,48.8-57.4,41.6-93.7C343.7,326.5,305.9,295.4,264.3,295.4z"/>
+	</g>
+	<g>
+		<path d="M427.4,566.1c-1,0-2.4-0.5-2.9-1.4l-85.6-85.6c-1.4-1.9-1.4-4.3,0-5.7l7.7-7.7c1-1,1.9-1.4,2.9-1.4c1,0,1.9,0.5,2.9,1
+			l85.6,85.6c1,1,1.4,1.9,1.4,2.9s-0.5,2.4-1.4,2.9l-7.2,7.2C429.8,566.1,428.9,566.1,427.4,566.1z"/>
+	</g>
 </g>
-<path d="M-125.5,517.3l-62.6-63.4c10.2-17.8,15.5-37.6,15.5-57.5c0-64.7-52.6-117.3-117.1-117.3s-117.1,52.6-117.1,117.3
-	s52.6,117.3,117.1,117.3c20.6,0,41-5.7,59.1-16.5l62.3,63.2c1.4,1.4,3.4,2.3,5.4,2.3c2,0,4-0.8,5.4-2.3l32-32.3
-	C-122.5,525-122.5,520.3-125.5,517.3L-125.5,517.3z M-289.7,324.8c39.4,0,71.5,32.1,71.5,71.6s-32,71.6-71.5,71.6
-	s-71.5-32.1-71.5-71.6S-329.1,324.8-289.7,324.8L-289.7,324.8z"/>
 </svg>
diff --git a/src/img/icons/sent.svg b/src/img/icons/sent.svg
index 03c10c2..63c02c7 100644
--- a/src/img/icons/sent.svg
+++ b/src/img/icons/sent.svg
@@ -5,12 +5,8 @@
 	 x="0px" y="0px" viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
 <g>
 	<g>
-		<path fill="#535353" d="M439.4,279.2L329.6,562.7l-57.2-116.6l-116.6-57.2L439.4,279.2z M328.5,535.2l91.4-235.5l-235.5,91.4
-			l96,48L328.5,535.2z"/>
-	</g>
-	<g>
-		
-			<rect x="248.4" y="365.7" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 861.3253 386.0935)" fill="#535353" width="204.6" height="11.4"/>
+		<path fill="#1A171B" d="M155.9,388.8L272.6,446l57.2,116.7l109.6-283.5L155.9,388.8z M186.6,390.7l217.8-84.6l-129,129
+			L186.6,390.7z M329.3,532.9l-44.9-89.3l129.4-129.4L329.3,532.9z"/>
 	</g>
 </g>
 </svg>
diff --git a/src/img/icons/star.svg b/src/img/icons/star.svg
index 17a30a3..54e7a53 100644
--- a/src/img/icons/star.svg
+++ b/src/img/icons/star.svg
@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
-<path fill="#1A171B" d="M383.6,555.1l-87.5-45.2l-87.4,45.2l16.6-96.5l-69.4-69.4l98-13.5l43.7-89l43.7,89l98,13.5L367,458.6
-	L383.6,555.1z M181.5,398.3l57.3,55.8L225.3,534l70.8-37.7L367,534l-13.5-79.9l58.8-55.8l-79.9-12.1l-34.7-72.4l-36.2,72.4
-	L181.5,398.3z"/>
+<path fill="#1A171B" d="M383.5,555.1l-87.6-45.2l-87.2,45.2l16.5-96.6l-69.3-69.3l97.9-13.4l43.8-89l43.8,89l97.9,13.4l-72.4,69.3
+	L383.5,555.1z M181.4,398.6l57.2,55.9l-13.4,80l70.6-37.6l70.6,37.6l-13.4-80l58.6-55.9l-80-12.1l-34.9-72.4l-36.2,72.4L181.4,398.6
+	z"/>
 </svg>
diff --git a/src/img/icons/star_filled.svg b/src/img/icons/star_filled.svg
index 99a3ccb..ce57cf4 100644
--- a/src/img/icons/star_filled.svg
+++ b/src/img/icons/star_filled.svg
@@ -3,6 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
-<path fill="#1A171B" d="M383.6,555.1l-87.5-45.2l-87.4,45.2l16.6-96.5l-69.4-69.4l98-13.5l43.7-89l43.7,89l98,13.5L367,458.6
-	L383.6,555.1z"/>
+<path fill="#1A171B" d="M383,555.1l-87.2-45.2l-87.2,45.2l16.5-96.6l-69.3-69.3l97.9-13.4l43.8-89l43.8,89l97.9,13.4l-72.9,69.3
+	L383,555.1z"/>
 </svg>
diff --git a/src/img/icons/trash.svg b/src/img/icons/trash.svg
deleted file mode 100644
index 1247d1f..0000000
--- a/src/img/icons/trash.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
-<g>
-	<path fill="#0A0A0A" d="M398.1,318.5c7.3,0,11.4,5.6,11.4,12.5v9.2c0,5.8-3.3,11.4-8.6,12.5v187.9c0,12.3-10.3,22-22.9,22H217.5
-		c-12.5,0-22.6-9.8-22.6-22V353c-5.5-1.1-9.2-6.6-9.2-12.8v-9.2c0-7,4.7-12.5,12-12.5h38.7v-16.7c0-12.3,9.8-22.6,22.6-22.6h77.5
-		c12.5,0,22.6,10.3,22.6,22.6v16.7H398.1z M382.7,548.9c1.7,0,3.5-3.4,3.5-5.3v-210H209.5v210.2c0,1.9,1.4,4.9,3.6,4.9L382.7,548.9z
-		 M254,522.3c-4.4,0-8.1-5.8-8.1-13.1V380.4c0-6.7,3.6-12.3,8.1-12.3h1.4c4.2,0,7.8,5.6,7.8,12.3v128.8c0,7-3.6,13.1-7.8,13.1H254z
-		 M259.1,294.7c-1.9,0-3.1,1.1-3.1,2.8v21.3h83.9v-21.3c0-1.7-1.1-2.8-3.1-2.8C336.8,294.7,259.1,294.7,259.1,294.7z M297.2,522.8
-		c-4.4,0-8.1-5.8-8.1-13.1V381c0-6.7,3.6-12.3,8.1-12.3h1.1c4.4,0,8.1,5.6,8.1,12.3v128.8c0,7-3.6,13.1-8.1,13.1H297.2z
-		 M342.1,522.8c-4.4,0-7.8-5.8-7.8-13.1V381c0-6.7,3.3-12.3,7.8-12.3h1.1c4.4,0,8.1,5.6,8.1,12.3v128.8c0,7-3.6,13.1-8.1,13.1H342.1
-		z"/>
-</g>
-</svg>
diff --git a/src/img/icons/write.svg b/src/img/icons/write.svg
index c56688c..da90184 100644
--- a/src/img/icons/write.svg
+++ b/src/img/icons/write.svg
@@ -3,11 +3,12 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="155.9 279.2 283.5 283.5" enable-background="new 155.9 279.2 283.5 283.5" xml:space="preserve">
-<g id="icomoon-ignore">
-	<line fill="none" stroke="#449FDB" x1="316.7" y1="420.9" x2="316.7" y2="420.9"/>
+<g>
+	<polygon points="316.6,462.8 288.9,435.1 278.6,473.1 	"/>
+	<polygon points="325.8,453.6 416.3,363.1 388.6,335.4 298.1,424.5 	"/>
+	<rect x="409.5" y="312.8" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 950.0844 272.8144)" width="18.1" height="40.8"/>
+	<path d="M386.1,430.2l12.8-12.4v78.8c0,16.3-12.8,28.8-27.7,28.8H214.7c-16.3,0-27.7-12.8-27.7-28.8V341.4
+		c0-16.3,12.8-28.8,27.7-28.8h158.7l-12.8,12.8H213.3c-5.7,0-13.5,7.8-13.5,13.5v159c0,5.7,7.8,13.5,13.5,13.5h159
+		c5.7,0,13.5-7.8,13.5-13.5v-67.8H386.1z"/>
 </g>
-<path d="M374.1,445.7l25.9-25.9v76.5c0,15.8-12.4,28.1-27,28.1H221c-15.8,0-27-12.4-27-28.1V345.6c0-15.7,12.4-28.1,27-28.1h154.1
-	l-25.9,25.9H230c-5.6,0-10.1,4.5-10.1,10.1v133.9c0,5.6,4.5,10.1,10.1,10.1H364c5.6,0,10.1-4.5,10.1-10.1V445.7z M320,463.7l-27-27
-	l-10.1,37.1L320,463.7L320,463.7z M329,454.7l87.8-87.8l-27-27l-87.7,86.6L329,454.7L329,454.7z M427,358l12.4-12.4l-28.1-28.1
-	l-12.4,12.4L427,358z"/>
 </svg>
diff --git a/src/sass/blocks/basics/_form.scss b/src/sass/blocks/basics/_form.scss
index d055a8e..9ac68e3 100644
--- a/src/sass/blocks/basics/_form.scss
+++ b/src/sass/blocks/basics/_form.scss
@@ -186,7 +186,7 @@
         fill: $color-text-light;
         top: 0.7em;
         height: 1em;
-        width: 1em;
+        width: 0.8em;
     }
 }
 
diff --git a/src/tpl/nav.html b/src/tpl/nav.html
index 575ee37..f6d720a 100644
--- a/src/tpl/nav.html
+++ b/src/tpl/nav.html
@@ -11,9 +11,9 @@
         <svg role="presentation">
           <use ng-if="folder.type === 'Inbox'" xlink:href="#icon-inbox" />
           <use ng-if="folder.type === 'Sent'" xlink:href="#icon-sent" />
-          <use ng-if="folder.type === 'Outbox'" xlink:href="#icon-inbox" />
+          <use ng-if="folder.type === 'Outbox'" xlink:href="#icon-outbox" />
           <use ng-if="folder.type === 'Drafts'" xlink:href="#icon-draft" />
-          <use ng-if="folder.type === 'Trash'" xlink:href="#icon-trash" />
+          <use ng-if="folder.type === 'Trash'" xlink:href="#icon-delete" />
           <use ng-if="folder.type === 'Flagged'" xlink:href="#icon-star" />
         </svg>
         {{folder.type}}
@@ -64,7 +64,7 @@
     </li>
     <li>
       <a href="#" wo-touch="$event.preventDefault(); logout()">
-        <svg role="presentation"><use xlink:href="#icon-account" /></svg> Logout
+        <svg role="presentation"><use xlink:href="#icon-logout" /></svg> Logout
       </a>
     </li>
   </ul><!--/nav__secondary-->
diff --git a/src/tpl/read.html b/src/tpl/read.html
index f96549a..3b64e3f 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -26,7 +26,7 @@
           <svg><use xlink:href="#icon-folder" /><title>Move mail</title></svg>
         </button>
         <button wo-touch="deleteMessage(state.mailList.selected)" class="btn-icon-light" title="Delete mail">
-          <svg><use xlink:href="#icon-trash" /><title>Delete mail</title></svg>
+          <svg><use xlink:href="#icon-delete" /><title>Delete mail</title></svg>
         </button>
         <button class="btn-icon-light" title="Reply to" wo-dropdown="#read-reply-selection" wo-dropdown-position="center">
           <svg><use xlink:href="#icon-reply_light" /><title>Reply to</title></svg>
@@ -144,7 +144,7 @@
         </li>
         <li>
           <button wo-touch="deleteMessage(state.mailList.selected)" class="btn-icon-light" title="Delete mail">
-            <svg><use xlink:href="#icon-trash" /><title>Delete mail</title></svg>
+            <svg><use xlink:href="#icon-delete" /><title>Delete mail</title></svg>
           </button>
         </li>
         <li>