diff --git a/gui/widgets/ServerStatus.cpp b/gui/widgets/ServerStatus.cpp
index 10ed79fb..3b02fd24 100644
--- a/gui/widgets/ServerStatus.cpp
+++ b/gui/widgets/ServerStatus.cpp
@@ -17,6 +17,7 @@ ServerStatus::ServerStatus(QWidget *parent, Qt::WindowFlags f) : QWidget(parent,
 	layout = new QHBoxLayout(this);
 	layout->setContentsMargins(0, 0, 0, 0);
 	goodIcon = QIcon::fromTheme("status-good");
+	yellowIcon = QIcon::fromTheme("status-yellow");
 	badIcon = QIcon::fromTheme("status-bad");
 
 	addStatus("minecraft.net", tr("Web"));
@@ -78,32 +79,44 @@ void ServerStatus::addStatus(QString key, QString name)
 	}
 }
 
-void ServerStatus::setStatus(QString key, bool value)
+void ServerStatus::setStatus(QString key, int value)
 {
 	if (!serverLabels.contains(key))
 		return;
 	IconLabel *label = serverLabels[key];
-	label->setIcon(value ? goodIcon : badIcon);
+	switch(value)
+	{
+		case 0:
+			label->setIcon(goodIcon);
+			break;
+		case 1:
+			label->setIcon(yellowIcon);
+			break;
+		default:
+		case 2:
+			label->setIcon(badIcon);
+			break;
+	}
 }
 
 void ServerStatus::StatusChanged(const QMap<QString, QString> statusEntries)
 {
-	auto convertStatus = [&](QString status)->bool
+	auto convertStatus = [&](QString status)->int
 	{
 		if (status == "green")
-			return true;
+			return 0;
 		else if (status == "yellow")
-			return false;
+			return 1;
 		else if (status == "red")
-			return false;
-		return false;
+			return 2;
+		return 2;
 	}
 	;
 	auto iter = statusEntries.begin();
 	while (iter != statusEntries.end())
 	{
 		QString key = iter.key();
-		bool value = convertStatus(iter.value());
+		auto value = convertStatus(iter.value());
 		setStatus(key, value);
 		iter++;
 	}
diff --git a/gui/widgets/ServerStatus.h b/gui/widgets/ServerStatus.h
index 2244031b..1c6ae428 100644
--- a/gui/widgets/ServerStatus.h
+++ b/gui/widgets/ServerStatus.h
@@ -24,11 +24,12 @@ public slots:
 private: /* methods */
 	void addLine();
 	void addStatus(QString key, QString name);
-	void setStatus(QString key, bool value);
+	void setStatus(QString key, int value);
 private: /* data */
 	QHBoxLayout * layout = nullptr;
 	QToolButton *m_statusRefresh = nullptr;
 	QMap<QString, IconLabel *> serverLabels;
 	QIcon goodIcon;
+	QIcon yellowIcon;
 	QIcon badIcon;
 };
diff --git a/resources/OSX/OSX.qrc b/resources/OSX/OSX.qrc
index 24e1a0bf..20c71eb8 100644
--- a/resources/OSX/OSX.qrc
+++ b/resources/OSX/OSX.qrc
@@ -29,6 +29,7 @@
 		<file>scalable/settings.svg</file>
 		<file>scalable/status-bad.svg</file>
 		<file>scalable/status-good.svg</file>
+		<file>scalable/status-yellow.svg</file>
 		<file>scalable/viewfolder.svg</file>
 	</qresource>
 </RCC>
diff --git a/resources/OSX/scalable/news.svg b/resources/OSX/scalable/news.svg
index bd9a3f0b..b8ce3cd1 100644
--- a/resources/OSX/scalable/news.svg
+++ b/resources/OSX/scalable/news.svg
@@ -2,13 +2,15 @@
 <!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Calque_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" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M13,13H7l-2,3l-2-3l0,0c-1.7,0-3-1.3-3-3V3c0-1.7,1.3-3,3-3h10
-	c1.7,0,3,1.3,3,3v7C16,11.7,14.7,13,13,13z"/>
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#F2F2F2" d="M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v14c0,1.1,0.9,2,2,2h1.3
+	l2.7,4l2.7-4H26c1.1,0,2-0.9,2-2V6z"/>
 <g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#585858" d="M13,0H3C1.3,0,0,1.3,0,3v7c0,1.7,1.3,3,3,3l2,3l2-3h6
-			c1.7,0,3-1.3,3-3V3C16,1.3,14.7,0,13,0z M8,10H3V9h5V10z M13,8H3V7h10V8z M13,6H3V5h10V6z M13,4H3V3h10V4z"/>
-	</g>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#585858" d="M26,26H14l-4,6l-4-6c-3.3,0-6-2.7-6-6V6c0-3.3,2.7-6,6-6h20
+		c3.3,0,6,2.7,6,6v14C32,23.3,29.3,26,26,26z M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v14c0,1.1,0.9,2,2,2h1.3l2.7,4l2.7-4H26
+		c1.1,0,2-0.9,2-2V6z"/>
+	<rect x="8" y="12" fill-rule="evenodd" clip-rule="evenodd" fill="#585858" width="16" height="2"/>
+	<rect x="8" y="8" fill-rule="evenodd" clip-rule="evenodd" fill="#585858" width="16" height="2"/>
+	<rect x="8" y="16" fill-rule="evenodd" clip-rule="evenodd" fill="#585858" width="8" height="2"/>
 </g>
 </svg>
diff --git a/resources/OSX/scalable/status-bad.svg b/resources/OSX/scalable/status-bad.svg
index 3449fea3..add7a6f7 100644
--- a/resources/OSX/scalable/status-bad.svg
+++ b/resources/OSX/scalable/status-bad.svg
@@ -1,103 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-bad.svg">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#c10000;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#840000;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#750000;stop-opacity:1" />
-      <stop
-         style="stop-color:#810000;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#950000;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="10.429825"
-     inkscape:cx="19.535963"
-     inkscape:cy="27.534384"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12 0 C 5.352 0 0 5.352 0 12 L 0 52 C 0 58.648 5.352 64 12 64 L 52 64 C 58.648 64 64 58.648 64 52 L 64 12 C 64 5.352 58.648 0 52 0 L 12 0 z M 12 8 L 52 8 C 54.216 8 56 9.784 56 12 L 56 52 C 56 54.216 54.216 56 52 56 L 12 56 C 9.784 56 8 54.216 8 52 L 8 12 C 8 9.784 9.784 8 12 8 z M 23.09375 19 C 22.044339 19 20.988173 19.386827 20.1875 20.1875 C 18.586153 21.788847 18.586153 24.398653 20.1875 26 L 26.65625 32 L 20.1875 38 C 18.586153 39.601347 18.586153 42.211153 20.1875 43.8125 C 20.988173 44.613173 22.044339 45 23.09375 45 C 24.143161 45 25.199327 44.613173 26 43.8125 L 32 37.5 L 38 43.8125 C 38.800673 44.613173 39.856839 45 40.90625 45 C 41.955661 45 43.011827 44.613173 43.8125 43.8125 C 45.413847 42.211153 45.413847 39.601347 43.8125 38 L 37.34375 32 L 43.8125 26 C 45.413847 24.398653 45.413847 21.788847 43.8125 20.1875 C 43.011827 19.386827 41.955661 19 40.90625 19 C 39.856839 19 38.800673 19.386827 38 20.1875 L 32 26.5 L 26 20.1875 C 25.199327 19.386827 24.143161 19 23.09375 19 z "
-     id="rect2989" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#F2F2F2" d="M28,6c0-1.2-0.8-2-2-2H6C4.8,4,4,4.8,4,6v20c0,1.2,0.8,2,2,2h20c1.2,0,2-0.8,2-2V6z"/>
+<path fill="#585858" d="M26,32H6c-3.4,0-6-2.6-6-6V6c0-3.4,2.6-6,6-6h20c3.4,0,6,2.6,6,6v20C32,29.4,29.4,32,26,32z M28,6
+	c0-1.2-0.8-2-2-2H6C4.8,4,4,4.8,4,6v20c0,1.2,0.8,2,2,2h20c1.2,0,2-0.8,2-2V6z M21.6,21.6c-0.8,0.8-2,0.8-2.8,0L16,18.8l-2.8,2.8
+	c-0.8,0.8-2,0.8-2.8,0c-0.8-0.8-0.8-2,0-2.8l2.8-2.8l-2.8-2.8c-0.8-0.8-0.8-2,0-2.8c0.8-0.8,2-0.8,2.8,0l2.8,2.8l2.8-2.8
+	c0.8-0.8,2-0.8,2.8,0s0.8,2,0,2.8L18.8,16l2.8,2.8C22.4,19.6,22.4,20.8,21.6,21.6z"/>
 </svg>
