11 files changed, 45 insertions, 10 deletions
diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css
index 232733b95..862b2d2c7 100644
--- a/module/web/static/css/default/style.css
+++ b/module/web/static/css/default/style.css
@@ -117,18 +117,10 @@ header img.logo {
 
 .header_block {
     float: right;
-    margin: 12px 12px 0;
+    margin: 8px 8px 0;
     font-family: SansationRegular, sans-serif;
     color: #ffffff;
 }
-.icon_info {
-    padding-bottom: 5px;
-}
-
-.icon_info img {
-    margin-bottom: -4px;
-    padding-right: 5px;
-}
 
 #notification_div {
     position: absolute;
@@ -148,6 +140,48 @@ header img.logo {
     font-family: sans-serif
 }
 
+#speedmeter, #downloads{
+	height: 26px;
+	margin: 0 2px 4px 2px;
+}
+.header-icon, #check_reconnecting, #check_downloading{
+	padding: 0;
+	margin: 0 4px 3px 0;
+	float: left;
+	width: 26px;
+	height: 26px;
+}
+.header_text {
+	vertical-align: middle;
+}
+#downloads_icon {
+    background: url("../../img/default/queue-icon-white.png");
+}
+#speedmeter_icon {
+    background: url("../../img/default/speed-icon-white.png");
+}
+#button_settings {
+    background: url("../../img/default/gear-icon-white.png");
+}
+#button_user {
+    background: url("../../img/default/user-icon-white.png");
+}
+
+.pyload-icon-reconnecting-activated {
+    background: url("../../img/default/reconnecting-icon-green.png");
+}
+.pyload-icon-reconnecting-deactivated {
+    background: url("../../img/default/reconnecting-icon-red.png");
+}
+
+.pyload-icon-downloading-activated {
+    background: url("../../img/default/downloading-icon-green.png");
+}
+.pyload-icon-downloading-deactivated {
+    background: url("../../img/default/downloading-icon-red.png");
+}
+
+
 /*
     Footer
 */
@@ -209,4 +243,5 @@ footer h2 {
     line-height: 16px;
     margin: 0;
     padding-bottom: 6px;
-}
-\ No newline at end of file
+}
+
diff --git a/module/web/static/img/default/downloading-icon-green.png b/module/web/static/img/default/downloading-icon-green.png
new file mode 100644
index 000000000..3c65e5c71
--- /dev/null
+++ b/module/web/static/img/default/downloading-icon-green.png
diff --git a/module/web/static/img/default/downloading-icon-red.png b/module/web/static/img/default/downloading-icon-red.png
new file mode 100644
index 000000000..d332ebb57
--- /dev/null
+++ b/module/web/static/img/default/downloading-icon-red.png
diff --git a/module/web/static/img/default/gear-icon-white.png b/module/web/static/img/default/gear-icon-white.png
new file mode 100644
index 000000000..3a41217b2
--- /dev/null
+++ b/module/web/static/img/default/gear-icon-white.png
diff --git a/module/web/static/img/default/icon_clock_small_white.png b/module/web/static/img/default/icon_clock_small_white.png
deleted file mode 100644
index 9e6c9bdd0..000000000
--- a/module/web/static/img/default/icon_clock_small_white.png
+++ /dev/null
diff --git a/module/web/static/img/default/icon_speed_small_white.png b/module/web/static/img/default/icon_speed_small_white.png
deleted file mode 100644
index ac86514ca..000000000
--- a/module/web/static/img/default/icon_speed_small_white.png
+++ /dev/null
diff --git a/module/web/static/img/default/queue-icon-white.png b/module/web/static/img/default/queue-icon-white.png
new file mode 100644
index 000000000..2dd520607
--- /dev/null
+++ b/module/web/static/img/default/queue-icon-white.png
diff --git a/module/web/static/img/default/reconnecting-icon-green.png b/module/web/static/img/default/reconnecting-icon-green.png
new file mode 100644
index 000000000..209a80348
--- /dev/null
+++ b/module/web/static/img/default/reconnecting-icon-green.png
diff --git a/module/web/static/img/default/reconnecting-icon-red.png b/module/web/static/img/default/reconnecting-icon-red.png
new file mode 100644
index 000000000..04f7ce018
--- /dev/null
+++ b/module/web/static/img/default/reconnecting-icon-red.png
diff --git a/module/web/static/img/default/speed-icon-white.png b/module/web/static/img/default/speed-icon-white.png
new file mode 100644
index 000000000..dc0fd6866
--- /dev/null
+++ b/module/web/static/img/default/speed-icon-white.png
diff --git a/module/web/static/img/default/user-icon-white.png b/module/web/static/img/default/user-icon-white.png
new file mode 100644
index 000000000..e062d7c87
--- /dev/null
+++ b/module/web/static/img/default/user-icon-white.png