diff --git a/src/resources/icons/expand.svg b/src/resources/icons/expand.svg
index 53ed9a2f..81e4759c 100644
--- a/src/resources/icons/expand.svg
+++ b/src/resources/icons/expand.svg
@@ -3,10 +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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<g>
-	<polygon style="fill:#000000" points="274,209.7 337.9,145.9 288,96 416,96 416,224 366.1,174.1 302.3,238 	"/>
-	<polygon style="fill:#000000" points="274,302.3 337.9,366.1 288,416 416,416 416,288 366.1,337.9 302.3,274 	"/>
-	<polygon style="fill:#000000" points="238,302.3 174.1,366.1 224,416 96,416 96,288 145.9,337.9 209.7,274 	"/>
-	<polygon style="fill:#000000" points="238,209.7 174.1,145.9 224,96 96,96 96,224 145.9,174.1 209.7,238 	"/>
-</g>
+<polygon fill="#000000" points="288,96 337.9,145.9 274,209.7 274,209.7 145.9,337.9 96,288 96,416 224,416 174.1,366.1 357.4,182.9 366.1,174.1 
+	416,224 416,96 "/>
 </svg>
diff --git a/src/resources/icons/fullscreen.svg b/src/resources/icons/fullscreen.svg
index 44ccece4..53ed9a2f 100644
--- a/src/resources/icons/fullscreen.svg
+++ b/src/resources/icons/fullscreen.svg
@@ -1,7 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.2.1, 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"
-	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path style="fill:#000000" d="M496,384V96H16v288h175v16h-64v16h257v-16h-64v-16H496z M32,112h448v256H32V112z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, 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"
+	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+	<polygon style="fill:#000000" points="274,209.7 337.9,145.9 288,96 416,96 416,224 366.1,174.1 302.3,238 	"/>
+	<polygon style="fill:#000000" points="274,302.3 337.9,366.1 288,416 416,416 416,288 366.1,337.9 302.3,274 	"/>
+	<polygon style="fill:#000000" points="238,302.3 174.1,366.1 224,416 96,416 96,288 145.9,337.9 209.7,274 	"/>
+	<polygon style="fill:#000000" points="238,209.7 174.1,145.9 224,96 96,96 96,224 145.9,174.1 209.7,238 	"/>
+</g>
+</svg>
diff --git a/src/resources/icons/universal_entry_tb.svg b/src/resources/icons/universal_entry_tb.svg
index 85a06a8a..fb1aa0dd 100644
--- a/src/resources/icons/universal_entry_tb.svg
+++ b/src/resources/icons/universal_entry_tb.svg
@@ -1,11 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.2.1, 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"
-	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path style="fill:#000000" d="M256,32C132.3,32,32,132.3,32,256c0,123.7,100.3,224,224,224c123.7,0,224-100.3,224-224C480,132.3,379.7,32,256,32z
-	 M391.8,391.8c-32.5,32.5-74.6,51.9-119.8,55.6L264,384h-16l-7.9,63.3c-45.3-3.7-87.4-23.1-119.8-55.6
-	c-32.5-32.5-51.9-74.6-55.6-119.8L128,264v-16l-63.3-7.9c3.7-45.3,23.1-87.4,55.6-119.8c32.5-32.5,74.6-51.9,119.8-55.6L248,128h16
-	l7.9-63.3c45.3,3.7,87.4,23.1,119.8,55.6c32.5,32.5,51.9,74.6,55.6,119.8L384,248v16l63.3,7.9C443.6,317.2,424.2,359.3,391.8,391.8z
-	"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, 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"
+	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<polygon fill="#000000" points="96,288 243,288 191.9,480 416,224 269,224 320,32 "/>
+</svg>