diff --git a/resources/OSX/scalable/status-good.svg b/resources/OSX/scalable/status-good.svg
index a5bf5c0b..f10da757 100644
--- a/resources/OSX/scalable/status-good.svg
+++ b/resources/OSX/scalable/status-good.svg
@@ -1,114 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-good.png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#00c016;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#00820f;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#00730d;stop-opacity:1" />
-      <stop
-         style="stop-color:#007e0e;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#009511;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3020"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,-9.9999994e-8)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="7.375"
-     inkscape:cx="50.974601"
-     inkscape:cy="27.721167"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12,0 C 5.352,0 0,5.352 0,12 l 0,40 c 0,6.648 5.352,12 12,12 l 40,0 c 6.648,0 12,-5.352 12,-12 L 64,12 C 64,5.352 58.648,0 52,0 L 12,0 z m 0,8 40,0 c 2.216,0 4,1.784 4,4 l 0,40 c 0,2.216 -1.784,4 -4,4 L 12,56 C 9.784,56 8,54.216 8,52 L 8,12 C 8,9.784 9.784,8 12,8 z m 32.5,11 c -1.15165,0 -2.30882,0.43382 -3.1875,1.3125 l -13.75,13.8125 -4.875,-4.8125 c -1.757359,-1.757359 -4.617641,-1.757359 -6.375,0 -1.757359,1.757359 -1.757359,4.617641 0,6.375 l 8,7.5 c 1.75736,1.757359 4.61764,1.757359 6.375,0 l 17,-16.5 c 1.75736,-1.757359 1.75736,-4.617641 0,-6.375 C 46.80882,19.43382 45.65165,19 44.5,19 z"
-     id="rect2989"
-     inkscape:connector-curvature="0" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#F2F2F2" d="M28,26c0,1.2-0.8,2-2,2H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z"/>
+<g>
+	<path fill="none" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z M28,26c0,1.2-0.8,2-2,2
+		H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2
+		c0.8,0.8,2,0.8,2.8,0l8.4-8.4c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
+</g>
+<g>
+	<g>
+		<path fill="#585858" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z M28,26
+			c0,1.2-0.8,2-2,2H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0
+			s-0.8,2,0,2.8l4.2,4.2c0.8,0.8,2,0.8,2.8,0l8.4-8.4c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
+	</g>
+</g>
 </svg>
diff --git a/resources/OSX/scalable/status-yellow.svg b/resources/OSX/scalable/status-yellow.svg
new file mode 100644
index 00000000..fba697bc
--- /dev/null
+++ b/resources/OSX/scalable/status-yellow.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="#E3A333" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z M28,26
+		c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+</g>
+<path fill="#585858" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z"/>
+<path fill="#F2F2F2" d="M28,26c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+<g>
+	<path fill="#585858" d="M6,20c0-5.8,2.4-7.9,5.8-7.9c2,0,3.4,0.7,5.3,1.9c1.6,1,2.5,1.5,3.3,1.5c0.7,0,1.2-0.7,1.3-3.1H26
+		c0.2,6.1-2.3,8-5.5,8c-2,0-3.5-0.8-5.3-1.9c-1.7-1-2.6-1.6-3.3-1.6c-0.8,0-1.4,0.5-1.6,3.2H6z"/>
+</g>
+</svg>
diff --git a/resources/iOS/iOS.qrc b/resources/iOS/iOS.qrc
index 6bfcef6d..eb625d0b 100644
--- a/resources/iOS/iOS.qrc
+++ b/resources/iOS/iOS.qrc
@@ -29,6 +29,7 @@
 		<file>scalable/settings.svg</file>
 		<file>scalable/status-bad.svg</file>
 		<file>scalable/status-good.svg</file>
+		<file>scalable/status-yellow.svg</file>
 		<file>scalable/viewfolder.svg</file>
 	</qresource>
 </RCC>
diff --git a/resources/iOS/scalable/news.svg b/resources/iOS/scalable/news.svg
index 79b62626..d3c010bb 100644
--- a/resources/iOS/scalable/news.svg
+++ b/resources/iOS/scalable/news.svg
@@ -2,14 +2,13 @@
 <!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Calque_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" enable-background="new 0 0 16 16" xml:space="preserve">
-<g id="_x35__21_">
-	<g>
-		<path fill="#3366CC" d="M12,7H4C3.7,7,3.5,7.2,3.5,7.5C3.5,7.8,3.7,8,4,8h8c0.3,0,0.5-0.2,0.5-0.5C12.5,7.2,12.3,7,12,7z M12,10H4
-			c-0.3,0-0.5,0.2-0.5,0.5C3.5,10.8,3.7,11,4,11h8c0.3,0,0.5-0.2,0.5-0.5C12.5,10.2,12.3,10,12,10z M12,4H4C3.7,4,3.5,4.2,3.5,4.5
-			C3.5,4.8,3.7,5,4,5h8c0.3,0,0.5-0.2,0.5-0.5C12.5,4.2,12.3,4,12,4z M14,0H2C0.9,0,0,1,0,2.1V14c0,1.1,0.9,2,2,2h11.9
-			c1.1,0,2.1-0.9,2.1-2V2C16,0.9,15.1,0,14,0z M15,14c0,0.5-0.5,1-1.1,1H2c-0.5,0-1-0.4-1-1V2.1C1,1.5,1.5,1,2,1h12c0.5,0,1,0.5,1,1
-			V14z"/>
-	</g>
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#3366CC" d="M26,26H14l-4,6l-4-6c-3.3,0-6-2.7-6-6V6c0-3.3,2.7-6,6-6h20
+		c3.3,0,6,2.7,6,6v14C32,23.3,29.3,26,26,26z M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v14c0,1.1,0.9,2,2,2h1.3l2.7,4l2.7-4H26
+		c1.1,0,2-0.9,2-2V6z"/>
+	<rect x="8" y="12" fill-rule="evenodd" clip-rule="evenodd" fill="#3366CC" width="16" height="2"/>
+	<rect x="8" y="8" fill-rule="evenodd" clip-rule="evenodd" fill="#3366CC" width="16" height="2"/>
+	<rect x="8" y="16" fill-rule="evenodd" clip-rule="evenodd" fill="#3366CC" width="8" height="2"/>
 </g>
 </svg>
