diff --git a/src/assets/backgrounds/category-albums.jpg b/src/assets/backgrounds/browse-albums.jpg
similarity index 100%
rename from src/assets/backgrounds/category-albums.jpg
rename to src/assets/backgrounds/browse-albums.jpg
diff --git a/src/assets/backgrounds/category-artists.jpg b/src/assets/backgrounds/browse-artists.jpg
similarity index 100%
rename from src/assets/backgrounds/category-artists.jpg
rename to src/assets/backgrounds/browse-artists.jpg
diff --git a/src/assets/backgrounds/category-folders.jpg b/src/assets/backgrounds/browse-folders.jpg
similarity index 100%
rename from src/assets/backgrounds/category-folders.jpg
rename to src/assets/backgrounds/browse-folders.jpg
diff --git a/src/assets/backgrounds/browse-spotify.jpg b/src/assets/backgrounds/browse-spotify.jpg
new file mode 100755
index 00000000..34e82952
Binary files /dev/null and b/src/assets/backgrounds/browse-spotify.jpg differ
diff --git a/src/assets/backgrounds/browse-tunigo.jpg b/src/assets/backgrounds/browse-tunigo.jpg
new file mode 100755
index 00000000..3ed2b4df
Binary files /dev/null and b/src/assets/backgrounds/browse-tunigo.jpg differ
diff --git a/src/assets/icons/cog.svg b/src/assets/icons/cog.svg
index d96ed6a0..dee3ede5 100755
--- a/src/assets/icons/cog.svg
+++ b/src/assets/icons/cog.svg
@@ -2,119 +2,8 @@
 <!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{fill:#FFFFFF;}
-	.st3{display:inline;fill:#FFFFFF;}
-	.st4{display:none;fill:#FFFFFF;}
-	.st5{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st6{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st7{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st8{display:inline;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st9{display:inline;fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-	.st10{display:inline;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st11{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st12{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st13{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st14{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-	.st15{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-</style>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M3.9,3.2L11,7.9l-7.2,4.7V3.2 M2.5,0.5v14.8l11.1-7.4L2.5,0.5L2.5,0.5z"/>
-	</g>
-</g>
-<g class="st0">
-	<path class="st3" d="M8,2.1c3.2,0,5.8,2.6,5.8,5.8c0,3.2-2.6,5.8-5.8,5.8c-3.2,0-5.8-2.6-5.8-5.8C2.2,4.7,4.8,2.1,8,2.1 M8,0.7
-		c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7L8,0.7z"/>
-</g>
-<path class="st4" d="M6.5,6.4l-2.1,5.1l5.1-2.1l2.1-5.1L6.5,6.4z M8,8.8c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-	c0.5,0,0.8,0.4,0.8,0.8C8.9,8.4,8.5,8.8,8,8.8z"/>
-<g class="st0">
-	<circle class="st5" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st6" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st6" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st6" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st6" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
-<g class="st0">
-	<circle class="st5" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st5" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st6" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
 <path d="M15.3,9.2V6.7l-2-0.4C13.1,6,13,5.8,12.9,5.5L14,3.8L12.3,2l-1.7,1.1C10.3,3,10.1,2.9,9.8,2.8l-0.4-2H6.9l-0.4,2
 	C6.2,2.9,6,3,5.7,3.2L4,2L2.2,3.8l1.2,1.7C3.3,5.8,3.2,6,3.1,6.3L1,6.7v2.5l2,0.4c0.1,0.3,0.2,0.5,0.3,0.8l-1.2,1.7L4,13.8l1.7-1.2
-	C6,12.8,6.2,12.9,6.5,13L6.9,15h2.5L9.8,13c0.3-0.1,0.5-0.2,0.8-0.3l1.7,1.2l1.7-1.7l-1.2-1.7c0.1-0.3,0.2-0.5,0.3-0.8L15.3,9.2z
-	 M8.1,9.9c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2C10.1,9,9.2,9.9,8.1,9.9z"/>
-<g class="st0">
-	<g class="st1">
-		<path class="st7" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
-			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
-	</g>
-	<rect x="2.7" y="2.3" class="st8" width="4.9" height="2.6"/>
-</g>
-<path class="st0" d="M1.5,4.1c0,0,4.3-3.9,8.4-1.4c4.1,2.4,5.4,5.6,3.6,7.9C11.4,7.4,10.3,5.8,6,4.5c0,0,6.8,4.3,8,9.3
-	c-0.2,1.1-1.2,0.3-1.2,0.3l-1.1-1.8c0,0-2.1,1.6-4.6-0.5C2.9,8.1,6.2,4,1.5,4.1z"/>
-<path class="st0" d="M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4L1.2,5.8C0.8,5.9,0.7,6,0.7,6.2c0,0.1,0.1,0.3,0.2,0.4l3.2,3.1l-0.8,4.4
-	c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1
-	c0.1,0,0.2,0,0.3-0.1s0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2l-0.8-4.4l3.2-3.1c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.4-0.6
-	l-2-4C8.3,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-<g class="st0">
-	<circle class="st9" cx="8" cy="8" r="6.6"/>
-	<circle class="st1" cx="8" cy="8" r="0.8"/>
-	<circle class="st9" cx="8" cy="8" r="2.1"/>
-	<path class="st1" d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8
-		c0,0.8,0.2,1.6,0.4,2.4l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
-	<path class="st1" d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14
-		C6.1,14.4,7,14.6,8,14.6c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
-</g>
-<g class="st0">
-	<rect x="2" y="1.9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="9" class="st1" width="5" height="5"/>
-	<rect x="2" y="9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
-</g>
-<g class="st0">
-	<circle class="st1" cx="6.1" cy="6.2" r="5.3"/>
-	<line class="st10" x1="9.1" y1="8.8" x2="14.5" y2="14.2"/>
-</g>
-<polyline class="st11" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st11" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st12" width="2.3" height="2.3"/>
-	<line class="st13" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st13" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st13" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st13" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st13" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st13" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st12" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st12" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st12" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st12" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st12" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st14" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st14" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st14" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-		<path class="st15" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-	</g>
-	<g class="st1">
-		<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
-			c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-		<path class="st15" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0
-			c-0.7,0.7-1,2.1-1,2.1c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-	</g>
-</g>
+	C6,12.8,6.2,12.9,6.5,13l0.4,2h2.5l0.4-2c0.3-0.1,0.5-0.2,0.8-0.3l1.7,1.2l1.7-1.7l-1.2-1.7c0.1-0.3,0.2-0.5,0.3-0.8L15.3,9.2z
+	 M8.1,9.9c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2S9.2,9.9,8.1,9.9z"/>
 </svg>
diff --git a/src/assets/icons/compass.svg b/src/assets/icons/compass.svg
index 52697132..390b091c 100755
--- a/src/assets/icons/compass.svg
+++ b/src/assets/icons/compass.svg
@@ -2,115 +2,9 @@
 <!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{fill:#FFFFFF;}
-	.st3{display:inline;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st4{display:inline;fill:none;stroke:#000000;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st5{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st6{display:inline;fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-	.st7{display:inline;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st8{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st9{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st10{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st11{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-	.st12{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-</style>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M3.9,3.2L11,7.9l-7.2,4.7V3.2 M2.5,0.5v14.8l11.1-7.4L2.5,0.5L2.5,0.5z"/>
-	</g>
-</g>
 <g>
-	<circle cx="8" cy="7.9" r="1"/>
-	<path d="M8,0.7c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7z M9.8,9.7L3.9,12l2.4-5.8
-		l5.8-2.4L9.8,9.7z"/>
-</g>
-<g class="st0">
-	<circle class="st3" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st4" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st4" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st4" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st4" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
-<g class="st0">
-	<circle class="st3" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st3" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st4" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
-<path class="st0" d="M15.3,9.2V6.7l-2-0.4C13.1,6,13,5.8,12.9,5.5L14,3.8L12.3,2l-1.7,1.1C10.3,3,10.1,2.9,9.8,2.8l-0.4-2H6.9
-	l-0.4,2C6.2,2.9,6,3,5.7,3.2L4,2L2.2,3.8l1.2,1.7C3.3,5.8,3.2,6,3.1,6.3L1,6.7v2.5l2,0.4c0.1,0.3,0.2,0.5,0.3,0.8l-1.2,1.7L4,13.8
-	l1.7-1.2C6,12.8,6.2,12.9,6.5,13L6.9,15h2.5L9.8,13c0.3-0.1,0.5-0.2,0.8-0.3l1.7,1.2l1.7-1.7l-1.2-1.7c0.1-0.3,0.2-0.5,0.3-0.8
-	L15.3,9.2z M8.1,9.9c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2C10.1,9,9.2,9.9,8.1,9.9z"/>
-<g class="st0">
-	<g class="st1">
-		<path class="st5" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
-			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
-	</g>
-	<rect x="2.7" y="2.3" class="st3" width="4.9" height="2.6"/>
-</g>
-<path class="st0" d="M1.5,4.1c0,0,4.3-3.9,8.4-1.4c4.1,2.4,5.4,5.6,3.6,7.9C11.4,7.4,10.3,5.8,6,4.5c0,0,6.8,4.3,8,9.3
-	c-0.2,1.1-1.2,0.3-1.2,0.3l-1.1-1.8c0,0-2.1,1.6-4.6-0.5C2.9,8.1,6.2,4,1.5,4.1z"/>
-<path class="st0" d="M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4L1.2,5.8C0.8,5.9,0.7,6,0.7,6.2c0,0.1,0.1,0.3,0.2,0.4l3.2,3.1l-0.8,4.4
-	c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1
-	c0.1,0,0.2,0,0.3-0.1s0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2l-0.8-4.4l3.2-3.1c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.4-0.6
-	l-2-4C8.3,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-<g class="st0">
-	<circle class="st6" cx="8" cy="8" r="6.6"/>
-	<circle class="st1" cx="8" cy="8" r="0.8"/>
-	<circle class="st6" cx="8" cy="8" r="2.1"/>
-	<path class="st1" d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8
-		c0,0.8,0.2,1.6,0.4,2.4l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
-	<path class="st1" d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14
-		C6.1,14.4,7,14.6,8,14.6c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
-</g>
-<g class="st0">
-	<rect x="2" y="1.9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="9" class="st1" width="5" height="5"/>
-	<rect x="2" y="9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
-</g>
-<g class="st0">
-	<circle class="st1" cx="6.1" cy="6.2" r="5.3"/>
-	<line class="st7" x1="9.1" y1="8.8" x2="14.5" y2="14.2"/>
-</g>
-<polyline class="st8" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st8" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st9" width="2.3" height="2.3"/>
-	<line class="st10" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st10" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st10" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st10" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st10" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st10" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st9" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st9" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st9" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st9" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st9" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st11" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st11" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st11" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-		<path class="st12" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-	</g>
-	<g class="st1">
-		<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
-			c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-		<path class="st12" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0
-			c-0.7,0.7-1,2.1-1,2.1c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-	</g>
+	<path d="M8,0.7C4,0.7,0.7,3.9,0.7,8c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7z M10.1,10l-6.9,2.7L6,5.9
+		l6.8-2.8L10.1,10z"/>
+	<circle cx="8" cy="7.9" r="1.2"/>
 </g>
 </svg>
diff --git a/src/assets/icons/folder.svg b/src/assets/icons/folder.svg
index 02e14472..dcca0b94 100755
--- a/src/assets/icons/folder.svg
+++ b/src/assets/icons/folder.svg
@@ -3,121 +3,18 @@
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
 <style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{display:inline;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st3{display:inline;fill:none;stroke:#000000;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st4{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st5{fill:none;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st6{display:inline;fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-	.st7{display:none;fill:none;stroke:#000000;stroke-width:2.2677;stroke-miterlimit:10;}
-	.st8{display:none;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st9{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st10{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st11{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st12{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-	.st13{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
+	.st0{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
 </style>
-<g class="st0">
-	<g class="st1">
-		<g>
-			<g>
-				<path d="M3.9,1.1C3.4,0.8,3.1,1,3.1,1.6v12.7c0,0.6,0.4,0.8,0.8,0.4l9.4-6.2c0.5-0.3,0.5-0.8,0-1.1L3.9,1.1z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g class="st0">
-	<circle class="st1" cx="8" cy="7.9" r="1"/>
-	<path class="st1" d="M8,0.7c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7z M9.8,9.7L3.9,12
-		l2.4-5.8l5.8-2.4L9.8,9.7z"/>
-</g>
-<g class="st0">
-	<circle class="st2" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st3" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st3" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st3" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st3" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
-<g class="st0">
-	<circle class="st2" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st2" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st3" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
-<path class="st0" d="M15.3,9.2V6.7l-2-0.4C13.1,6,13,5.8,12.9,5.5L14,3.8L12.3,2l-1.7,1.1C10.3,3,10.1,2.9,9.8,2.8l-0.4-2H6.9
-	l-0.4,2C6.2,2.9,6,3,5.7,3.2L4,2L2.2,3.8l1.2,1.7C3.3,5.8,3.2,6,3.1,6.3L1,6.7v2.5l2,0.4c0.1,0.3,0.2,0.5,0.3,0.8l-1.2,1.7L4,13.8
-	l1.7-1.2C6,12.8,6.2,12.9,6.5,13L6.9,15h2.5L9.8,13c0.3-0.1,0.5-0.2,0.8-0.3l1.7,1.2l1.7-1.7l-1.2-1.7c0.1-0.3,0.2-0.5,0.3-0.8
-	L15.3,9.2z M8.1,9.9c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2C10.1,9,9.2,9.9,8.1,9.9z"/>
 <g>
 	<g>
-		<path class="st4" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
+		<path class="st0" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
 			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
 	</g>
 	<g>
 		<path d="M2.7,2.8c0-0.3,0.2-0.5,0.5-0.5h3.9c0.3,0,0.5,0.2,0.5,0.5v1.6c0,0.3-0.2,0.5-0.5,0.5H3.2c-0.3,0-0.5-0.2-0.5-0.5V2.8z"/>
-		<path class="st5" d="M2.7,2.8c0-0.3,0.2-0.5,0.5-0.5h3.9c0.3,0,0.5,0.2,0.5,0.5v1.6c0,0.3-0.2,0.5-0.5,0.5H3.2
+		<path class="st1" d="M2.7,2.8c0-0.3,0.2-0.5,0.5-0.5h3.9c0.3,0,0.5,0.2,0.5,0.5v1.6c0,0.3-0.2,0.5-0.5,0.5H3.2
 			c-0.3,0-0.5-0.2-0.5-0.5V2.8z"/>
 	</g>
 </g>
-<path class="st0" d="M1.5,4.1c0,0,4.3-3.9,8.4-1.4c4.1,2.4,5.4,5.6,3.6,7.9C11.4,7.4,10.3,5.8,6,4.5c0,0,6.8,4.3,8,9.3
-	c-0.2,1.1-1.2,0.3-1.2,0.3l-1.1-1.8c0,0-2.1,1.6-4.6-0.5C2.9,8.1,6.2,4,1.5,4.1z"/>
-<path class="st0" d="M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4L1.2,5.8C0.8,5.9,0.7,6,0.7,6.2c0,0.1,0.1,0.3,0.2,0.4l3.2,3.1l-0.8,4.4
-	c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1
-	c0.1,0,0.2,0,0.3-0.1s0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2l-0.8-4.4l3.2-3.1c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.4-0.6
-	l-2-4C8.3,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-<g class="st0">
-	<circle class="st6" cx="8" cy="8" r="6.6"/>
-	<circle class="st1" cx="8" cy="8" r="0.8"/>
-	<circle class="st6" cx="8" cy="8" r="2.1"/>
-	<path class="st1" d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8
-		c0,0.8,0.2,1.6,0.4,2.4l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
-	<path class="st1" d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14
-		C6.1,14.4,7,14.6,8,14.6c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
-</g>
-<g class="st0">
-	<rect x="2" y="1.9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="9" class="st1" width="5" height="5"/>
-	<rect x="2" y="9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
-</g>
-<circle class="st7" cx="6.9" cy="7" r="4.5"/>
-<line class="st8" x1="10.2" y1="9.9" x2="14.5" y2="14.2"/>
-<polyline class="st9" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st9" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st10" width="2.3" height="2.3"/>
-	<line class="st11" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st11" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st11" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st11" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st11" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st11" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st10" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st10" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st10" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st10" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st10" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st12" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st12" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st12" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-		<path class="st13" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-	</g>
-	<g class="st1">
-		<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
-			c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-		<path class="st13" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0
-			c-0.7,0.7-1,2.1-1,2.1c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-	</g>
-</g>
 </svg>
diff --git a/src/assets/icons/grid.svg b/src/assets/icons/grid.svg
index 9cabb327..04b66de7 100755
--- a/src/assets/icons/grid.svg
+++ b/src/assets/icons/grid.svg
@@ -2,149 +2,10 @@
 <!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{fill:#FFFFFF;}
-	.st3{display:inline;fill:#FFFFFF;}
-	.st4{display:none;fill:#FFFFFF;}
-	.st5{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st6{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st7{fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st8{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-linecap:round;stroke-miterlimit:10;}
-	.st9{display:inline;fill:none;stroke:#FFFFFF;stroke-width:0.8504;stroke-linecap:round;stroke-miterlimit:10;}
-	.st10{display:inline;fill:none;stroke:#FFFFFF;stroke-width:0.7087;stroke-miterlimit:10;}
-	.st11{display:inline;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st12{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st13{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st14{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st15{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-</style>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M3.9,3.2L11,7.9l-7.2,4.7V3.2 M2.5,0.5v14.8l11.1-7.4L2.5,0.5L2.5,0.5z"/>
-	</g>
-</g>
-<g class="st0">
-	<path class="st3" d="M8,2.1c3.2,0,5.8,2.6,5.8,5.8c0,3.2-2.6,5.8-5.8,5.8c-3.2,0-5.8-2.6-5.8-5.8C2.2,4.7,4.8,2.1,8,2.1 M8,0.7
-		c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7L8,0.7z"/>
-</g>
-<path class="st4" d="M6.5,6.4l-2.1,5.1l5.1-2.1l2.1-5.1L6.5,6.4z M8,8.8c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-	c0.5,0,0.8,0.4,0.8,0.8C8.9,8.4,8.5,8.8,8,8.8z"/>
-<g class="st0">
-	<circle class="st5" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st6" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st6" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st6" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st6" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
-<g class="st0">
-	<circle class="st5" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st5" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st6" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M7.9,6.9c0.5,0,1,0.4,1,1c0,0.5-0.4,1-1,1c-0.5,0-1-0.4-1-1C7,7.4,7.4,6.9,7.9,6.9 M7.9,5.8
-			c-1.2,0-2.1,0.9-2.1,2.1c0,1.2,0.9,2.1,2.1,2.1C9.1,10,10,9.1,10,7.9C10,6.8,9.1,5.8,7.9,5.8L7.9,5.8z"/>
-	</g>
-	<g class="st1">
-		<path class="st2" d="M7.9,4.2c2,0,3.7,1.7,3.7,3.7c0,2-1.7,3.7-3.7,3.7c-2,0-3.7-1.7-3.7-3.7C4.3,5.9,5.9,4.2,7.9,4.2 M7.9,2.8
-			c-2.8,0-5.1,2.3-5.1,5.1S5.1,13,7.9,13c2.8,0,5.1-2.3,5.1-5.1S10.8,2.8,7.9,2.8L7.9,2.8z"/>
-	</g>
-	<g class="st1">
-		<g>
-			<polygon class="st2" points="9.3,12.8 6.5,12.8 6.5,14.9 9.3,14.9 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="9.3,1 6.5,1 6.5,3.1 9.3,3.1 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="3.1,6.6 1,6.6 1,9.3 3.1,9.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="15.1,6.6 12.8,6.6 12.8,9.3 15.1,9.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="3.5,10.4 2,11.9 4,13.9 5.5,12.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="11.9,2 10.4,3.5 12.3,5.5 13.8,4 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="4,2 2,4 3.5,5.5 5.5,3.5 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="12.3,10.4 10.4,12.3 11.9,13.9 13.8,11.9 			"/>
-		</g>
-	</g>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path class="st7" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
-			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
-	</g>
-	<rect x="2.7" y="2.3" class="st5" width="4.9" height="2.6"/>
-</g>
-<path class="st4" d="M1.8,4.1c0,0,4.2-3.8,8.2-1.4c4,2.4,5.2,5.5,3.5,7.7c-2-3.2-3.1-4.7-7.3-6c0,0,6.6,4.2,7.8,9.1
-	c-0.2,1-1.2,0.3-1.2,0.3L11.7,12c0,0-2,1.6-4.5-0.5C3.1,7.9,6.4,4,1.8,4.1z"/>
-<g class="st0">
-	<path class="st3" d="M8,3.5l1.2,2.4l0.3,0.7l0.7,0.1L13,7L11,8.9l-0.5,0.5l0.1,0.7l0.5,2.7l-2.4-1.3L8,11.2l-0.7,0.3L5,12.9
-		l0.5-2.7l0.1-0.7L5,8.9L3.1,7l2.7-0.4l0.7-0.1l0.3-0.7L8,3.5 M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4.1L1,5.9C0.7,6,0.5,6.1,0.5,6.3
-		c0,0.1,0.1,0.3,0.2,0.4L4,10l-0.8,4.5c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1
-		l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2L12,10l3.3-3.2
-		c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.5-0.7l-2-4.1C8.4,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-</g>
-<g class="st0">
-	<polyline class="st8" points="11.8,7.6 5.4,12.6 3.5,10.6 8.6,4.5 	"/>
-	<path class="st9" d="M4.5,11.6c-1.8,1-0.8,2.6-2.8,2.6"/>
-	<circle class="st5" cx="11.5" cy="4.5" r="2.9"/>
-	<line class="st5" x1="9.5" y1="2.5" x2="13.6" y2="6.6"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M8,2.1c3.2,0,5.8,2.6,5.8,5.8s-2.6,5.8-5.8,5.8c-3.2,0-5.8-2.6-5.8-5.8S4.8,2.1,8,2.1 M8,0.7
-			c-4,0-7.3,3.2-7.3,7.2S4,15.2,8,15.2c4,0,7.3-3.2,7.3-7.2S12,0.7,8,0.7L8,0.7z"/>
-	</g>
-	<g class="st1">
-		<path class="st2" d="M8,6.5c0.8,0,1.4,0.6,1.4,1.4S8.8,9.4,8,9.4c-0.8,0-1.4-0.6-1.4-1.4S7.2,6.5,8,6.5 M8,5.1
-			c-1.6,0-2.9,1.3-2.9,2.9c0,1.6,1.3,2.9,2.9,2.9c1.6,0,2.9-1.3,2.9-2.9C10.9,6.4,9.6,5.1,8,5.1L8,5.1z"/>
-	</g>
-	<path class="st10" d="M4.7,5.1c0.8-0.9,2-1.5,3.3-1.5"/>
-	<path class="st10" d="M11.3,10.8c-0.8,0.9-2,1.5-3.3,1.5"/>
-</g>
 <g>
 	<rect x="2" y="1.9" width="5" height="5"/>
 	<rect x="9.1" y="9" width="5" height="5"/>
 	<rect x="2" y="9" width="5" height="5"/>
 	<rect x="9.1" y="1.9" width="5" height="5"/>
 </g>
-<g class="st0">
-	<circle class="st1" cx="6.1" cy="6.2" r="5.3"/>
-	<line class="st11" x1="9.1" y1="8.8" x2="14.5" y2="14.2"/>
-</g>
-<polyline class="st12" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st12" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st13" width="2.3" height="2.3"/>
-	<line class="st14" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st14" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st14" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st14" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st14" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st14" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st13" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st13" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st13" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st13" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st13" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st15" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st15" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st15" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
 </svg>
diff --git a/src/assets/icons/leaf.svg b/src/assets/icons/leaf.svg
index 91b25830..6dd1c1fd 100755
--- a/src/assets/icons/leaf.svg
+++ b/src/assets/icons/leaf.svg
@@ -2,150 +2,6 @@
 <!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{fill:#FFFFFF;}
-	.st3{display:inline;fill:#FFFFFF;}
-	.st4{display:none;fill:#FFFFFF;}
-	.st5{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st6{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st7{fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st8{display:inline;fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-	.st9{display:inline;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st10{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st11{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st12{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st13{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-	.st14{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-</style>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M3.9,3.2L11,7.9l-7.2,4.7V3.2 M2.5,0.5v14.8l11.1-7.4L2.5,0.5L2.5,0.5z"/>
-	</g>
-</g>
-<g class="st0">
-	<path class="st3" d="M8,2.1c3.2,0,5.8,2.6,5.8,5.8c0,3.2-2.6,5.8-5.8,5.8c-3.2,0-5.8-2.6-5.8-5.8C2.2,4.7,4.8,2.1,8,2.1 M8,0.7
-		c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7L8,0.7z"/>
-</g>
-<path class="st4" d="M6.5,6.4l-2.1,5.1l5.1-2.1l2.1-5.1L6.5,6.4z M8,8.8c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-	c0.5,0,0.8,0.4,0.8,0.8C8.9,8.4,8.5,8.8,8,8.8z"/>
-<g class="st0">
-	<circle class="st5" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st6" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st6" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st6" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st6" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
-<g class="st0">
-	<circle class="st5" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st5" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st6" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M7.9,6.9c0.5,0,1,0.4,1,1c0,0.5-0.4,1-1,1c-0.5,0-1-0.4-1-1C7,7.4,7.4,6.9,7.9,6.9 M7.9,5.8
-			c-1.2,0-2.1,0.9-2.1,2.1c0,1.2,0.9,2.1,2.1,2.1C9.1,10,10,9.1,10,7.9C10,6.8,9.1,5.8,7.9,5.8L7.9,5.8z"/>
-	</g>
-	<g class="st1">
-		<path class="st2" d="M7.9,4.2c2,0,3.7,1.7,3.7,3.7c0,2-1.7,3.7-3.7,3.7c-2,0-3.7-1.7-3.7-3.7C4.3,5.9,5.9,4.2,7.9,4.2 M7.9,2.8
-			c-2.8,0-5.1,2.3-5.1,5.1S5.1,13,7.9,13c2.8,0,5.1-2.3,5.1-5.1S10.8,2.8,7.9,2.8L7.9,2.8z"/>
-	</g>
-	<g class="st1">
-		<g>
-			<polygon class="st2" points="9.3,12.8 6.5,12.8 6.5,14.9 9.3,14.9 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="9.3,1 6.5,1 6.5,3.1 9.3,3.1 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="3.1,6.6 1,6.6 1,9.3 3.1,9.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="15.1,6.6 12.8,6.6 12.8,9.3 15.1,9.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="3.5,10.4 2,11.9 4,13.9 5.5,12.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="11.9,2 10.4,3.5 12.3,5.5 13.8,4 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="4,2 2,4 3.5,5.5 5.5,3.5 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="12.3,10.4 10.4,12.3 11.9,13.9 13.8,11.9 			"/>
-		</g>
-	</g>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path class="st7" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
-			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
-	</g>
-	<rect x="2.7" y="2.3" class="st5" width="4.9" height="2.6"/>
-</g>
 <path d="M1.5,4.1c0,0,4.3-3.9,8.4-1.4c4.1,2.4,5.4,5.6,3.6,7.9C11.4,7.4,10.3,5.8,6,4.5c0,0,6.8,4.3,8,9.3c-0.2,1.1-1.2,0.3-1.2,0.3
 	l-1.1-1.8c0,0-2.1,1.6-4.6-0.5C2.9,8.1,6.2,4,1.5,4.1z"/>
-<path class="st0" d="M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4.1L1,5.9C0.7,6,0.5,6.1,0.5,6.3c0,0.1,0.1,0.3,0.2,0.4L4,10l-0.8,4.5
-	c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1
-	c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2L12,10l3.3-3.2c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4
-	l-4.5-0.7l-2-4.1C8.4,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-<g class="st0">
-	<circle class="st8" cx="8" cy="8" r="6.6"/>
-	<circle class="st1" cx="8" cy="8" r="0.8"/>
-	<circle class="st8" cx="8" cy="8" r="2.1"/>
-	<path class="st1" d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8
-		c0,0.8,0.2,1.6,0.4,2.4l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
-	<path class="st1" d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14
-		C6.1,14.4,7,14.6,8,14.6c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
-</g>
-<g class="st0">
-	<rect x="2" y="1.9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="9" class="st1" width="5" height="5"/>
-	<rect x="2" y="9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
-</g>
-<g class="st0">
-	<circle class="st1" cx="6.1" cy="6.2" r="5.3"/>
-	<line class="st9" x1="9.1" y1="8.8" x2="14.5" y2="14.2"/>
-</g>
-<polyline class="st10" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st10" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st11" width="2.3" height="2.3"/>
-	<line class="st12" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st12" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st12" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st12" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st12" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st12" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st11" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st11" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st11" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st11" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st11" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st13" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st13" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st13" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-		<path class="st14" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-	</g>
-	<g class="st1">
-		<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
-			c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-		<path class="st14" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0
-			c-0.7,0.7-1,2.1-1,2.1c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-	</g>
-</g>
 </svg>
diff --git a/src/assets/icons/mic.svg b/src/assets/icons/mic.svg
index ea8cd225..97689702 100755
--- a/src/assets/icons/mic.svg
+++ b/src/assets/icons/mic.svg
@@ -3,150 +3,18 @@
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
 <style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{fill:#FFFFFF;}
-	.st3{display:inline;fill:#FFFFFF;}
-	.st4{display:none;fill:#FFFFFF;}
-	.st5{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st6{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st7{fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st8{display:inline;fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-	.st9{display:inline;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st10{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st11{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st12{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st13{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-	.st14{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
+	.st0{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
 </style>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M3.9,3.2L11,7.9l-7.2,4.7V3.2 M2.5,0.5v14.8l11.1-7.4L2.5,0.5L2.5,0.5z"/>
-	</g>
-</g>
-<g class="st0">
-	<path class="st3" d="M8,2.1c3.2,0,5.8,2.6,5.8,5.8c0,3.2-2.6,5.8-5.8,5.8c-3.2,0-5.8-2.6-5.8-5.8C2.2,4.7,4.8,2.1,8,2.1 M8,0.7
-		c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7L8,0.7z"/>
-</g>
-<path class="st4" d="M6.5,6.4l-2.1,5.1l5.1-2.1l2.1-5.1L6.5,6.4z M8,8.8c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-	c0.5,0,0.8,0.4,0.8,0.8C8.9,8.4,8.5,8.8,8,8.8z"/>
-<g class="st0">
-	<circle class="st5" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st6" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st6" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st6" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st6" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
-<g class="st0">
-	<circle class="st5" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st5" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st6" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M7.9,6.9c0.5,0,1,0.4,1,1c0,0.5-0.4,1-1,1c-0.5,0-1-0.4-1-1C7,7.4,7.4,6.9,7.9,6.9 M7.9,5.8
-			c-1.2,0-2.1,0.9-2.1,2.1c0,1.2,0.9,2.1,2.1,2.1C9.1,10,10,9.1,10,7.9C10,6.8,9.1,5.8,7.9,5.8L7.9,5.8z"/>
-	</g>
-	<g class="st1">
-		<path class="st2" d="M7.9,4.2c2,0,3.7,1.7,3.7,3.7c0,2-1.7,3.7-3.7,3.7c-2,0-3.7-1.7-3.7-3.7C4.3,5.9,5.9,4.2,7.9,4.2 M7.9,2.8
-			c-2.8,0-5.1,2.3-5.1,5.1S5.1,13,7.9,13c2.8,0,5.1-2.3,5.1-5.1S10.8,2.8,7.9,2.8L7.9,2.8z"/>
-	</g>
-	<g class="st1">
-		<g>
-			<polygon class="st2" points="9.3,12.8 6.5,12.8 6.5,14.9 9.3,14.9 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="9.3,1 6.5,1 6.5,3.1 9.3,3.1 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="3.1,6.6 1,6.6 1,9.3 3.1,9.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="15.1,6.6 12.8,6.6 12.8,9.3 15.1,9.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="3.5,10.4 2,11.9 4,13.9 5.5,12.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="11.9,2 10.4,3.5 12.3,5.5 13.8,4 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="4,2 2,4 3.5,5.5 5.5,3.5 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="12.3,10.4 10.4,12.3 11.9,13.9 13.8,11.9 			"/>
-		</g>
-	</g>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path class="st7" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
-			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
-	</g>
-	<rect x="2.7" y="2.3" class="st5" width="4.9" height="2.6"/>
-</g>
-<path class="st4" d="M1.8,4.1c0,0,4.2-3.8,8.2-1.4c4,2.4,5.2,5.5,3.5,7.7c-2-3.2-3.1-4.7-7.3-6c0,0,6.6,4.2,7.8,9.1
-	c-0.2,1-1.2,0.3-1.2,0.3L11.7,12c0,0-2,1.6-4.5-0.5C3.1,7.9,6.4,4,1.8,4.1z"/>
-<g class="st0">
-	<path class="st3" d="M8,3.5l1.2,2.4l0.3,0.7l0.7,0.1L13,7L11,8.9l-0.5,0.5l0.1,0.7l0.5,2.7l-2.4-1.3L8,11.2l-0.7,0.3L5,12.9
-		l0.5-2.7l0.1-0.7L5,8.9L3.1,7l2.7-0.4l0.7-0.1l0.3-0.7L8,3.5 M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4.1L1,5.9C0.7,6,0.5,6.1,0.5,6.3
-		c0,0.1,0.1,0.3,0.2,0.4L4,10l-0.8,4.5c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1
-		l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2L12,10l3.3-3.2
-		c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.5-0.7l-2-4.1C8.4,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-</g>
-<g class="st0">
-	<circle class="st8" cx="8" cy="8" r="6.6"/>
-	<circle class="st1" cx="8" cy="8" r="0.8"/>
-	<circle class="st8" cx="8" cy="8" r="2.1"/>
-	<path class="st1" d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8
-		c0,0.8,0.2,1.6,0.4,2.4l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
-	<path class="st1" d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14
-		C6.1,14.4,7,14.6,8,14.6c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
-</g>
-<g class="st0">
-	<rect x="2" y="1.9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="9" class="st1" width="5" height="5"/>
-	<rect x="2" y="9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
-</g>
-<g class="st0">
-	<circle class="st1" cx="6.1" cy="6.2" r="5.3"/>
-	<line class="st9" x1="9.1" y1="8.8" x2="14.5" y2="14.2"/>
-</g>
-<polyline class="st10" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st10" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st11" width="2.3" height="2.3"/>
-	<line class="st12" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st12" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st12" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st12" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st12" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st12" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st11" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st11" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st11" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st11" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st11" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st13" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st13" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st13" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
 <g>
 	<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
 		c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-	<path class="st14" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
+	<path class="st0" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
 		c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
 </g>
 <g>
-	<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
+	<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0C8,3,7.7,4.4,7.7,4.4
 		c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-	<path class="st14" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
+	<path class="st0" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0C8,3,7.7,4.4,7.7,4.4
 		c0,0.2,0,0.4,0.2,0.5L11,8z"/>
 </g>
 </svg>
diff --git a/src/assets/icons/music.svg b/src/assets/icons/music.svg
index 691775d3..006ad90a 100755
--- a/src/assets/icons/music.svg
+++ b/src/assets/icons/music.svg
@@ -3,119 +3,12 @@
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
 <style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{fill:#FFFFFF;}
-	.st3{display:inline;fill:#FFFFFF;}
-	.st4{display:none;fill:#FFFFFF;}
-	.st5{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st6{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st7{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st8{fill:none;stroke:#000000;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st9{display:inline;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st10{display:inline;fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-	.st11{display:inline;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st12{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st13{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st14{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st15{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-	.st16{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
+	.st0{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
 </style>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M3.9,3.2L11,7.9l-7.2,4.7V3.2 M2.5,0.5v14.8l11.1-7.4L2.5,0.5L2.5,0.5z"/>
-	</g>
-</g>
-<g class="st0">
-	<path class="st3" d="M8,2.1c3.2,0,5.8,2.6,5.8,5.8c0,3.2-2.6,5.8-5.8,5.8c-3.2,0-5.8-2.6-5.8-5.8C2.2,4.7,4.8,2.1,8,2.1 M8,0.7
-		c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7L8,0.7z"/>
-</g>
-<path class="st4" d="M6.5,6.4l-2.1,5.1l5.1-2.1l2.1-5.1L6.5,6.4z M8,8.8c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-	c0.5,0,0.8,0.4,0.8,0.8C8.9,8.4,8.5,8.8,8,8.8z"/>
-<g class="st0">
-	<circle class="st5" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st6" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st6" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st6" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st6" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
 <g>
-	<circle class="st7" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st7" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st8" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
-<path class="st0" d="M15.3,9.2V6.7l-2-0.4C13.1,6,13,5.8,12.9,5.5L14,3.8L12.3,2l-1.7,1.1C10.3,3,10.1,2.9,9.8,2.8l-0.4-2H6.9
-	l-0.4,2C6.2,2.9,6,3,5.7,3.2L4,2L2.2,3.8l1.2,1.7C3.3,5.8,3.2,6,3.1,6.3L1,6.7v2.5l2,0.4c0.1,0.3,0.2,0.5,0.3,0.8l-1.2,1.7L4,13.8
-	l1.7-1.2C6,12.8,6.2,12.9,6.5,13L6.9,15h2.5L9.8,13c0.3-0.1,0.5-0.2,0.8-0.3l1.7,1.2l1.7-1.7l-1.2-1.7c0.1-0.3,0.2-0.5,0.3-0.8
-	L15.3,9.2z M8.1,9.9c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2C10.1,9,9.2,9.9,8.1,9.9z"/>
-<g class="st0">
-	<g class="st1">
-		<path class="st7" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
-			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
-	</g>
-	<rect x="2.7" y="2.3" class="st9" width="4.9" height="2.6"/>
-</g>
-<path class="st0" d="M1.5,4.1c0,0,4.3-3.9,8.4-1.4c4.1,2.4,5.4,5.6,3.6,7.9C11.4,7.4,10.3,5.8,6,4.5c0,0,6.8,4.3,8,9.3
-	c-0.2,1.1-1.2,0.3-1.2,0.3l-1.1-1.8c0,0-2.1,1.6-4.6-0.5C2.9,8.1,6.2,4,1.5,4.1z"/>
-<path class="st0" d="M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4L1.2,5.8C0.8,5.9,0.7,6,0.7,6.2c0,0.1,0.1,0.3,0.2,0.4l3.2,3.1l-0.8,4.4
-	c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1
-	c0.1,0,0.2,0,0.3-0.1s0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2l-0.8-4.4l3.2-3.1c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.4-0.6
-	l-2-4C8.3,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-<g class="st0">
-	<circle class="st10" cx="8" cy="8" r="6.6"/>
-	<circle class="st1" cx="8" cy="8" r="0.8"/>
-	<circle class="st10" cx="8" cy="8" r="2.1"/>
-	<path class="st1" d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8
-		c0,0.8,0.2,1.6,0.4,2.4l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
-	<path class="st1" d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14
-		C6.1,14.4,7,14.6,8,14.6c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
-</g>
-<g class="st0">
-	<rect x="2" y="1.9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="9" class="st1" width="5" height="5"/>
-	<rect x="2" y="9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
-</g>
-<g class="st0">
-	<circle class="st1" cx="6.1" cy="6.2" r="5.3"/>
-	<line class="st11" x1="9.1" y1="8.8" x2="14.5" y2="14.2"/>
-</g>
-<polyline class="st12" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st12" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st13" width="2.3" height="2.3"/>
-	<line class="st14" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st14" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st14" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st14" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st14" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st14" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st13" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st13" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st13" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st13" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st13" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st15" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st15" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st15" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-		<path class="st16" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-	</g>
-	<g class="st1">
-		<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
-			c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-		<path class="st16" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0
-			c-0.7,0.7-1,2.1-1,2.1c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-	</g>
+	<circle class="st0" cx="12.3" cy="10.3" r="2.4"/>
+	<circle class="st0" cx="3.8" cy="12.3" r="2.4"/>
+	<polyline class="st1" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
 </g>
 </svg>
diff --git a/src/assets/icons/play.svg b/src/assets/icons/play.svg
index c9f54500..5188c1c7 100755
--- a/src/assets/icons/play.svg
+++ b/src/assets/icons/play.svg
@@ -2,23 +2,6 @@
 <!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{display:inline;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st3{display:inline;fill:none;stroke:#000000;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st4{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st5{fill:none;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st6{display:inline;fill:none;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st7{display:none;fill:none;stroke:#000000;stroke-width:2.2677;stroke-miterlimit:10;}
-	.st8{display:none;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st9{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st10{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st11{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st12{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-	.st13{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-</style>
 <g>
 	<g>
 		<g>
@@ -28,95 +11,4 @@
 		</g>
 	</g>
 </g>
-<g class="st0">
-	<circle class="st1" cx="8" cy="7.9" r="1"/>
-	<path class="st1" d="M8,0.7c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7z M9.8,9.7L3.9,12
-		l2.4-5.8l5.8-2.4L9.8,9.7z"/>
-</g>
-<g class="st0">
-	<circle class="st2" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st3" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st3" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st3" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st3" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
-<g class="st0">
-	<circle class="st2" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st2" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st3" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
-<path class="st0" d="M15.3,9.2V6.7l-2-0.4C13.1,6,13,5.8,12.9,5.5L14,3.8L12.3,2l-1.7,1.1C10.3,3,10.1,2.9,9.8,2.8l-0.4-2H6.9
-	l-0.4,2C6.2,2.9,6,3,5.7,3.2L4,2L2.2,3.8l1.2,1.7C3.3,5.8,3.2,6,3.1,6.3L1,6.7v2.5l2,0.4c0.1,0.3,0.2,0.5,0.3,0.8l-1.2,1.7L4,13.8
-	l1.7-1.2C6,12.8,6.2,12.9,6.5,13L6.9,15h2.5L9.8,13c0.3-0.1,0.5-0.2,0.8-0.3l1.7,1.2l1.7-1.7l-1.2-1.7c0.1-0.3,0.2-0.5,0.3-0.8
-	L15.3,9.2z M8.1,9.9c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2C10.1,9,9.2,9.9,8.1,9.9z"/>
-<g class="st0">
-	<g class="st1">
-		<path class="st4" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
-			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
-	</g>
-	<g class="st1">
-		<path d="M2.7,2.8c0-0.3,0.2-0.5,0.5-0.5h3.9c0.3,0,0.5,0.2,0.5,0.5v1.6c0,0.3-0.2,0.5-0.5,0.5H3.2c-0.3,0-0.5-0.2-0.5-0.5V2.8z"/>
-		<path class="st5" d="M2.7,2.8c0-0.3,0.2-0.5,0.5-0.5h3.9c0.3,0,0.5,0.2,0.5,0.5v1.6c0,0.3-0.2,0.5-0.5,0.5H3.2
-			c-0.3,0-0.5-0.2-0.5-0.5V2.8z"/>
-	</g>
-</g>
-<path class="st0" d="M1.5,4.1c0,0,4.3-3.9,8.4-1.4c4.1,2.4,5.4,5.6,3.6,7.9C11.4,7.4,10.3,5.8,6,4.5c0,0,6.8,4.3,8,9.3
-	c-0.2,1.1-1.2,0.3-1.2,0.3l-1.1-1.8c0,0-2.1,1.6-4.6-0.5C2.9,8.1,6.2,4,1.5,4.1z"/>
-<path class="st0" d="M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4L1.2,5.8C0.8,5.9,0.7,6,0.7,6.2c0,0.1,0.1,0.3,0.2,0.4l3.2,3.1l-0.8,4.4
-	c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1
-	c0.1,0,0.2,0,0.3-0.1s0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2l-0.8-4.4l3.2-3.1c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.4-0.6
-	l-2-4C8.3,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-<g class="st0">
-	<circle class="st6" cx="8" cy="8" r="6.6"/>
-	<circle class="st6" cx="8" cy="8" r="2.1"/>
-	<path class="st1" d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8
-		c0,0.8,0.2,1.6,0.4,2.4l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
-	<path class="st1" d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14
-		C6.1,14.4,7,14.6,8,14.6c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
-</g>
-<g class="st0">
-	<rect x="2" y="1.9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="9" class="st1" width="5" height="5"/>
-	<rect x="2" y="9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
-</g>
-<circle class="st7" cx="6.9" cy="7" r="4.5"/>
-<line class="st8" x1="10.2" y1="9.9" x2="14.5" y2="14.2"/>
-<polyline class="st9" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st9" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st10" width="2.3" height="2.3"/>
-	<line class="st11" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st11" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st11" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st11" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st11" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st11" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st10" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st10" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st10" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st10" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st10" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st12" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st12" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st12" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-		<path class="st13" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-	</g>
-	<g class="st1">
-		<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
-			c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-		<path class="st13" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0
-			c-0.7,0.7-1,2.1-1,2.1c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-	</g>
-</g>
 </svg>
diff --git a/src/assets/icons/playlist.svg b/src/assets/icons/playlist.svg
index 40e75c6d..ec2a7860 100755
--- a/src/assets/icons/playlist.svg
+++ b/src/assets/icons/playlist.svg
@@ -3,118 +3,14 @@
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
 <style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{fill:#FFFFFF;}
-	.st3{display:inline;fill:#FFFFFF;}
-	.st4{display:none;fill:#FFFFFF;}
-	.st5{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st6{fill:none;stroke:#000000;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st7{display:inline;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st8{display:inline;fill:none;stroke:#000000;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st9{display:inline;fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-	.st10{display:inline;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st11{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st12{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st13{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st14{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-	.st15{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
+	.st0{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
 </style>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M3.9,3.2L11,7.9l-7.2,4.7V3.2 M2.5,0.5v14.8l11.1-7.4L2.5,0.5L2.5,0.5z"/>
-	</g>
-</g>
-<g class="st0">
-	<path class="st3" d="M8,2.1c3.2,0,5.8,2.6,5.8,5.8c0,3.2-2.6,5.8-5.8,5.8c-3.2,0-5.8-2.6-5.8-5.8C2.2,4.7,4.8,2.1,8,2.1 M8,0.7
-		c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7L8,0.7z"/>
-</g>
-<path class="st4" d="M6.5,6.4l-2.1,5.1l5.1-2.1l2.1-5.1L6.5,6.4z M8,8.8c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-	c0.5,0,0.8,0.4,0.8,0.8C8.9,8.4,8.5,8.8,8,8.8z"/>
 <g>
-	<circle class="st5" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st6" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st6" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st6" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st6" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
-<g class="st0">
-	<circle class="st7" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st7" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st8" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
-<path class="st0" d="M15.3,9.2V6.7l-2-0.4C13.1,6,13,5.8,12.9,5.5L14,3.8L12.3,2l-1.7,1.1C10.3,3,10.1,2.9,9.8,2.8l-0.4-2H6.9
-	l-0.4,2C6.2,2.9,6,3,5.7,3.2L4,2L2.2,3.8l1.2,1.7C3.3,5.8,3.2,6,3.1,6.3L1,6.7v2.5l2,0.4c0.1,0.3,0.2,0.5,0.3,0.8l-1.2,1.7L4,13.8
-	l1.7-1.2C6,12.8,6.2,12.9,6.5,13L6.9,15h2.5L9.8,13c0.3-0.1,0.5-0.2,0.8-0.3l1.7,1.2l1.7-1.7l-1.2-1.7c0.1-0.3,0.2-0.5,0.3-0.8
-	L15.3,9.2z M8.1,9.9c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2C10.1,9,9.2,9.9,8.1,9.9z"/>
-<g class="st0">
-	<g class="st1">
-		<path class="st5" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
-			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
-	</g>
-	<rect x="2.7" y="2.3" class="st7" width="4.9" height="2.6"/>
-</g>
-<path class="st0" d="M1.5,4.1c0,0,4.3-3.9,8.4-1.4c4.1,2.4,5.4,5.6,3.6,7.9C11.4,7.4,10.3,5.8,6,4.5c0,0,6.8,4.3,8,9.3
-	c-0.2,1.1-1.2,0.3-1.2,0.3l-1.1-1.8c0,0-2.1,1.6-4.6-0.5C2.9,8.1,6.2,4,1.5,4.1z"/>
-<path class="st0" d="M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4L1.2,5.8C0.8,5.9,0.7,6,0.7,6.2c0,0.1,0.1,0.3,0.2,0.4l3.2,3.1l-0.8,4.4
-	c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1
-	c0.1,0,0.2,0,0.3-0.1s0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2l-0.8-4.4l3.2-3.1c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.4-0.6
-	l-2-4C8.3,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-<g class="st0">
-	<circle class="st9" cx="8" cy="8" r="6.6"/>
-	<circle class="st1" cx="8" cy="8" r="0.8"/>
-	<circle class="st9" cx="8" cy="8" r="2.1"/>
-	<path class="st1" d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8
-		c0,0.8,0.2,1.6,0.4,2.4l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
-	<path class="st1" d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14
-		C6.1,14.4,7,14.6,8,14.6c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
-</g>
-<g class="st0">
-	<rect x="2" y="1.9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="9" class="st1" width="5" height="5"/>
-	<rect x="2" y="9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
-</g>
-<g class="st0">
-	<circle class="st1" cx="6.1" cy="6.2" r="5.3"/>
-	<line class="st10" x1="9.1" y1="8.8" x2="14.5" y2="14.2"/>
-</g>
-<polyline class="st11" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st11" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st12" width="2.3" height="2.3"/>
-	<line class="st13" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st13" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st13" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st13" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st13" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st13" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st12" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st12" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st12" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st12" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st12" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st14" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st14" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st14" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-		<path class="st15" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-	</g>
-	<g class="st1">
-		<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
-			c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-		<path class="st15" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0
-			c-0.7,0.7-1,2.1-1,2.1c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-	</g>
+	<circle class="st0" cx="8.1" cy="11.8" r="2.4"/>
+	<polyline class="st1" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
+	<line class="st1" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
+	<line class="st1" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
+	<line class="st1" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
 </g>
 </svg>
diff --git a/src/assets/icons/search.svg b/src/assets/icons/search.svg
index 18ff2df5..57e46824 100755
--- a/src/assets/icons/search.svg
+++ b/src/assets/icons/search.svg
@@ -3,116 +3,9 @@
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
 <style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{display:inline;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st3{display:inline;fill:none;stroke:#000000;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st4{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st5{display:inline;fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-	.st6{fill:none;stroke:#000000;stroke-width:2.2677;stroke-miterlimit:10;}
-	.st7{fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st8{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st9{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st10{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st11{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-	.st12{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
+	.st0{fill:none;stroke:#000000;stroke-width:2.2677;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
 </style>
-<g class="st0">
-	<g class="st1">
-		<g>
-			<g>
-				<path d="M3.9,1.1C3.4,0.8,3.1,1,3.1,1.6v12.7c0,0.6,0.4,0.8,0.8,0.4l9.4-6.2c0.5-0.3,0.5-0.8,0-1.1L3.9,1.1z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g class="st0">
-	<circle class="st1" cx="8" cy="7.9" r="1"/>
-	<path class="st1" d="M8,0.7c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7z M9.8,9.7L3.9,12
-		l2.4-5.8l5.8-2.4L9.8,9.7z"/>
-</g>
-<g class="st0">
-	<circle class="st2" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st3" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st3" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st3" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st3" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
-<g class="st0">
-	<circle class="st2" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st2" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st3" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
-<path class="st0" d="M15.3,9.2V6.7l-2-0.4C13.1,6,13,5.8,12.9,5.5L14,3.8L12.3,2l-1.7,1.1C10.3,3,10.1,2.9,9.8,2.8l-0.4-2H6.9
-	l-0.4,2C6.2,2.9,6,3,5.7,3.2L4,2L2.2,3.8l1.2,1.7C3.3,5.8,3.2,6,3.1,6.3L1,6.7v2.5l2,0.4c0.1,0.3,0.2,0.5,0.3,0.8l-1.2,1.7L4,13.8
-	l1.7-1.2C6,12.8,6.2,12.9,6.5,13L6.9,15h2.5L9.8,13c0.3-0.1,0.5-0.2,0.8-0.3l1.7,1.2l1.7-1.7l-1.2-1.7c0.1-0.3,0.2-0.5,0.3-0.8
-	L15.3,9.2z M8.1,9.9c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2C10.1,9,9.2,9.9,8.1,9.9z"/>
-<g class="st0">
-	<g class="st1">
-		<path class="st4" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
-			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
-	</g>
-	<rect x="2.7" y="2.3" class="st2" width="4.9" height="2.6"/>
-</g>
-<path class="st0" d="M1.5,4.1c0,0,4.3-3.9,8.4-1.4c4.1,2.4,5.4,5.6,3.6,7.9C11.4,7.4,10.3,5.8,6,4.5c0,0,6.8,4.3,8,9.3
-	c-0.2,1.1-1.2,0.3-1.2,0.3l-1.1-1.8c0,0-2.1,1.6-4.6-0.5C2.9,8.1,6.2,4,1.5,4.1z"/>
-<path class="st0" d="M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4L1.2,5.8C0.8,5.9,0.7,6,0.7,6.2c0,0.1,0.1,0.3,0.2,0.4l3.2,3.1l-0.8,4.4
-	c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1
-	c0.1,0,0.2,0,0.3-0.1s0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2l-0.8-4.4l3.2-3.1c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.4-0.6
-	l-2-4C8.3,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-<g class="st0">
-	<circle class="st5" cx="8" cy="8" r="6.6"/>
-	<circle class="st1" cx="8" cy="8" r="0.8"/>
-	<circle class="st5" cx="8" cy="8" r="2.1"/>
-	<path class="st1" d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8
-		c0,0.8,0.2,1.6,0.4,2.4l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
-	<path class="st1" d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14
-		C6.1,14.4,7,14.6,8,14.6c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
-</g>
-<g class="st0">
-	<rect x="2" y="1.9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="9" class="st1" width="5" height="5"/>
-	<rect x="2" y="9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
-</g>
-<circle class="st6" cx="6.9" cy="7" r="4.5"/>
-<line class="st7" x1="10.2" y1="9.9" x2="14.5" y2="14.2"/>
-<polyline class="st8" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st8" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st9" width="2.3" height="2.3"/>
-	<line class="st10" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st10" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st10" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st10" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st10" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st10" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st9" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st9" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st9" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st9" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st9" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st11" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st11" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st11" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-		<path class="st12" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-	</g>
-	<g class="st1">
-		<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
-			c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-		<path class="st12" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0
-			c-0.7,0.7-1,2.1-1,2.1c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-	</g>
-</g>
+<circle class="st0" cx="6.9" cy="7" r="4.5"/>
+<line class="st1" x1="10.2" y1="9.9" x2="14.5" y2="14.2"/>
 </svg>
diff --git a/src/assets/icons/star.svg b/src/assets/icons/star.svg
index 0f91a704..fa60b398 100755
--- a/src/assets/icons/star.svg
+++ b/src/assets/icons/star.svg
@@ -2,151 +2,8 @@
 <!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <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="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{fill:#FFFFFF;}
-	.st3{display:inline;fill:#FFFFFF;}
-	.st4{display:none;fill:#FFFFFF;}
-	.st5{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st6{display:inline;fill:none;stroke:#FFFFFF;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st7{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st8{display:inline;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
-	.st9{display:inline;fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-	.st10{display:inline;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
-	
-		.st11{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st12{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
-	.st13{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
-	.st14{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
-	.st15{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
-</style>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M3.9,3.2L11,7.9l-7.2,4.7V3.2 M2.5,0.5v14.8l11.1-7.4L2.5,0.5L2.5,0.5z"/>
-	</g>
-</g>
-<g class="st0">
-	<path class="st3" d="M8,2.1c3.2,0,5.8,2.6,5.8,5.8c0,3.2-2.6,5.8-5.8,5.8c-3.2,0-5.8-2.6-5.8-5.8C2.2,4.7,4.8,2.1,8,2.1 M8,0.7
-		c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7L8,0.7z"/>
-</g>
-<path class="st4" d="M6.5,6.4l-2.1,5.1l5.1-2.1l2.1-5.1L6.5,6.4z M8,8.8c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-	c0.5,0,0.8,0.4,0.8,0.8C8.9,8.4,8.5,8.8,8,8.8z"/>
-<g class="st0">
-	<circle class="st5" cx="8.1" cy="11.8" r="2.4"/>
-	<polyline class="st6" points="10.5,11.8 10.5,1.6 14.5,5.7 	"/>
-	<line class="st6" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
-	<line class="st6" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
-	<line class="st6" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
-</g>
-<g class="st0">
-	<circle class="st5" cx="12.3" cy="10.3" r="2.4"/>
-	<circle class="st5" cx="3.8" cy="12.3" r="2.4"/>
-	<polyline class="st6" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 	"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path class="st2" d="M7.9,6.9c0.5,0,1,0.4,1,1c0,0.5-0.4,1-1,1c-0.5,0-1-0.4-1-1C7,7.4,7.4,6.9,7.9,6.9 M7.9,5.8
-			c-1.2,0-2.1,0.9-2.1,2.1c0,1.2,0.9,2.1,2.1,2.1C9.1,10,10,9.1,10,7.9C10,6.8,9.1,5.8,7.9,5.8L7.9,5.8z"/>
-	</g>
-	<g class="st1">
-		<path class="st2" d="M7.9,4.2c2,0,3.7,1.7,3.7,3.7c0,2-1.7,3.7-3.7,3.7c-2,0-3.7-1.7-3.7-3.7C4.3,5.9,5.9,4.2,7.9,4.2 M7.9,2.8
-			c-2.8,0-5.1,2.3-5.1,5.1S5.1,13,7.9,13c2.8,0,5.1-2.3,5.1-5.1S10.8,2.8,7.9,2.8L7.9,2.8z"/>
-	</g>
-	<g class="st1">
-		<g>
-			<polygon class="st2" points="9.3,12.8 6.5,12.8 6.5,14.9 9.3,14.9 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="9.3,1 6.5,1 6.5,3.1 9.3,3.1 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="3.1,6.6 1,6.6 1,9.3 3.1,9.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="15.1,6.6 12.8,6.6 12.8,9.3 15.1,9.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="3.5,10.4 2,11.9 4,13.9 5.5,12.3 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="11.9,2 10.4,3.5 12.3,5.5 13.8,4 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="4,2 2,4 3.5,5.5 5.5,3.5 			"/>
-		</g>
-		<g>
-			<polygon class="st2" points="12.3,10.4 10.4,12.3 11.9,13.9 13.8,11.9 			"/>
-		</g>
-	</g>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path class="st7" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
-			c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
-	</g>
-	<rect x="2.7" y="2.3" class="st8" width="4.9" height="2.6"/>
-</g>
-<path class="st0" d="M1.5,4.1c0,0,4.3-3.9,8.4-1.4c4.1,2.4,5.4,5.6,3.6,7.9C11.4,7.4,10.3,5.8,6,4.5c0,0,6.8,4.3,8,9.3
-	c-0.2,1.1-1.2,0.3-1.2,0.3l-1.1-1.8c0,0-2.1,1.6-4.6-0.5C2.9,8.1,6.2,4,1.5,4.1z"/>
 <path d="M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4L1.2,5.8C0.8,5.9,0.7,6,0.7,6.2c0,0.1,0.1,0.3,0.2,0.4l3.2,3.1l-0.8,4.4
-	c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1
-	c0.1,0,0.2,0,0.3-0.1s0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2l-0.8-4.4l3.2-3.1c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.4-0.6
-	l-2-4C8.3,0.9,8.2,0.8,8,0.8L8,0.8z"/>
-<g class="st0">
-	<circle class="st9" cx="8" cy="8" r="6.6"/>
-	<circle class="st1" cx="8" cy="8" r="0.8"/>
-	<circle class="st9" cx="8" cy="8" r="2.1"/>
-	<path class="st1" d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8
-		c0,0.8,0.2,1.6,0.4,2.4l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
-	<path class="st1" d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14
-		C6.1,14.4,7,14.6,8,14.6c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
-</g>
-<g class="st0">
-	<rect x="2" y="1.9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="9" class="st1" width="5" height="5"/>
-	<rect x="2" y="9" class="st1" width="5" height="5"/>
-	<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
-</g>
-<g class="st0">
-	<circle class="st1" cx="6.1" cy="6.2" r="5.3"/>
-	<line class="st10" x1="9.1" y1="8.8" x2="14.5" y2="14.2"/>
-</g>
-<polyline class="st11" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
-<polyline class="st11" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
-<g class="st0">
-	<rect x="2.1" y="3.3" class="st12" width="2.3" height="2.3"/>
-	<line class="st13" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
-	<line class="st13" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
-	<line class="st13" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
-	<line class="st13" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
-	<line class="st13" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
-	<line class="st13" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
-	<rect x="2.1" y="9.7" class="st12" width="2.3" height="2.3"/>
-</g>
-<g class="st0">
-	<rect x="2.8" y="2.7" class="st12" width="3.8" height="3.8"/>
-	<rect x="2.8" y="9.3" class="st12" width="3.8" height="3.8"/>
-	<rect x="9.5" y="2.7" class="st12" width="3.8" height="3.8"/>
-	<rect x="9.5" y="9.3" class="st12" width="3.8" height="3.8"/>
-</g>
-<g class="st0">
-	<line class="st14" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
-	<line class="st14" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
-	<line class="st14" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
-</g>
-<g class="st0">
-	<g class="st1">
-		<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-		<path class="st15" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
-			c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
-	</g>
-	<g class="st1">
-		<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
-			c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-		<path class="st15" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0
-			c-0.7,0.7-1,2.1-1,2.1c0,0.2,0,0.4,0.2,0.5L11,8z"/>
-	</g>
-</g>
+	c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3s0.2,0.1,0.3,0.1s0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1c0.1,0,0.2,0,0.3-0.1
+	s0.1-0.2,0.1-0.3s0-0.1,0-0.2l-0.8-4.4l3.2-3.1c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.4-0.6l-2-4C8.3,0.9,8.2,0.8,8,0.8
+	L8,0.8z"/>
 </svg>
diff --git a/src/js/views/library/LibraryBrowse.js b/src/js/views/library/LibraryBrowse.js
index 9c7bd8d9..145bb803 100755
--- a/src/js/views/library/LibraryBrowse.js
+++ b/src/js/views/library/LibraryBrowse.js
@@ -124,12 +124,12 @@ class LibraryBrowse extends React.Component{
 				{
 					name: 'Local artists',
 					link: global.baseURL+'library/local/artists',
-					icons: ['assets/backgrounds/category-artists.jpg']
+					icons: ['assets/backgrounds/browse-artists.jpg']
 				},
 				{
 					name: 'Local albums',
 					link: global.baseURL+'library/local/albums',
-					icons: ['assets/backgrounds/category-albums.jpg']
+					icons: ['assets/backgrounds/browse-albums.jpg']
 				}
 			]
 
@@ -139,16 +139,28 @@ class LibraryBrowse extends React.Component{
 
 					switch (directory.name){
 						case 'Files':
-							directory.icons = ['assets/backgrounds/category-folders.jpg']
+							directory.icons = ['assets/backgrounds/browse-folders.jpg']
+							break
+
+						case 'Local media':
+							directory.icons = ['assets/backgrounds/browse-folders.jpg']
+							break
+
+						case 'Spotify':
+							directory.icons = ['assets/backgrounds/browse-spotify.jpg']
+							break
+
+						case 'Tunigo':
+							directory.icons = ['assets/backgrounds/browse-tunigo.jpg']
 							break
 
 						default:
-							directory.icons = ['assets/backgrounds/category-albums.jpg']
+							directory.icons = ['assets/backgrounds/browse-albums.jpg']
 					}
 
 					grid_items.push({
 						name: directory.name,
-						link: global.baseURL+'library/browse/'+directory.uri,
+						link: global.baseURL+'library/browse/'+directory.uri.replace('?','|').replace('/','%2F'),
 						icons: directory.icons
 					})
 				}
diff --git a/src/scss/components/_debug.scss b/src/scss/components/_debug.scss
index 0e7a92e4..a6952131 100755
--- a/src/scss/components/_debug.scss
+++ b/src/scss/components/_debug.scss
@@ -2,12 +2,13 @@
 .debug-info {
 	font-size: 10px;
 	position: fixed;
-	top: 0;
-	right: 0;
+	top: 10px;
+	right: 10px;
+	border-radius: 3px;
 	z-index: 96;
 	padding: 10px;
-	background: rgba(0,0,0,0.5);
-	color: #FFFFFF;
+	background: rgba(10, 10, 10, 0.7);
+	color: $white;
 	pointer-events: none;
 	width: 200px;
 }
\ No newline at end of file