diff --git a/resources/iOS/scalable/status-bad.svg b/resources/iOS/scalable/status-bad.svg
index 3449fea3..4019c8da 100644
--- a/resources/iOS/scalable/status-bad.svg
+++ b/resources/iOS/scalable/status-bad.svg
@@ -1,103 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-bad.svg">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#c10000;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#840000;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#750000;stop-opacity:1" />
-      <stop
-         style="stop-color:#810000;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#950000;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="10.429825"
-     inkscape:cx="19.535963"
-     inkscape:cy="27.534384"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12 0 C 5.352 0 0 5.352 0 12 L 0 52 C 0 58.648 5.352 64 12 64 L 52 64 C 58.648 64 64 58.648 64 52 L 64 12 C 64 5.352 58.648 0 52 0 L 12 0 z M 12 8 L 52 8 C 54.216 8 56 9.784 56 12 L 56 52 C 56 54.216 54.216 56 52 56 L 12 56 C 9.784 56 8 54.216 8 52 L 8 12 C 8 9.784 9.784 8 12 8 z M 23.09375 19 C 22.044339 19 20.988173 19.386827 20.1875 20.1875 C 18.586153 21.788847 18.586153 24.398653 20.1875 26 L 26.65625 32 L 20.1875 38 C 18.586153 39.601347 18.586153 42.211153 20.1875 43.8125 C 20.988173 44.613173 22.044339 45 23.09375 45 C 24.143161 45 25.199327 44.613173 26 43.8125 L 32 37.5 L 38 43.8125 C 38.800673 44.613173 39.856839 45 40.90625 45 C 41.955661 45 43.011827 44.613173 43.8125 43.8125 C 45.413847 42.211153 45.413847 39.601347 43.8125 38 L 37.34375 32 L 43.8125 26 C 45.413847 24.398653 45.413847 21.788847 43.8125 20.1875 C 43.011827 19.386827 41.955661 19 40.90625 19 C 39.856839 19 38.800673 19.386827 38 20.1875 L 32 26.5 L 26 20.1875 C 25.199327 19.386827 24.143161 19 23.09375 19 z "
-     id="rect2989" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#3366CC" d="M26,32H6c-3.4,0-6-2.6-6-6V6c0-3.4,2.6-6,6-6h20c3.4,0,6,2.6,6,6v20C32,29.4,29.4,32,26,32z M28,6
+	c0-1.2-0.8-2-2-2H6C4.8,4,4,4.8,4,6v20c0,1.2,0.8,2,2,2h20c1.2,0,2-0.8,2-2V6z M21.6,21.6c-0.8,0.8-2,0.8-2.8,0L16,18.8l-2.8,2.8
+	c-0.8,0.8-2,0.8-2.8,0c-0.8-0.8-0.8-2,0-2.8l2.8-2.8l-2.8-2.8c-0.8-0.8-0.8-2,0-2.8c0.8-0.8,2-0.8,2.8,0l2.8,2.8l2.8-2.8
+	c0.8-0.8,2-0.8,2.8,0s0.8,2,0,2.8L18.8,16l2.8,2.8C22.4,19.6,22.4,20.8,21.6,21.6z"/>
 </svg>
diff --git a/resources/iOS/scalable/status-good.svg b/resources/iOS/scalable/status-good.svg
index a5bf5c0b..e1859113 100644
--- a/resources/iOS/scalable/status-good.svg
+++ b/resources/iOS/scalable/status-good.svg
@@ -1,114 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-good.png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#00c016;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#00820f;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#00730d;stop-opacity:1" />
-      <stop
-         style="stop-color:#007e0e;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#009511;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3020"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,-9.9999994e-8)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="7.375"
-     inkscape:cx="50.974601"
-     inkscape:cy="27.721167"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12,0 C 5.352,0 0,5.352 0,12 l 0,40 c 0,6.648 5.352,12 12,12 l 40,0 c 6.648,0 12,-5.352 12,-12 L 64,12 C 64,5.352 58.648,0 52,0 L 12,0 z m 0,8 40,0 c 2.216,0 4,1.784 4,4 l 0,40 c 0,2.216 -1.784,4 -4,4 L 12,56 C 9.784,56 8,54.216 8,52 L 8,12 C 8,9.784 9.784,8 12,8 z m 32.5,11 c -1.15165,0 -2.30882,0.43382 -3.1875,1.3125 l -13.75,13.8125 -4.875,-4.8125 c -1.757359,-1.757359 -4.617641,-1.757359 -6.375,0 -1.757359,1.757359 -1.757359,4.617641 0,6.375 l 8,7.5 c 1.75736,1.757359 4.61764,1.757359 6.375,0 l 17,-16.5 c 1.75736,-1.757359 1.75736,-4.617641 0,-6.375 C 46.80882,19.43382 45.65165,19 44.5,19 z"
-     id="rect2989"
-     inkscape:connector-curvature="0" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="none" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z M28,26c0,1.2-0.8,2-2,2
+		H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2
+		c0.8,0.8,2,0.8,2.8,0l8.4-8.4c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
+</g>
+<g>
+	<g>
+		<path fill="#3366CC" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z M28,26
+			c0,1.2-0.8,2-2,2H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0
+			s-0.8,2,0,2.8l4.2,4.2c0.8,0.8,2,0.8,2.8,0l8.4-8.4c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
+	</g>
+</g>
 </svg>
diff --git a/resources/iOS/scalable/status-yellow.svg b/resources/iOS/scalable/status-yellow.svg
new file mode 100644
index 00000000..d8a28e23
--- /dev/null
+++ b/resources/iOS/scalable/status-yellow.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="status-yellow.svg"><metadata
+     id="metadata19"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs17" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="1030"
+     id="namedview15"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="25.957106"
+     inkscape:cy="16"
+     inkscape:window-x="-4"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Calque_1" /><g
+     id="g3"><path
+       fill="#E3A333"
+       d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z M28,26   c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"
+       id="path5" /></g><path
+     d="M 6 0 C 2.7 0 0 2.7 0 6 L 0 26 C 0 29.3 2.7 32 6 32 L 26 32 C 29.3 32 32 29.3 32 26 L 32 6 C 32 2.7 29.3 0 26 0 L 6 0 z M 6 4 L 26 4 C 27.1 4 28 4.9 28 6 L 28 26 C 28 27.1 27.1 28 26 28 L 6 28 C 4.9 28 4 27.1 4 26 L 4 6 C 4 4.9 4.9 4 6 4 z "
+     id="path7"
+     style="fill:#3366cc;fill-opacity:1" /><g
+     id="g11"><path
+       fill="#3366CC"
+       d="M6,20c0-5.8,2.4-7.9,5.8-7.9c2,0,3.4,0.7,5.3,1.9c1.6,1,2.5,1.5,3.3,1.5c0.7,0,1.2-0.7,1.3-3.1H26   c0.2,6.1-2.3,8-5.5,8c-2,0-3.5-0.8-5.3-1.9c-1.7-1-2.6-1.6-3.3-1.6c-0.8,0-1.4,0.5-1.6,3.2H6z"
+       id="path13" /></g></svg>
\ No newline at end of file
diff --git a/resources/multimc/16x16/status-yellow.png b/resources/multimc/16x16/status-yellow.png
new file mode 100644
index 00000000..b25375d1
Binary files /dev/null and b/resources/multimc/16x16/status-yellow.png differ
diff --git a/resources/multimc/22x22/status-yellow.png b/resources/multimc/22x22/status-yellow.png
new file mode 100644
index 00000000..481eb7f3
Binary files /dev/null and b/resources/multimc/22x22/status-yellow.png differ
diff --git a/resources/multimc/24x24/status-yellow.png b/resources/multimc/24x24/status-yellow.png
new file mode 100644
index 00000000..dd5fde67
Binary files /dev/null and b/resources/multimc/24x24/status-yellow.png differ
diff --git a/resources/multimc/32x32/status-yellow.png b/resources/multimc/32x32/status-yellow.png
new file mode 100644
index 00000000..42c68552
Binary files /dev/null and b/resources/multimc/32x32/status-yellow.png differ
diff --git a/resources/multimc/48x48/status-yellow.png b/resources/multimc/48x48/status-yellow.png
new file mode 100644
index 00000000..4f3b11d6
Binary files /dev/null and b/resources/multimc/48x48/status-yellow.png differ
diff --git a/resources/multimc/64x64/status-yellow.png b/resources/multimc/64x64/status-yellow.png
new file mode 100644
index 00000000..3d54d320
Binary files /dev/null and b/resources/multimc/64x64/status-yellow.png differ
diff --git a/resources/multimc/multimc.qrc b/resources/multimc/multimc.qrc
index 1713c50f..d02d0e0e 100644
--- a/resources/multimc/multimc.qrc
+++ b/resources/multimc/multimc.qrc
@@ -13,7 +13,7 @@
 
 		<!-- A proxy icon. Our own. SSSsss -->
 		<file>scalable/proxy.svg</file>
-		
+
 		<!-- Java icon. From Oracle, fixed because it was derpy. -->
 		<file>scalable/java.svg</file>
 
@@ -38,7 +38,7 @@
 		<file>32x32/bug.png</file>
 		<file>48x48/bug.png</file>
 		<file>64x64/bug.png</file>
-		
+
 		<!-- Screenshots. Our own. -->
 		<!-- frame is adapted and simplified from http://www.wpclipart.com/page_frames/picture_frames/golden_picture_frame.png.html -->
 		<file>16x16/screenshots.png</file>
@@ -63,7 +63,7 @@
 		<file>32x32/cat.png</file>
 		<file>48x48/cat.png</file>
 		<file>64x64/cat.png</file>
-		
+
 		<!-- Show mods folder. CC-BY-SA 3.0 http://openiconlibrary.sourceforge.net/gallery2/?./Icons/places/oxygen-style/folder-favorites.png -->
 		<file>scalable/centralmods.svg</file>
 		<file>16x16/centralmods.png</file>
@@ -86,7 +86,7 @@
 		<file>32x32/copy.png</file>
 		<file>48x48/copy.png</file>
 		<file>64x64/copy.png</file>
-		
+
 		<!-- Help. CC-BY-SA 3.0, http://openiconlibrary.sourceforge.net/gallery2/?./Icons/actions/help.png -->
 		<file>16x16/help.png</file>
 		<file>22x22/help.png</file>
@@ -124,13 +124,21 @@
 		<file>32x32/status-good.png</file>
 		<file>48x48/status-good.png</file>
 		<file>64x64/status-good.png</file>
-		
+
+		<!-- Yellow status. Whatever that means... Our own. -->
+		<file>16x16/status-yellow.png</file>
+		<file>24x24/status-yellow.png</file>
+		<file>22x22/status-yellow.png</file>
+		<file>32x32/status-yellow.png</file>
+		<file>48x48/status-yellow.png</file>
+		<file>64x64/status-yellow.png</file>
+
 		<!-- Plugin (blue recolor), CC-BY-SA 3.0, Oxygen icons. -->
 		<file>16x16/loadermods.png</file>
 		<file>24x24/loadermods.png</file>
 		<file>32x32/loadermods.png</file>
 		<file>64x64/loadermods.png</file>
-		
+
 		<!-- Plugin (red recolor), CC-BY-SA 3.0, Oxygen icons. -->
 		<file>16x16/jarmods.png</file>
 		<file>24x24/jarmods.png</file>
@@ -191,7 +199,7 @@
 		<file>32x32/log.png</file>
 		<file>48x48/log.png</file>
 		<file>64x64/log.png</file>
-		
+
 		<!-- placeholder when loading screenshot images -->
 		<file>scalable/screenshot-placeholder.svg</file>
     </qresource>
diff --git a/resources/multimc/scalable/status-yellow.svg b/resources/multimc/scalable/status-yellow.svg
new file mode 100644
index 00000000..140e6082
--- /dev/null
+++ b/resources/multimc/scalable/status-yellow.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="32"
+   height="32"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3827">
+      <stop
+         id="stop3829"
+         style="stop-color:#b80000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3831"
+         style="stop-color:#600000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3801">
+      <stop
+         id="stop3803"
+         style="stop-color:#f1ab00;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3805"
+         style="stop-color:#c39a00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3005">
+      <stop
+         id="stop3007"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3781"
+         style="stop-color:#ffffff;stop-opacity:0.49803922"
+         offset="0.8142857" />
+      <stop
+         id="stop3009"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter3797">
+      <feGaussianBlur
+         id="feGaussianBlur3799"
+         stdDeviation="0.52592593" />
+    </filter>
+    <radialGradient
+       cx="3.9371533"
+       cy="7.5016646"
+       r="2.5"
+       fx="3.9371533"
+       fy="7.5016646"
+       id="radialGradient3807"
+       xlink:href="#linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4496779,1.5407764,-0.90127514,0.84794135,4.9906134,-4.9255796)" />
+    <radialGradient
+       cx="3.9371533"
+       cy="7.5016646"
+       r="2.5"
+       fx="3.9371533"
+       fy="7.5016646"
+       id="radialGradient3823"
+       xlink:href="#linearGradient3827"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4496779,1.5407764,-0.90127514,0.84794135,4.9906134,-4.9255796)" />
+    <radialGradient
+       cx="3.9371533"
+       cy="7.5016646"
+       r="2.5"
+       fx="3.9371533"
+       fy="7.5016646"
+       id="radialGradient3786"
+       xlink:href="#linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4496779,1.5407764,-0.90127514,0.84794135,4.9906134,-4.9255796)" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-1020.3622)"
+     id="layer1">
+    <path
+       d="m 8,9.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
+       transform="matrix(6.4,0,0,6.4,-19.2,975.5622)"
+       id="path2997"
+       style="color:#000000;fill:url(#radialGradient3807);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="M 31,16 A 15,15 0 1 1 1,16 15,15 0 1 1 31,16 z"
+       transform="matrix(0.93333333,0,0,0.93333444,1.0666666,1021.4288)"
+       id="path2999"
+       style="color:#000000;fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g3010">
+      <path
+         d="m 7.5,1034.3622 17,0 0,4 -17,0 z"
+         id="path3787"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3797)" />
+      <path
+         d="m 7.5,1034.3622 17,0 0,4 -17,0 z"
+         id="path3001"
+         style="fill:#ffffff;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="m 7.5,1038.3622 0,-4 17,0 0,4 z"
+         id="path3809"
+         style="opacity:0.54887217;fill:#ffffff;stroke:none" />
+    </g>
+    <path
+       d="m 8,9.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
+       transform="matrix(6.4,0,0,6.4,-170.62857,989.56227)"
+       id="path3776"
+       style="color:#000000;fill:url(#radialGradient3786);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="M 31,16 A 15,15 0 1 1 1,16 15,15 0 1 1 31,16 z"
+       transform="matrix(0.93333333,0,0,0.93333444,-150.3619,1035.4289)"
+       id="path3778"
+       style="color:#000000;fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m -144.92857,1051.3623 3,-3 4.5,4.5 9.5,-9.5 3,3 -12.5,12.5 z"
+       id="path3780"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3797)" />
+    <path
+       d="m -144.92857,1051.3623 3,-3 4.5,4.5 9.5,-9.5 3,3 -12.5,12.5 z"
+       id="path3782"
+       style="fill:#ffffff;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="m -144.92857,1051.3623 3,-3 4.5,4.5 9.5,-9.5 3,3 -12.5,12.5 z"
+       id="path3784"
+       style="opacity:0.54887217;fill:#ffffff;stroke:none" />
+  </g>
+</svg>
diff --git a/resources/pe_blue/pe_blue.qrc b/resources/pe_blue/pe_blue.qrc
index 5fdfd317..a4525d2e 100644
--- a/resources/pe_blue/pe_blue.qrc
+++ b/resources/pe_blue/pe_blue.qrc
@@ -29,6 +29,7 @@
 		<file>scalable/settings.svg</file>
 		<file>scalable/status-bad.svg</file>
 		<file>scalable/status-good.svg</file>
+		<file>scalable/status-yellow.svg</file>
 		<file>scalable/viewfolder.svg</file>
 	</qresource>
 </RCC>
diff --git a/resources/pe_blue/scalable/status-bad.svg b/resources/pe_blue/scalable/status-bad.svg
index 3449fea3..4a48b5d8 100644
--- a/resources/pe_blue/scalable/status-bad.svg
+++ b/resources/pe_blue/scalable/status-bad.svg
@@ -1,103 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-bad.svg">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#c10000;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#840000;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#750000;stop-opacity:1" />
-      <stop
-         style="stop-color:#810000;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#950000;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="10.429825"
-     inkscape:cx="19.535963"
-     inkscape:cy="27.534384"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12 0 C 5.352 0 0 5.352 0 12 L 0 52 C 0 58.648 5.352 64 12 64 L 52 64 C 58.648 64 64 58.648 64 52 L 64 12 C 64 5.352 58.648 0 52 0 L 12 0 z M 12 8 L 52 8 C 54.216 8 56 9.784 56 12 L 56 52 C 56 54.216 54.216 56 52 56 L 12 56 C 9.784 56 8 54.216 8 52 L 8 12 C 8 9.784 9.784 8 12 8 z M 23.09375 19 C 22.044339 19 20.988173 19.386827 20.1875 20.1875 C 18.586153 21.788847 18.586153 24.398653 20.1875 26 L 26.65625 32 L 20.1875 38 C 18.586153 39.601347 18.586153 42.211153 20.1875 43.8125 C 20.988173 44.613173 22.044339 45 23.09375 45 C 24.143161 45 25.199327 44.613173 26 43.8125 L 32 37.5 L 38 43.8125 C 38.800673 44.613173 39.856839 45 40.90625 45 C 41.955661 45 43.011827 44.613173 43.8125 43.8125 C 45.413847 42.211153 45.413847 39.601347 43.8125 38 L 37.34375 32 L 43.8125 26 C 45.413847 24.398653 45.413847 21.788847 43.8125 20.1875 C 43.011827 19.386827 41.955661 19 40.90625 19 C 39.856839 19 38.800673 19.386827 38 20.1875 L 32 26.5 L 26 20.1875 C 25.199327 19.386827 24.143161 19 23.09375 19 z "
-     id="rect2989" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#C1272D" d="M26,32H6c-3.4,0-6-2.6-6-6V6c0-3.4,2.6-6,6-6h20c3.4,0,6,2.6,6,6v20C32,29.4,29.4,32,26,32z"/>
+<path fill="#FFFFFF" d="M21.6,21.6c-0.8,0.8-2,0.8-2.8,0L16,18.8l-2.8,2.8c-0.8,0.8-2,0.8-2.8,0c-0.8-0.8-0.8-2,0-2.8l2.8-2.8
+	l-2.8-2.8c-0.8-0.8-0.8-2,0-2.8c0.8-0.8,2-0.8,2.8,0l2.8,2.8l2.8-2.8c0.8-0.8,2-0.8,2.8,0s0.8,2,0,2.8L18.8,16l2.8,2.8
+	C22.4,19.6,22.4,20.8,21.6,21.6z"/>
 </svg>
diff --git a/resources/pe_blue/scalable/status-good.svg b/resources/pe_blue/scalable/status-good.svg
index a5bf5c0b..4cfa56f0 100644
--- a/resources/pe_blue/scalable/status-good.svg
+++ b/resources/pe_blue/scalable/status-good.svg
@@ -1,114 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-good.png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#00c016;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#00820f;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#00730d;stop-opacity:1" />
-      <stop
-         style="stop-color:#007e0e;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#009511;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3020"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,-9.9999994e-8)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="7.375"
-     inkscape:cx="50.974601"
-     inkscape:cy="27.721167"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12,0 C 5.352,0 0,5.352 0,12 l 0,40 c 0,6.648 5.352,12 12,12 l 40,0 c 6.648,0 12,-5.352 12,-12 L 64,12 C 64,5.352 58.648,0 52,0 L 12,0 z m 0,8 40,0 c 2.216,0 4,1.784 4,4 l 0,40 c 0,2.216 -1.784,4 -4,4 L 12,56 C 9.784,56 8,54.216 8,52 L 8,12 C 8,9.784 9.784,8 12,8 z m 32.5,11 c -1.15165,0 -2.30882,0.43382 -3.1875,1.3125 l -13.75,13.8125 -4.875,-4.8125 c -1.757359,-1.757359 -4.617641,-1.757359 -6.375,0 -1.757359,1.757359 -1.757359,4.617641 0,6.375 l 8,7.5 c 1.75736,1.757359 4.61764,1.757359 6.375,0 l 17,-16.5 c 1.75736,-1.757359 1.75736,-4.617641 0,-6.375 C 46.80882,19.43382 45.65165,19 44.5,19 z"
-     id="rect2989"
-     inkscape:connector-curvature="0" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="none" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z M28,26c0,1.2-0.8,2-2,2
+		H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2
+		c0.8,0.8,2,0.8,2.8,0l8.4-8.4c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
+</g>
+<path fill="#39B54A" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z"/>
+<path fill="#39B54A" d="M28,26c0,1.2-0.8,2-2,2H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z"/>
+<path fill="#FFFFFF" d="M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2c0.8,0.8,2,0.8,2.8,0l8.4-8.4
+	c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
 </svg>
diff --git a/resources/pe_blue/scalable/status-yellow.svg b/resources/pe_blue/scalable/status-yellow.svg
new file mode 100644
index 00000000..0551fed2
--- /dev/null
+++ b/resources/pe_blue/scalable/status-yellow.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="#E3A333" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z M28,26
+		c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+</g>
+<path fill="#E3A333" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z"/>
+<path fill="#E3A333" d="M28,26c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+<g>
+	<path fill="#FFFFFF" d="M6,20c0-5.8,2.4-7.9,5.8-7.9c2,0,3.4,0.7,5.3,1.9c1.6,1,2.5,1.5,3.3,1.5c0.7,0,1.2-0.7,1.3-3.1H26
+		c0.2,6.1-2.3,8-5.5,8c-2,0-3.5-0.8-5.3-1.9c-1.7-1-2.6-1.6-3.3-1.6c-0.8,0-1.4,0.5-1.6,3.2H6z"/>
+</g>
+</svg>
diff --git a/resources/pe_colored/pe_colored.qrc b/resources/pe_colored/pe_colored.qrc
index f89cf63f..7de8d5ab 100644
--- a/resources/pe_colored/pe_colored.qrc
+++ b/resources/pe_colored/pe_colored.qrc
@@ -29,6 +29,7 @@
 		<file>scalable/settings.svg</file>
 		<file>scalable/status-bad.svg</file>
 		<file>scalable/status-good.svg</file>
+		<file>scalable/status-yellow.svg</file>
 		<file>scalable/viewfolder.svg</file>
 	</qresource>
 </RCC>
diff --git a/resources/pe_colored/scalable/status-bad.svg b/resources/pe_colored/scalable/status-bad.svg
index 3449fea3..bc42c248 100644
--- a/resources/pe_colored/scalable/status-bad.svg
+++ b/resources/pe_colored/scalable/status-bad.svg
@@ -1,103 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-bad.svg">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#c10000;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#840000;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#750000;stop-opacity:1" />
-      <stop
-         style="stop-color:#810000;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#950000;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="10.429825"
-     inkscape:cx="19.535963"
-     inkscape:cy="27.534384"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12 0 C 5.352 0 0 5.352 0 12 L 0 52 C 0 58.648 5.352 64 12 64 L 52 64 C 58.648 64 64 58.648 64 52 L 64 12 C 64 5.352 58.648 0 52 0 L 12 0 z M 12 8 L 52 8 C 54.216 8 56 9.784 56 12 L 56 52 C 56 54.216 54.216 56 52 56 L 12 56 C 9.784 56 8 54.216 8 52 L 8 12 C 8 9.784 9.784 8 12 8 z M 23.09375 19 C 22.044339 19 20.988173 19.386827 20.1875 20.1875 C 18.586153 21.788847 18.586153 24.398653 20.1875 26 L 26.65625 32 L 20.1875 38 C 18.586153 39.601347 18.586153 42.211153 20.1875 43.8125 C 20.988173 44.613173 22.044339 45 23.09375 45 C 24.143161 45 25.199327 44.613173 26 43.8125 L 32 37.5 L 38 43.8125 C 38.800673 44.613173 39.856839 45 40.90625 45 C 41.955661 45 43.011827 44.613173 43.8125 43.8125 C 45.413847 42.211153 45.413847 39.601347 43.8125 38 L 37.34375 32 L 43.8125 26 C 45.413847 24.398653 45.413847 21.788847 43.8125 20.1875 C 43.011827 19.386827 41.955661 19 40.90625 19 C 39.856839 19 38.800673 19.386827 38 20.1875 L 32 26.5 L 26 20.1875 C 25.199327 19.386827 24.143161 19 23.09375 19 z "
-     id="rect2989" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#C1272D" d="M26,32H6c-3.4,0-6-2.6-6-6V6c0-3.4,2.6-6,6-6h20c3.4,0,6,2.6,6,6v20C32,29.2,29.4,32,26,32z"/>
+<path fill="#FFFFFF" d="M21.6,21.6c-0.8,0.8-2,0.8-2.8,0L16,18.8l-2.8,2.8c-0.8,0.8-2,0.8-2.8,0c-0.8-0.8-0.8-2,0-2.8l2.8-2.8
+	l-2.8-2.8c-0.8-0.8-0.8-2,0-2.8c0.8-0.8,2-0.8,2.8,0l2.8,2.8l2.8-2.8c0.8-0.8,2-0.8,2.8,0s0.8,2,0,2.8L18.8,16l2.8,2.8
+	C22.4,19.6,22.4,20.8,21.6,21.6z"/>
 </svg>
diff --git a/resources/pe_colored/scalable/status-good.svg b/resources/pe_colored/scalable/status-good.svg
index a5bf5c0b..4cfa56f0 100644
--- a/resources/pe_colored/scalable/status-good.svg
+++ b/resources/pe_colored/scalable/status-good.svg
@@ -1,114 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-good.png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#00c016;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#00820f;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#00730d;stop-opacity:1" />
-      <stop
-         style="stop-color:#007e0e;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#009511;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3020"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,-9.9999994e-8)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="7.375"
-     inkscape:cx="50.974601"
-     inkscape:cy="27.721167"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12,0 C 5.352,0 0,5.352 0,12 l 0,40 c 0,6.648 5.352,12 12,12 l 40,0 c 6.648,0 12,-5.352 12,-12 L 64,12 C 64,5.352 58.648,0 52,0 L 12,0 z m 0,8 40,0 c 2.216,0 4,1.784 4,4 l 0,40 c 0,2.216 -1.784,4 -4,4 L 12,56 C 9.784,56 8,54.216 8,52 L 8,12 C 8,9.784 9.784,8 12,8 z m 32.5,11 c -1.15165,0 -2.30882,0.43382 -3.1875,1.3125 l -13.75,13.8125 -4.875,-4.8125 c -1.757359,-1.757359 -4.617641,-1.757359 -6.375,0 -1.757359,1.757359 -1.757359,4.617641 0,6.375 l 8,7.5 c 1.75736,1.757359 4.61764,1.757359 6.375,0 l 17,-16.5 c 1.75736,-1.757359 1.75736,-4.617641 0,-6.375 C 46.80882,19.43382 45.65165,19 44.5,19 z"
-     id="rect2989"
-     inkscape:connector-curvature="0" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="none" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z M28,26c0,1.2-0.8,2-2,2
+		H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2
+		c0.8,0.8,2,0.8,2.8,0l8.4-8.4c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
+</g>
+<path fill="#39B54A" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z"/>
+<path fill="#39B54A" d="M28,26c0,1.2-0.8,2-2,2H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z"/>
+<path fill="#FFFFFF" d="M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2c0.8,0.8,2,0.8,2.8,0l8.4-8.4
+	c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
 </svg>
diff --git a/resources/pe_colored/scalable/status-yellow.svg b/resources/pe_colored/scalable/status-yellow.svg
new file mode 100644
index 00000000..0551fed2
--- /dev/null
+++ b/resources/pe_colored/scalable/status-yellow.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="#E3A333" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z M28,26
+		c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+</g>
+<path fill="#E3A333" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z"/>
+<path fill="#E3A333" d="M28,26c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+<g>
+	<path fill="#FFFFFF" d="M6,20c0-5.8,2.4-7.9,5.8-7.9c2,0,3.4,0.7,5.3,1.9c1.6,1,2.5,1.5,3.3,1.5c0.7,0,1.2-0.7,1.3-3.1H26
+		c0.2,6.1-2.3,8-5.5,8c-2,0-3.5-0.8-5.3-1.9c-1.7-1-2.6-1.6-3.3-1.6c-0.8,0-1.4,0.5-1.6,3.2H6z"/>
+</g>
+</svg>
diff --git a/resources/pe_dark/pe_dark.qrc b/resources/pe_dark/pe_dark.qrc
index d5c621bc..cafc2559 100644
--- a/resources/pe_dark/pe_dark.qrc
+++ b/resources/pe_dark/pe_dark.qrc
@@ -29,6 +29,7 @@
 		<file>scalable/settings.svg</file>
 		<file>scalable/status-bad.svg</file>
 		<file>scalable/status-good.svg</file>
+		<file>scalable/status-yellow.svg</file>
 		<file>scalable/viewfolder.svg</file>
 	</qresource>
 </RCC>
diff --git a/resources/pe_dark/scalable/status-bad.svg b/resources/pe_dark/scalable/status-bad.svg
index 3449fea3..f455965a 100644
--- a/resources/pe_dark/scalable/status-bad.svg
+++ b/resources/pe_dark/scalable/status-bad.svg
@@ -1,103 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-bad.svg">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#c10000;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#840000;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#750000;stop-opacity:1" />
-      <stop
-         style="stop-color:#810000;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#950000;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="10.429825"
-     inkscape:cx="19.535963"
-     inkscape:cy="27.534384"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12 0 C 5.352 0 0 5.352 0 12 L 0 52 C 0 58.648 5.352 64 12 64 L 52 64 C 58.648 64 64 58.648 64 52 L 64 12 C 64 5.352 58.648 0 52 0 L 12 0 z M 12 8 L 52 8 C 54.216 8 56 9.784 56 12 L 56 52 C 56 54.216 54.216 56 52 56 L 12 56 C 9.784 56 8 54.216 8 52 L 8 12 C 8 9.784 9.784 8 12 8 z M 23.09375 19 C 22.044339 19 20.988173 19.386827 20.1875 20.1875 C 18.586153 21.788847 18.586153 24.398653 20.1875 26 L 26.65625 32 L 20.1875 38 C 18.586153 39.601347 18.586153 42.211153 20.1875 43.8125 C 20.988173 44.613173 22.044339 45 23.09375 45 C 24.143161 45 25.199327 44.613173 26 43.8125 L 32 37.5 L 38 43.8125 C 38.800673 44.613173 39.856839 45 40.90625 45 C 41.955661 45 43.011827 44.613173 43.8125 43.8125 C 45.413847 42.211153 45.413847 39.601347 43.8125 38 L 37.34375 32 L 43.8125 26 C 45.413847 24.398653 45.413847 21.788847 43.8125 20.1875 C 43.011827 19.386827 41.955661 19 40.90625 19 C 39.856839 19 38.800673 19.386827 38 20.1875 L 32 26.5 L 26 20.1875 C 25.199327 19.386827 24.143161 19 23.09375 19 z "
-     id="rect2989" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path d="M26,32H6c-3.4,0-6-2.6-6-6V6c0-3.4,2.6-6,6-6h20c3.4,0,6,2.6,6,6v20C32,29.4,29.4,32,26,32z"/>
+<path fill="#FFFFFF" d="M21.6,21.4c-0.8,0.8-2,0.8-2.8,0L16,18.6l-2.8,2.8c-0.8,0.8-2,0.8-2.8,0c-0.8-0.8-0.8-2,0-2.8l2.8-2.8
+	L10.4,13c-0.8-0.8-0.8-2,0-2.8c0.8-0.8,2-0.8,2.8,0L16,13l2.8-2.8c0.8-0.8,2-0.8,2.8,0s0.8,2,0,2.8l-2.8,2.8l2.8,2.8
+	C22.4,19.4,22.4,20.6,21.6,21.4z"/>
 </svg>
diff --git a/resources/pe_dark/scalable/status-good.svg b/resources/pe_dark/scalable/status-good.svg
index a5bf5c0b..4ba91f2d 100644
--- a/resources/pe_dark/scalable/status-good.svg
+++ b/resources/pe_dark/scalable/status-good.svg
@@ -1,114 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-good.png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#00c016;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#00820f;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#00730d;stop-opacity:1" />
-      <stop
-         style="stop-color:#007e0e;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#009511;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3020"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,-9.9999994e-8)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="7.375"
-     inkscape:cx="50.974601"
-     inkscape:cy="27.721167"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12,0 C 5.352,0 0,5.352 0,12 l 0,40 c 0,6.648 5.352,12 12,12 l 40,0 c 6.648,0 12,-5.352 12,-12 L 64,12 C 64,5.352 58.648,0 52,0 L 12,0 z m 0,8 40,0 c 2.216,0 4,1.784 4,4 l 0,40 c 0,2.216 -1.784,4 -4,4 L 12,56 C 9.784,56 8,54.216 8,52 L 8,12 C 8,9.784 9.784,8 12,8 z m 32.5,11 c -1.15165,0 -2.30882,0.43382 -3.1875,1.3125 l -13.75,13.8125 -4.875,-4.8125 c -1.757359,-1.757359 -4.617641,-1.757359 -6.375,0 -1.757359,1.757359 -1.757359,4.617641 0,6.375 l 8,7.5 c 1.75736,1.757359 4.61764,1.757359 6.375,0 l 17,-16.5 c 1.75736,-1.757359 1.75736,-4.617641 0,-6.375 C 46.80882,19.43382 45.65165,19 44.5,19 z"
-     id="rect2989"
-     inkscape:connector-curvature="0" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="none" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z"/>
+<path fill="none" d="M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2c0.8,0.8,2,0.8,2.8,0l8.4-8.4
+	c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
+<path d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z"/>
+<path fill="#FFFFFF" d="M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2c0.8,0.8,2,0.8,2.8,0l8.4-8.4
+	c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
 </svg>
diff --git a/resources/pe_dark/scalable/status-yellow.svg b/resources/pe_dark/scalable/status-yellow.svg
new file mode 100644
index 00000000..69133817
--- /dev/null
+++ b/resources/pe_dark/scalable/status-yellow.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="#E3A333" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z M28,26
+		c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+</g>
+<path d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z"/>
+<path d="M28,26c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+<g>
+	<path fill="#FFFFFF" d="M6,20c0-5.8,2.4-7.9,5.8-7.9c2,0,3.4,0.7,5.3,1.9c1.6,1,2.5,1.5,3.3,1.5c0.7,0,1.2-0.7,1.3-3.1H26
+		c0.2,6.1-2.3,8-5.5,8c-2,0-3.5-0.8-5.3-1.9c-1.7-1-2.6-1.6-3.3-1.6c-0.8,0-1.4,0.5-1.6,3.2H6z"/>
+</g>
+</svg>
diff --git a/resources/pe_light/pe_light.qrc b/resources/pe_light/pe_light.qrc
index 11d74c8f..53d0890b 100644
--- a/resources/pe_light/pe_light.qrc
+++ b/resources/pe_light/pe_light.qrc
@@ -29,6 +29,7 @@
 		<file>scalable/settings.svg</file>
 		<file>scalable/status-bad.svg</file>
 		<file>scalable/status-good.svg</file>
+		<file>scalable/status-yellow.svg</file>
 		<file>scalable/viewfolder.svg</file>
 	</qresource>
 </RCC>
diff --git a/resources/pe_light/scalable/news.svg b/resources/pe_light/scalable/news.svg
index 84979dcb..6f184afc 100644
--- a/resources/pe_light/scalable/news.svg
+++ b/resources/pe_light/scalable/news.svg
@@ -3,11 +3,10 @@
 <!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="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<rect fill="none" width="32" height="32"/>
 <g>
 	<g>
-		<path d="M26,0H6C2.6,0,0,2.6,0,6v14c0,3.4,2.6,6,6,6l4,6l4-6h12c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z M16,20H6v-2h10V20z M26,16
-			H6v-2h20V16z M26,12H6v-2h20V12z M26,8H6V6h20V8z"/>
+		<path fill-rule="evenodd" clip-rule="evenodd" fill="#F2F2F2" d="M26,0H6C2.7,0,0,2.7,0,6v14c0,3.3,2.7,6,6,6l4,6l4-6h12
+			c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z M16,20H6v-2h10V20z M26,16H6v-2h20V16z M26,12H6v-2h20V12z M26,8H6V6h20V8z"/>
 	</g>
 </g>
 </svg>
diff --git a/resources/pe_light/scalable/status-bad.svg b/resources/pe_light/scalable/status-bad.svg
index 3449fea3..2c24970c 100644
--- a/resources/pe_light/scalable/status-bad.svg
+++ b/resources/pe_light/scalable/status-bad.svg
@@ -1,103 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-bad.svg">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#c10000;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#840000;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#750000;stop-opacity:1" />
-      <stop
-         style="stop-color:#810000;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#950000;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="10.429825"
-     inkscape:cx="19.535963"
-     inkscape:cy="27.534384"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12 0 C 5.352 0 0 5.352 0 12 L 0 52 C 0 58.648 5.352 64 12 64 L 52 64 C 58.648 64 64 58.648 64 52 L 64 12 C 64 5.352 58.648 0 52 0 L 12 0 z M 12 8 L 52 8 C 54.216 8 56 9.784 56 12 L 56 52 C 56 54.216 54.216 56 52 56 L 12 56 C 9.784 56 8 54.216 8 52 L 8 12 C 8 9.784 9.784 8 12 8 z M 23.09375 19 C 22.044339 19 20.988173 19.386827 20.1875 20.1875 C 18.586153 21.788847 18.586153 24.398653 20.1875 26 L 26.65625 32 L 20.1875 38 C 18.586153 39.601347 18.586153 42.211153 20.1875 43.8125 C 20.988173 44.613173 22.044339 45 23.09375 45 C 24.143161 45 25.199327 44.613173 26 43.8125 L 32 37.5 L 38 43.8125 C 38.800673 44.613173 39.856839 45 40.90625 45 C 41.955661 45 43.011827 44.613173 43.8125 43.8125 C 45.413847 42.211153 45.413847 39.601347 43.8125 38 L 37.34375 32 L 43.8125 26 C 45.413847 24.398653 45.413847 21.788847 43.8125 20.1875 C 43.011827 19.386827 41.955661 19 40.90625 19 C 39.856839 19 38.800673 19.386827 38 20.1875 L 32 26.5 L 26 20.1875 C 25.199327 19.386827 24.143161 19 23.09375 19 z "
-     id="rect2989" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#F2F2F2" d="M26,32H6c-3.4,0-6-2.6-6-6V6c0-3.4,2.6-6,6-6h20c3.4,0,6,2.6,6,6v20C32,29.4,29.4,32,26,32z"/>
+<path fill="#4D4D4D" d="M21.6,21.6c-0.8,0.8-2,0.8-2.8,0L16,18.8l-2.8,2.8c-0.8,0.8-2,0.8-2.8,0c-0.8-0.8-0.8-2,0-2.8l2.8-2.8
+	l-2.8-2.8c-0.8-0.8-0.8-2,0-2.8c0.8-0.8,2-0.8,2.8,0l2.8,2.8l2.8-2.8c0.8-0.8,2-0.8,2.8,0s0.8,2,0,2.8L18.8,16l2.8,2.8
+	C22.4,19.6,22.4,20.8,21.6,21.6z"/>
 </svg>
diff --git a/resources/pe_light/scalable/status-good.svg b/resources/pe_light/scalable/status-good.svg
index a5bf5c0b..bf9a4174 100644
--- a/resources/pe_light/scalable/status-good.svg
+++ b/resources/pe_light/scalable/status-good.svg
@@ -1,114 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-good.png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#00c016;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#00820f;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#00730d;stop-opacity:1" />
-      <stop
-         style="stop-color:#007e0e;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#009511;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3020"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,-9.9999994e-8)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="7.375"
-     inkscape:cx="50.974601"
-     inkscape:cy="27.721167"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12,0 C 5.352,0 0,5.352 0,12 l 0,40 c 0,6.648 5.352,12 12,12 l 40,0 c 6.648,0 12,-5.352 12,-12 L 64,12 C 64,5.352 58.648,0 52,0 L 12,0 z m 0,8 40,0 c 2.216,0 4,1.784 4,4 l 0,40 c 0,2.216 -1.784,4 -4,4 L 12,56 C 9.784,56 8,54.216 8,52 L 8,12 C 8,9.784 9.784,8 12,8 z m 32.5,11 c -1.15165,0 -2.30882,0.43382 -3.1875,1.3125 l -13.75,13.8125 -4.875,-4.8125 c -1.757359,-1.757359 -4.617641,-1.757359 -6.375,0 -1.757359,1.757359 -1.757359,4.617641 0,6.375 l 8,7.5 c 1.75736,1.757359 4.61764,1.757359 6.375,0 l 17,-16.5 c 1.75736,-1.757359 1.75736,-4.617641 0,-6.375 C 46.80882,19.43382 45.65165,19 44.5,19 z"
-     id="rect2989"
-     inkscape:connector-curvature="0" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="none" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z"/>
+<path fill="none" d="M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2c0.8,0.8,2,0.8,2.8,0l8.4-8.4
+	c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
+<path fill="#F2F2F2" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z"/>
+<path fill="#4D4D4D" d="M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2c0.8,0.8,2,0.8,2.8,0l8.4-8.4
+	c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
 </svg>
diff --git a/resources/pe_light/scalable/status-yellow.svg b/resources/pe_light/scalable/status-yellow.svg
new file mode 100644
index 00000000..f7d2236b
--- /dev/null
+++ b/resources/pe_light/scalable/status-yellow.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="#E3A333" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z M28,26
+		c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+</g>
+<path fill="#F2F2F2" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z"/>
+<path fill="#F2F2F2" d="M28,26c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+<g>
+	<path fill="#4D4D4D" d="M6,20c0-5.8,2.4-7.9,5.8-7.9c2,0,3.4,0.7,5.3,1.9c1.6,1,2.5,1.5,3.3,1.5c0.7,0,1.2-0.7,1.3-3.1H26
+		c0.2,6.1-2.3,8-5.5,8c-2,0-3.5-0.8-5.3-1.9c-1.7-1-2.6-1.6-3.3-1.6c-0.8,0-1.4,0.5-1.6,3.2H6z"/>
+</g>
+</svg>