diff --git a/README.md b/README.md
index 85865c5c..849b1992 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,39 @@
-# Monitor
-Manage processes and monitor system resources.
-
-[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg)](https://appcenter.elementary.io/com.github.stsdc.monitor)
+<p align="center">
+    <img align="left" width="64" height="64" src="data/icons/64/com.github.stsdc.monitor.svg">
+    <h1 class="rich-diff-level-zero">Monitor</h1>
+</p>
+
+<h4 align="left">Manage processes and monitor system resources</h4>
+
+<p align="left">
+    <a href="https://paypal.me/stsdc/10">
+        <img src="https://img.shields.io/badge/Donate-PayPal-green.svg">
+    </a>
+    <a href="https://github.com/stsdc/monitor/releases">
+        <img src="https://img.shields.io/github/release/stsdc/monitor.svg" alt="Release">
+    </a>
+    <a href="https://travis-ci.org/stsdc/monitor">
+        <img src="https://travis-ci.org/stsdc/monitor.svg?branch=master" alt="Build Status">
+    </a>
+    <a href="https://github.com/stsdc/monitor/blob/master/LICENSE">
+        <img src="https://img.shields.io/github/license/stsdc/monitor.svg">
+    </a>
+</p>
 
 ![Monitor Screenshot](https://github.com/stsdc/monitor/raw/master/data/com.github.stsdc.monitor.screenshot.png)
 
-## For coffee
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/stsdc/10)
-
-
 ## Building and Installation
 
 You'll need the following dependencies to build:
+
 * valac
 * libgtk-3-dev
 * libgranite-dev
 * libbamf3-dev
 * libwnck-3-dev
 * libgtop2-dev
+* libwingpanel-2.0-dev
+* libxml2-utils
 * meson
 
 ## How To Build
@@ -27,8 +43,12 @@ You'll need the following dependencies to build:
     meson build --prefix=/usr
     cd build
     sudo ninja install
-    
+
+### Debug
+    `G_MESSAGES_DEBUG=all ./com.github.stsdc.monitor`
+
 ## Arch Linux
+
 Arch Linux users can find Monitor under the name [pantheon-system-monitor-git](https://aur.archlinux.org/packages/pantheon-system-monitor-git/) in the **AUR**:
 
 `$ aurman -S pantheon-system-monitor-git`
diff --git a/data/com.github.stsdc.monitor.appdata.xml.in b/data/com.github.stsdc.monitor.appdata.xml.in
index fa3d82aa..32266a3e 100644
--- a/data/com.github.stsdc.monitor.appdata.xml.in
+++ b/data/com.github.stsdc.monitor.appdata.xml.in
@@ -10,7 +10,7 @@
     <p>Display usage of system resources, filter and manage processes.</p>
   </description>
     <custom>
-     <value key="x-appcenter-color-primary">#2196f3</value>
+     <value key="x-appcenter-color-primary">#d7f4d7</value>
      <value key="x-appcenter-color-primary-text">rgb(255, 255, 255)</value>
      <value key="x-appcenter-suggested-price">0</value>
   </custom>
@@ -25,14 +25,12 @@
 <url type="help">https://github.com/stsdc/monitor/issues</url>
 
 <releases>
-    <release version="0.4.0" date="2019-01-31">
+    <release version="0.4.1" date="2019-02-20">
 ​      <description>
 ​         <ul>
-            <li>Add Monitor indicator</li>
-            <li>Add missing extra French translations</li>
-            <li>Fix: if icon missing for the process, icon is taken from previous process</li>
-            <li>Fix: search erases my input while I'm typing</li>
-            <li>Fix POTFILES</li>
+            <li>Add CPU and RAM icons</li>
+            <li>Update Polish and Russian translation</li>
+            <li>Fix bug, that caused hanging</li>
         </ul>
 ​      </description>
 ​    </release>
diff --git a/data/icons/cpu-symbolic.svg b/data/icons/cpu-symbolic.svg
new file mode 100644
index 00000000..c8206c64
--- /dev/null
+++ b/data/icons/cpu-symbolic.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg8">
+  <metadata
+     id="metadata14">
+    <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="defs12" />
+  <g
+     id="g252"
+     transform="translate(-61.830508,-61.830508)">
+    <path
+       id="path876"
+       transform="translate(61.830508,61.830508)"
+       d="M 3 0 L 3 2 L 2.5 2 A 0.5 0.5 0 0 0 2.4648438 2.0019531 A 0.5 0.5 0 0 0 2.4160156 2.0078125 A 0.5 0.5 0 0 0 2.4140625 2.0078125 A 0.5 0.5 0 0 0 2.3671875 2.0175781 A 0.5 0.5 0 0 0 2.3203125 2.0332031 A 0.5 0.5 0 0 0 2.3183594 2.0332031 A 0.5 0.5 0 0 0 2.2734375 2.0546875 A 0.5 0.5 0 0 0 2.2304688 2.0800781 A 0.5 0.5 0 0 0 2.1894531 2.1074219 A 0.5 0.5 0 0 0 2.1523438 2.140625 A 0.5 0.5 0 0 0 2.1171875 2.1777344 A 0.5 0.5 0 0 0 2.0878906 2.2167969 A 0.5 0.5 0 0 0 2.0605469 2.2597656 A 0.5 0.5 0 0 0 2.0390625 2.3046875 A 0.5 0.5 0 0 0 2.0214844 2.3515625 A 0.5 0.5 0 0 0 2.0097656 2.4003906 A 0.5 0.5 0 0 0 2.0019531 2.4492188 A 0.5 0.5 0 0 0 2 2.5 L 2 3 L 0 3 L 0 4 L 2 4 L 2 6 L 0 6 L 0 7 L 2 7 L 2 9 L 0 9 L 0 10 L 2 10 L 2 12 L 0 12 L 0 13 L 2 13 L 2 13.5 A 0.5 0.5 0 0 0 2.0019531 13.535156 A 0.5 0.5 0 0 0 2.0078125 13.583984 A 0.5 0.5 0 0 0 2.0078125 13.585938 A 0.5 0.5 0 0 0 2.0175781 13.632812 A 0.5 0.5 0 0 0 2.0332031 13.679688 A 0.5 0.5 0 0 0 2.0332031 13.681641 A 0.5 0.5 0 0 0 2.0546875 13.726562 A 0.5 0.5 0 0 0 2.0800781 13.769531 A 0.5 0.5 0 0 0 2.1074219 13.810547 A 0.5 0.5 0 0 0 2.140625 13.847656 A 0.5 0.5 0 0 0 2.1777344 13.882812 A 0.5 0.5 0 0 0 2.2167969 13.912109 A 0.5 0.5 0 0 0 2.2597656 13.939453 A 0.5 0.5 0 0 0 2.3046875 13.960938 A 0.5 0.5 0 0 0 2.3515625 13.978516 A 0.5 0.5 0 0 0 2.4003906 13.990234 A 0.5 0.5 0 0 0 2.4492188 13.998047 A 0.5 0.5 0 0 0 2.5 14 L 3 14 L 3 16 L 4 16 L 4 14 L 6 14 L 6 16 L 7 16 L 7 14 L 9 14 L 9 16 L 10 16 L 10 14 L 12 14 L 12 16 L 13 16 L 13 14 L 13.5 14 A 0.5 0.5 0 0 0 13.535156 13.998047 A 0.5 0.5 0 0 0 13.583984 13.992188 A 0.5 0.5 0 0 0 13.585938 13.992188 A 0.5 0.5 0 0 0 13.632812 13.982422 A 0.5 0.5 0 0 0 13.679688 13.966797 A 0.5 0.5 0 0 0 13.681641 13.966797 A 0.5 0.5 0 0 0 13.726562 13.945312 A 0.5 0.5 0 0 0 13.769531 13.919922 A 0.5 0.5 0 0 0 13.810547 13.892578 A 0.5 0.5 0 0 0 13.847656 13.859375 A 0.5 0.5 0 0 0 13.882812 13.822266 A 0.5 0.5 0 0 0 13.912109 13.783203 A 0.5 0.5 0 0 0 13.939453 13.740234 A 0.5 0.5 0 0 0 13.960938 13.695312 A 0.5 0.5 0 0 0 13.978516 13.648438 A 0.5 0.5 0 0 0 13.990234 13.599609 A 0.5 0.5 0 0 0 13.998047 13.550781 A 0.5 0.5 0 0 0 14 13.5 L 14 13 L 16 13 L 16 12 L 14 12 L 14 10 L 16 10 L 16 9 L 14 9 L 14 7 L 16 7 L 16 6 L 14 6 L 14 4 L 16 4 L 16 3 L 14 3 L 14 2.5 A 0.5 0.5 0 0 0 13.998047 2.4648438 A 0.5 0.5 0 0 0 13.992188 2.4160156 A 0.5 0.5 0 0 0 13.992188 2.4140625 A 0.5 0.5 0 0 0 13.982422 2.3671875 A 0.5 0.5 0 0 0 13.966797 2.3203125 A 0.5 0.5 0 0 0 13.966797 2.3183594 A 0.5 0.5 0 0 0 13.945312 2.2734375 A 0.5 0.5 0 0 0 13.919922 2.2304688 A 0.5 0.5 0 0 0 13.892578 2.1894531 A 0.5 0.5 0 0 0 13.859375 2.1523438 A 0.5 0.5 0 0 0 13.822266 2.1171875 A 0.5 0.5 0 0 0 13.783203 2.0878906 A 0.5 0.5 0 0 0 13.740234 2.0605469 A 0.5 0.5 0 0 0 13.695312 2.0390625 A 0.5 0.5 0 0 0 13.648438 2.0214844 A 0.5 0.5 0 0 0 13.599609 2.0097656 A 0.5 0.5 0 0 0 13.550781 2.0019531 A 0.5 0.5 0 0 0 13.5 2 L 13 2 L 13 0 L 12 0 L 12 2 L 10 2 L 10 0 L 9 0 L 9 2 L 7 2 L 7 0 L 6 0 L 6 2 L 4 2 L 4 0 L 3 0 z M 3.5 3 L 12.5 3 A 0.5 0.5 0 0 1 12.550781 3.0019531 A 0.5 0.5 0 0 1 12.599609 3.0097656 A 0.5 0.5 0 0 1 12.648438 3.0214844 A 0.5 0.5 0 0 1 12.695312 3.0390625 A 0.5 0.5 0 0 1 12.740234 3.0605469 A 0.5 0.5 0 0 1 12.783203 3.0878906 A 0.5 0.5 0 0 1 12.822266 3.1171875 A 0.5 0.5 0 0 1 12.859375 3.1523438 A 0.5 0.5 0 0 1 12.892578 3.1894531 A 0.5 0.5 0 0 1 12.919922 3.2304688 A 0.5 0.5 0 0 1 12.945312 3.2734375 A 0.5 0.5 0 0 1 12.966797 3.3183594 A 0.5 0.5 0 0 0 12.966797 3.3203125 A 0.5 0.5 0 0 1 12.982422 3.3671875 A 0.5 0.5 0 0 1 12.992188 3.4140625 A 0.5 0.5 0 0 0 12.992188 3.4160156 A 0.5 0.5 0 0 1 12.998047 3.4648438 A 0.5 0.5 0 0 1 13 3.5 L 13 12.5 A 0.5 0.5 0 0 1 12.998047 12.550781 A 0.5 0.5 0 0 1 12.990234 12.599609 A 0.5 0.5 0 0 1 12.978516 12.648438 A 0.5 0.5 0 0 1 12.960938 12.695312 A 0.5 0.5 0 0 1 12.939453 12.740234 A 0.5 0.5 0 0 1 12.912109 12.783203 A 0.5 0.5 0 0 1 12.882812 12.822266 A 0.5 0.5 0 0 1 12.847656 12.859375 A 0.5 0.5 0 0 1 12.810547 12.892578 A 0.5 0.5 0 0 1 12.769531 12.919922 A 0.5 0.5 0 0 1 12.726562 12.945312 A 0.5 0.5 0 0 1 12.681641 12.966797 A 0.5 0.5 0 0 0 12.679688 12.966797 A 0.5 0.5 0 0 1 12.632812 12.982422 A 0.5 0.5 0 0 1 12.585938 12.992188 A 0.5 0.5 0 0 0 12.583984 12.992188 A 0.5 0.5 0 0 1 12.535156 12.998047 A 0.5 0.5 0 0 1 12.5 13 L 3.5 13 A 0.5 0.5 0 0 1 3.4492188 12.998047 A 0.5 0.5 0 0 1 3.4003906 12.990234 A 0.5 0.5 0 0 1 3.3515625 12.978516 A 0.5 0.5 0 0 1 3.3046875 12.960938 A 0.5 0.5 0 0 1 3.2597656 12.939453 A 0.5 0.5 0 0 1 3.2167969 12.912109 A 0.5 0.5 0 0 1 3.1777344 12.882812 A 0.5 0.5 0 0 1 3.140625 12.847656 A 0.5 0.5 0 0 1 3.1074219 12.810547 A 0.5 0.5 0 0 1 3.0800781 12.769531 A 0.5 0.5 0 0 1 3.0546875 12.726562 A 0.5 0.5 0 0 1 3.0332031 12.681641 A 0.5 0.5 0 0 0 3.0332031 12.679688 A 0.5 0.5 0 0 1 3.0175781 12.632812 A 0.5 0.5 0 0 1 3.0078125 12.585938 A 0.5 0.5 0 0 0 3.0078125 12.583984 A 0.5 0.5 0 0 1 3.0019531 12.535156 A 0.5 0.5 0 0 1 3 12.5 L 3 3.5 A 0.5 0.5 0 0 1 3.0019531 3.4492188 A 0.5 0.5 0 0 1 3.0097656 3.4003906 A 0.5 0.5 0 0 1 3.0214844 3.3515625 A 0.5 0.5 0 0 1 3.0390625 3.3046875 A 0.5 0.5 0 0 1 3.0605469 3.2597656 A 0.5 0.5 0 0 1 3.0878906 3.2167969 A 0.5 0.5 0 0 1 3.1171875 3.1777344 A 0.5 0.5 0 0 1 3.1523438 3.140625 A 0.5 0.5 0 0 1 3.1894531 3.1074219 A 0.5 0.5 0 0 1 3.2304688 3.0800781 A 0.5 0.5 0 0 1 3.2734375 3.0546875 A 0.5 0.5 0 0 1 3.3183594 3.0332031 A 0.5 0.5 0 0 0 3.3203125 3.0332031 A 0.5 0.5 0 0 1 3.3671875 3.0175781 A 0.5 0.5 0 0 1 3.4140625 3.0078125 A 0.5 0.5 0 0 0 3.4160156 3.0078125 A 0.5 0.5 0 0 1 3.4648438 3.0019531 A 0.5 0.5 0 0 1 3.5 3 z M 4.5 4 A 0.5 0.5 0 0 0 4.4648438 4.0019531 A 0.5 0.5 0 0 0 4.4140625 4.0078125 A 0.5 0.5 0 0 0 4.3671875 4.0175781 A 0.5 0.5 0 0 0 4.3183594 4.0332031 A 0.5 0.5 0 0 0 4.2734375 4.0546875 A 0.5 0.5 0 0 0 4.2304688 4.0800781 A 0.5 0.5 0 0 0 4.1894531 4.1074219 A 0.5 0.5 0 0 0 4.1523438 4.140625 A 0.5 0.5 0 0 0 4.1171875 4.1777344 A 0.5 0.5 0 0 0 4.0878906 4.2167969 A 0.5 0.5 0 0 0 4.0605469 4.2597656 A 0.5 0.5 0 0 0 4.0390625 4.3046875 A 0.5 0.5 0 0 0 4.0214844 4.3515625 A 0.5 0.5 0 0 0 4.0097656 4.4003906 A 0.5 0.5 0 0 0 4.0019531 4.4492188 A 0.5 0.5 0 0 0 4 4.5 L 4 11.5 A 0.5 0.5 0 0 0 4.0019531 11.535156 A 0.5 0.5 0 0 0 4.0078125 11.585938 A 0.5 0.5 0 0 0 4.0175781 11.632812 A 0.5 0.5 0 0 0 4.0332031 11.681641 A 0.5 0.5 0 0 0 4.0546875 11.726562 A 0.5 0.5 0 0 0 4.0800781 11.769531 A 0.5 0.5 0 0 0 4.1074219 11.810547 A 0.5 0.5 0 0 0 4.140625 11.847656 A 0.5 0.5 0 0 0 4.1777344 11.882812 A 0.5 0.5 0 0 0 4.2167969 11.912109 A 0.5 0.5 0 0 0 4.2597656 11.939453 A 0.5 0.5 0 0 0 4.3046875 11.960938 A 0.5 0.5 0 0 0 4.3515625 11.978516 A 0.5 0.5 0 0 0 4.4003906 11.990234 A 0.5 0.5 0 0 0 4.4492188 11.998047 A 0.5 0.5 0 0 0 4.5 12 L 11.5 12 A 0.5 0.5 0 0 0 11.535156 11.998047 A 0.5 0.5 0 0 0 11.585938 11.992188 A 0.5 0.5 0 0 0 11.632812 11.982422 A 0.5 0.5 0 0 0 11.681641 11.966797 A 0.5 0.5 0 0 0 11.726562 11.945312 A 0.5 0.5 0 0 0 11.769531 11.919922 A 0.5 0.5 0 0 0 11.810547 11.892578 A 0.5 0.5 0 0 0 11.847656 11.859375 A 0.5 0.5 0 0 0 11.882812 11.822266 A 0.5 0.5 0 0 0 11.912109 11.783203 A 0.5 0.5 0 0 0 11.939453 11.740234 A 0.5 0.5 0 0 0 11.960938 11.695312 A 0.5 0.5 0 0 0 11.978516 11.648438 A 0.5 0.5 0 0 0 11.990234 11.599609 A 0.5 0.5 0 0 0 11.998047 11.550781 A 0.5 0.5 0 0 0 12 11.5 L 12 4.5 A 0.5 0.5 0 0 0 11.998047 4.4648438 A 0.5 0.5 0 0 0 11.992188 4.4140625 A 0.5 0.5 0 0 0 11.982422 4.3671875 A 0.5 0.5 0 0 0 11.966797 4.3183594 A 0.5 0.5 0 0 0 11.945312 4.2734375 A 0.5 0.5 0 0 0 11.919922 4.2304688 A 0.5 0.5 0 0 0 11.892578 4.1894531 A 0.5 0.5 0 0 0 11.859375 4.1523438 A 0.5 0.5 0 0 0 11.822266 4.1171875 A 0.5 0.5 0 0 0 11.783203 4.0878906 A 0.5 0.5 0 0 0 11.740234 4.0605469 A 0.5 0.5 0 0 0 11.695312 4.0390625 A 0.5 0.5 0 0 0 11.648438 4.0214844 A 0.5 0.5 0 0 0 11.599609 4.0097656 A 0.5 0.5 0 0 0 11.550781 4.0019531 A 0.5 0.5 0 0 0 11.5 4 L 4.5 4 z M 10.5 5 C 10.776142 5 11 5.2238576 11 5.5 C 11 5.7761424 10.776142 6 10.5 6 C 10.223858 6 10 5.7761424 10 5.5 C 10 5.2238576 10.223858 5 10.5 5 z "
+       style="stroke-width:1.20000005" />
+    <circle
+       r="1"
+       cy="66.299255"
+       cx="81.03363"
+       id="path818"
+       style="fill:#00ff00;stroke:none" />
+  </g>
+</svg>
diff --git a/data/icons/icons.indicator.gresource.xml b/data/icons/icons.indicator.gresource.xml
new file mode 100644
index 00000000..4a701104
--- /dev/null
+++ b/data/icons/icons.indicator.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/com/github/stsdc/monitor/icons">
+    <file compressed="true" preprocess="xml-stripblanks">cpu-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks">ram-symbolic.svg</file>
+  </gresource>
+</gresources>
\ No newline at end of file
diff --git a/data/icons/ram-symbolic.svg b/data/icons/ram-symbolic.svg
new file mode 100644
index 00000000..403b84fa
--- /dev/null
+++ b/data/icons/ram-symbolic.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg8">
+  <metadata
+     id="metadata14">
+    <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="defs12" />
+  <path
+     id="path820"
+     d="m 0,4 v 7 h 1 v 2 h 5 2 7 v -2 h 1 V 4 Z m 1,1 h 14 v 5 H 1 Z m 1,6 h 1 v 1 H 2 Z m 2,0 h 1 v 1 H 4 Z m 2,0 h 2 v 1 H 6 Z m 3,0 h 1 v 1 H 9 Z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <rect
+     y="6"
+     x="2"
+     height="3"
+     width="2"
+     id="rect826"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="6"
+     x="5"
+     height="3"
+     width="2"
+     id="rect826-3"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="6"
+     x="9"
+     height="3"
+     width="2"
+     id="rect826-6"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="6"
+     x="12"
+     height="3"
+     width="2"
+     id="rect826-7"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/debian/changelog b/debian/changelog
index 884ea633..66ddc47a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+com.github.stsdc.monitor (0.4.1) bionic; urgency=low
+
+    * Add CPU and RAM icons
+    * Update Polish and Russian translation
+    * Fix bug, that caused hanging
+
+-- Stanisław Dac <stanislawdac@gmail.com>  Wed, 20 Feb 2019 00:42:22 +0100
+
 com.github.stsdc.monitor (0.4.0) bionic; urgency=low
 
     * Add Monitor indicator
diff --git a/meson.build b/meson.build
index 720699de..4382e403 100644
--- a/meson.build
+++ b/meson.build
@@ -17,11 +17,19 @@ gtop = dependency('libgtop-2.0')
 wnck = dependency('libwnck-3.0')
 wingpanel = dependency('wingpanel-2.0')
 
-conf = configuration_data()
-conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-configure_file(output: 'config.h', configuration: conf)
+config_data = configuration_data()
+config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+
+configure_file(output: 'config.h', configuration: config_data)
 config_h_dir = include_directories('.')
 
+icons_gresource = gnome.compile_resources(
+    'gresource_icons',
+    'data/icons/icons.indicator.gresource.xml',
+    source_dir: 'data/icons',
+    c_name: 'as'
+)
+
 c_args = [
     '-include', 'config.h',
     '-DWNCK_I_KNOW_THIS_IS_UNSTABLE',
@@ -30,6 +38,7 @@ c_args = [
 
 executable(
     meson.project_name(),
+    icons_gresource,
     'src/Monitor.vala',
     'src/MainWindow.vala',
     'src/Utils.vala',
@@ -37,7 +46,7 @@ executable(
     'src/Widgets/OverallView.vala',
     'src/Widgets/Search.vala',
     'src/Widgets/Headerbar.vala',
-    'src/Widgets/Statusbar.vala',
+    'src/Widgets/Statusbar/Statusbar.vala',
 
     'src/Models/GenericModel.vala',
     'src/Models/ModelHelper.vala',
@@ -71,7 +80,7 @@ executable(
     vala_args: [
         '--vapidir=' + meson.source_root() + '/vapi/',
     ],
-    install: true,
+    install: true
 )
 
 shared_module(
@@ -87,7 +96,7 @@ shared_module(
     'src/Indicator/Services/DBusClient.vala',
     'src/Services/Settings.vala',
     # 'src/Widgets/RevealerSwitch.vala',
-    # asresources,
+    icons_gresource,
     c_args: c_args,
     dependencies: [
         glib,
diff --git a/po/POTFILES b/po/POTFILES
index 18fa8cb4..9dbb91a7 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,5 +1,7 @@
 src/Monitor.vala
 src/MainWindow.vala
+src/Indicator/Widgets/PopoverWidget.vala
+src/Indicator/Indicator.vala
 src/Widgets/Headerbar.vala
 src/Widgets/OverallView.vala
 src/Widgets/Search.vala
@@ -10,4 +12,3 @@ src/Managers/Process.vala
 src/Models/GenericModel.vala
 src/Services/Settings.vala
 src/Services/Shortcuts.vala
-src/Services/Resources.vala
diff --git a/po/com.github.stsdc.monitor.pot b/po/com.github.stsdc.monitor.pot
index 641fcb6e..9ab846d7 100644
--- a/po/com.github.stsdc.monitor.pot
+++ b/po/com.github.stsdc.monitor.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the com.github.stsdc.monitor package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: com.github.stsdc.monitor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-04 21:13+0200\n"
+"POT-Creation-Date: 2019-02-03 22:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,62 +17,90 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/Models/ApplicationProcessModel.vala:68
-msgid "Background Applications"
+#: src/Indicator/Widgets/PopoverWidget.vala:12
+msgid "Show Monitor"
 msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:25 ../src/Widgets/Statusbar.vala:41
-msgid "CPU:"
+#: src/Indicator/Widgets/PopoverWidget.vala:13
+msgid "Quit Monitor"
 msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:26 ../src/Widgets/Statusbar.vala:34
-msgid "Memory:"
+#. Some information about the indicator
+#. Unique name
+#: src/Indicator/Indicator.vala:43
+msgid "Monitor Indicator"
 msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:27 ../src/Widgets/OverallView.vala:116
-msgid "GiB"
+#. Localised name
+#: src/Indicator/Indicator.vala:44
+msgid "Show system resources"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:11
+msgid "Monitor"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:18
+msgid "End process"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:21
+msgid "Ctrl+E"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:32
+#: src/Widgets/Headerbar.vala:28
+msgid "Settings"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:46
+msgid "Show an indicator"
+msgstr ""
+
+#. setup name column
+#: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:51
+#: src/Widgets/OverallView.vala:42
 msgid "CPU"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:62
+#: src/Widgets/OverallView.vala:53
 msgid "Memory"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:72
+#: src/Widgets/OverallView.vala:63
 msgid "PID"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:105
+#: src/Widgets/OverallView.vala:107
 msgid "KiB"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:110
+#: src/Widgets/OverallView.vala:112
 msgid "MiB"
 msgstr ""
 
-#: ../src/Widgets/Search.vala:9
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+msgid "GiB"
+msgstr ""
+
+#: src/Widgets/Search.vala:9
 msgid "Search Process"
 msgstr ""
 
-#: ../src/Widgets/Search.vala:10
+#: src/Widgets/Search.vala:10
 msgid "Type Process Name or PID"
 msgstr ""
 
-#: ../src/MainWindow.vala:53
-msgid "Monitor"
+#: src/Widgets/Statusbar.vala:9
+msgid "CPU:"
 msgstr ""
 
-#: ../src/MainWindow.vala:66
-msgid "End process"
+#: src/Widgets/Statusbar.vala:10
+msgid "Memory:"
 msgstr ""
 
-#: ../src/MainWindow.vala:68
-msgid "Ctrl+E"
+#: src/Models/GenericModel.vala:274
+msgid "Background Applications"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index b1a1e86c..76785c9d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,66 +1,96 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-04 21:13+0200\n"
+"POT-Creation-Date: 2019-02-03 22:44+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: ../src/Models/ApplicationProcessModel.vala:68
-msgid "Background Applications"
-msgstr "Hintergrundanwendungen"
+#: src/Indicator/Widgets/PopoverWidget.vala:12
+#, fuzzy
+msgid "Show Monitor"
+msgstr "Monitor"
 
-#: ../src/Widgets/Statusbar.vala:25 ../src/Widgets/Statusbar.vala:41
-msgid "CPU:"
-msgstr "CPU:"
+#: src/Indicator/Widgets/PopoverWidget.vala:13
+#, fuzzy
+msgid "Quit Monitor"
+msgstr "Monitor"
 
-#: ../src/Widgets/Statusbar.vala:26 ../src/Widgets/Statusbar.vala:34
-msgid "Memory:"
-msgstr "Arbeitsspeicher"
+#. Some information about the indicator
+#. Unique name
+#: src/Indicator/Indicator.vala:43
+msgid "Monitor Indicator"
+msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:27 ../src/Widgets/OverallView.vala:116
-msgid "GiB"
-msgstr "GiB"
+#. Localised name
+#: src/Indicator/Indicator.vala:44
+msgid "Show system resources"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:11
+msgid "Monitor"
+msgstr "Monitor"
+
+#: src/Widgets/Headerbar.vala:18
+msgid "End process"
+msgstr "Prozess beenden"
+
+#: src/Widgets/Headerbar.vala:21
+msgid "Ctrl+E"
+msgstr "Strg+E"
+
+#: src/Widgets/Headerbar.vala:28
+msgid "Settings"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:46
+msgid "Show an indicator"
+msgstr ""
 
-#: ../src/Widgets/OverallView.vala:32
+#. setup name column
+#: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr "Prozess"
 
-#: ../src/Widgets/OverallView.vala:51
+#: src/Widgets/OverallView.vala:42
 msgid "CPU"
 msgstr "CPU"
 
-#: ../src/Widgets/OverallView.vala:62
+#: src/Widgets/OverallView.vala:53
 msgid "Memory"
 msgstr "Arbeitsspeicher"
 
-#: ../src/Widgets/OverallView.vala:72
+#: src/Widgets/OverallView.vala:63
 msgid "PID"
 msgstr "PID"
 
-#: ../src/Widgets/OverallView.vala:105
+#: src/Widgets/OverallView.vala:107
 msgid "KiB"
 msgstr "KiB"
 
-#: ../src/Widgets/OverallView.vala:110
+#: src/Widgets/OverallView.vala:112
 msgid "MiB"
 msgstr "MiB"
 
-#: ../src/Widgets/Search.vala:9
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+msgid "GiB"
+msgstr "GiB"
+
+#: src/Widgets/Search.vala:9
 msgid "Search Process"
 msgstr "Suche"
 
-#: ../src/Widgets/Search.vala:10
+#: src/Widgets/Search.vala:10
 msgid "Type Process Name or PID"
 msgstr "Geben Sie den Prozessnamen oder PID ein"
 
-#: ../src/MainWindow.vala:53
-msgid "Monitor"
-msgstr "Monitor"
+#: src/Widgets/Statusbar.vala:9
+msgid "CPU:"
+msgstr "CPU:"
 
-#: ../src/MainWindow.vala:66
-msgid "End process"
-msgstr "Prozess beenden"
+#: src/Widgets/Statusbar.vala:10
+msgid "Memory:"
+msgstr "Arbeitsspeicher"
 
-#: ../src/MainWindow.vala:68
-msgid "Ctrl+E"
-msgstr "Strg+E"
+#: src/Models/GenericModel.vala:274
+msgid "Background Applications"
+msgstr "Hintergrundanwendungen"
diff --git a/po/es.po b/po/es.po
index fb5d2e72..850e4734 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,66 +1,96 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-04 21:13+0200\n"
+"POT-Creation-Date: 2019-02-03 22:44+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: ../src/Models/ApplicationProcessModel.vala:68
-msgid "Background Applications"
-msgstr "Aplicaciones en segundo plano"
+#: src/Indicator/Widgets/PopoverWidget.vala:12
+#, fuzzy
+msgid "Show Monitor"
+msgstr "Monitor"
 
-#: ../src/Widgets/Statusbar.vala:25 ../src/Widgets/Statusbar.vala:41
-msgid "CPU:"
-msgstr "CPU:"
+#: src/Indicator/Widgets/PopoverWidget.vala:13
+#, fuzzy
+msgid "Quit Monitor"
+msgstr "Monitor"
 
-#: ../src/Widgets/Statusbar.vala:26 ../src/Widgets/Statusbar.vala:34
-msgid "Memory:"
-msgstr "Memoria:"
+#. Some information about the indicator
+#. Unique name
+#: src/Indicator/Indicator.vala:43
+msgid "Monitor Indicator"
+msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:27 ../src/Widgets/OverallView.vala:116
-msgid "GiB"
-msgstr "GiB"
+#. Localised name
+#: src/Indicator/Indicator.vala:44
+msgid "Show system resources"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:11
+msgid "Monitor"
+msgstr "Monitor"
+
+#: src/Widgets/Headerbar.vala:18
+msgid "End process"
+msgstr "Terminar proceso"
+
+#: src/Widgets/Headerbar.vala:21
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+#: src/Widgets/Headerbar.vala:28
+msgid "Settings"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:46
+msgid "Show an indicator"
+msgstr ""
 
-#: ../src/Widgets/OverallView.vala:32
+#. setup name column
+#: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr "Nombre del proceso"
 
-#: ../src/Widgets/OverallView.vala:51
+#: src/Widgets/OverallView.vala:42
 msgid "CPU"
 msgstr "CPU"
 
-#: ../src/Widgets/OverallView.vala:62
+#: src/Widgets/OverallView.vala:53
 msgid "Memory"
 msgstr "Memoria"
 
-#: ../src/Widgets/OverallView.vala:72
+#: src/Widgets/OverallView.vala:63
 msgid "PID"
 msgstr "PID"
 
-#: ../src/Widgets/OverallView.vala:105
+#: src/Widgets/OverallView.vala:107
 msgid "KiB"
 msgstr "KiB"
 
-#: ../src/Widgets/OverallView.vala:110
+#: src/Widgets/OverallView.vala:112
 msgid "MiB"
 msgstr "MiB"
 
-#: ../src/Widgets/Search.vala:9
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+msgid "GiB"
+msgstr "GiB"
+
+#: src/Widgets/Search.vala:9
 msgid "Search Process"
 msgstr "Buscar proceso"
 
-#: ../src/Widgets/Search.vala:10
+#: src/Widgets/Search.vala:10
 msgid "Type Process Name or PID"
 msgstr "Introduce el nombre del proceso o el PID"
 
-#: ../src/MainWindow.vala:53
-msgid "Monitor"
-msgstr "Monitor"
+#: src/Widgets/Statusbar.vala:9
+msgid "CPU:"
+msgstr "CPU:"
 
-#: ../src/MainWindow.vala:66
-msgid "End process"
-msgstr "Terminar proceso"
+#: src/Widgets/Statusbar.vala:10
+msgid "Memory:"
+msgstr "Memoria:"
 
-#: ../src/MainWindow.vala:68
-msgid "Ctrl+E"
-msgstr "Ctrl+E"
+#: src/Models/GenericModel.vala:274
+msgid "Background Applications"
+msgstr "Aplicaciones en segundo plano"
diff --git a/po/extra/ru.po b/po/extra/ru.po
index 39dd68d6..d979aa50 100644
--- a/po/extra/ru.po
+++ b/po/extra/ru.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-20 22:25+0900\n"
-"PO-Revision-Date: 2018-10-20 22:25+0900\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2019-02-04 12:33+0400\n"
+"Last-Translator: Andrey Kultyapov <camellan@yandex.ru>\n"
 "Language-Team: none\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -17,36 +17,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: data/com.github.stsdc.monitor.appdata.xml.in:7
 #: data/com.github.stsdc.monitor.desktop.in:3
 msgid "Monitor"
-msgstr ""
+msgstr "Монитор"
 
 #: data/com.github.stsdc.monitor.appdata.xml.in:8
 msgid "Manage processes and monitor system resources"
-msgstr ""
+msgstr "Управление процессами и мониторинг системных ресурсов"
 
 #: data/com.github.stsdc.monitor.appdata.xml.in:10
 msgid "Display usage of system resources, filter and manage processes."
 msgstr ""
+"Отображение использования системных ресурсов, фильтрование и управление "
+"процессами."
 
 #: data/com.github.stsdc.monitor.appdata.xml.in:22
 msgid "Stanisław Dac"
-msgstr ""
+msgstr "Stanisław Dac"
 
 #: data/com.github.stsdc.monitor.desktop.in:4
 msgid "System Monitor"
-msgstr ""
+msgstr "Системный монитор"
 
 #: data/com.github.stsdc.monitor.desktop.in:6
 msgid "Manage processes and monitor resource usage of the system"
-msgstr ""
+msgstr "Управление процессами и мониторинг использования ресурсов системы"
 
 #: data/com.github.stsdc.monitor.desktop.in:10
 msgid "com.github.stsdc.monitor"
-msgstr ""
+msgstr "com.github.stsdc.monitor"
 
 #: data/com.github.stsdc.monitor.desktop.in:14
 msgid "System monitor;System usage;Task manager;"
-msgstr ""
+msgstr "System monitor;System usage;Task manager;"
diff --git a/po/fr.po b/po/fr.po
index bdef54d0..15d558e9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,73 +7,103 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-02 00:36+0100\n"
+"POT-Creation-Date: 2019-02-03 22:44+0100\n"
 "PO-Revision-Date: 2017-11-03 10:20+0100\n"
+"Last-Translator: NathanBnm\n"
 "Language-Team: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.7.1\n"
-"Last-Translator: NathanBnm\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"Language: fr\n"
 
-#: ../src/Models/ApplicationProcessModel.vala:68
-msgid "Background Applications"
-msgstr "Applications en arrière-plan"
+#: src/Indicator/Widgets/PopoverWidget.vala:12
+#, fuzzy
+msgid "Show Monitor"
+msgstr "Monitor"
 
-#: ../src/Widgets/Statusbar.vala:25 ../src/Widgets/Statusbar.vala:41
-msgid "CPU:"
-msgstr "CPU :"
+#: src/Indicator/Widgets/PopoverWidget.vala:13
+#, fuzzy
+msgid "Quit Monitor"
+msgstr "Monitor"
 
-#: ../src/Widgets/Statusbar.vala:26 ../src/Widgets/Statusbar.vala:34
-msgid "Memory:"
-msgstr "Mémoire :"
+#. Some information about the indicator
+#. Unique name
+#: src/Indicator/Indicator.vala:43
+msgid "Monitor Indicator"
+msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:27 ../src/Widgets/OverallView.vala:116
-msgid "GiB"
-msgstr "Gio"
+#. Localised name
+#: src/Indicator/Indicator.vala:44
+msgid "Show system resources"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:11
+msgid "Monitor"
+msgstr "Monitor"
+
+#: src/Widgets/Headerbar.vala:18
+msgid "End process"
+msgstr "Terminer le processus"
 
-#: ../src/Widgets/OverallView.vala:32
+#: src/Widgets/Headerbar.vala:21
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+#: src/Widgets/Headerbar.vala:28
+msgid "Settings"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:46
+msgid "Show an indicator"
+msgstr ""
+
+#. setup name column
+#: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr "Nom du processus"
 
-#: ../src/Widgets/OverallView.vala:51
+#: src/Widgets/OverallView.vala:42
 msgid "CPU"
 msgstr "CPU"
 
-#: ../src/Widgets/OverallView.vala:62
+#: src/Widgets/OverallView.vala:53
 msgid "Memory"
 msgstr "Mémoire"
 
-#: ../src/Widgets/OverallView.vala:72
+#: src/Widgets/OverallView.vala:63
 msgid "PID"
 msgstr "PID"
 
-#: ../src/Widgets/OverallView.vala:105
+#: src/Widgets/OverallView.vala:107
 msgid "KiB"
 msgstr "Kio"
 
-#: ../src/Widgets/OverallView.vala:110
+#: src/Widgets/OverallView.vala:112
 msgid "MiB"
 msgstr "Mio"
 
-#: ../src/Widgets/Search.vala:9
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+msgid "GiB"
+msgstr "Gio"
+
+#: src/Widgets/Search.vala:9
 msgid "Search Process"
 msgstr "Rechercher un processus"
 
-#: ../src/Widgets/Search.vala:10
+#: src/Widgets/Search.vala:10
 msgid "Type Process Name or PID"
 msgstr "Entrez le nom d'un processus ou un PID"
 
-#: ../src/MainWindow.vala:53
-msgid "Monitor"
-msgstr "Monitor"
+#: src/Widgets/Statusbar.vala:9
+msgid "CPU:"
+msgstr "CPU :"
 
-#: ../src/MainWindow.vala:66
-msgid "End process"
-msgstr "Terminer le processus"
+#: src/Widgets/Statusbar.vala:10
+msgid "Memory:"
+msgstr "Mémoire :"
 
-#: ../src/MainWindow.vala:68
-msgid "Ctrl+E"
-msgstr "Ctrl+E"
+#: src/Models/GenericModel.vala:274
+msgid "Background Applications"
+msgstr "Applications en arrière-plan"
diff --git a/po/lt.po b/po/lt.po
index 85b42acb..fb4a18e0 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,73 +7,104 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-07 11:19+0300\n"
+"POT-Creation-Date: 2019-02-03 22:44+0100\n"
 "PO-Revision-Date: 2017-09-07 11:24+0300\n"
+"Last-Translator: Moo\n"
 "Language-Team: \n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.7.1\n"
-"Last-Translator: Moo\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../src/Models/ApplicationProcessModel.vala:68
-msgid "Background Applications"
-msgstr "Foninės programos"
+#: src/Indicator/Widgets/PopoverWidget.vala:12
+#, fuzzy
+msgid "Show Monitor"
+msgstr "Monitor"
 
-#: ../src/Widgets/Statusbar.vala:25 ../src/Widgets/Statusbar.vala:41
-msgid "CPU:"
-msgstr "CPU:"
+#: src/Indicator/Widgets/PopoverWidget.vala:13
+#, fuzzy
+msgid "Quit Monitor"
+msgstr "Monitor"
 
-#: ../src/Widgets/Statusbar.vala:26 ../src/Widgets/Statusbar.vala:34
-msgid "Memory:"
-msgstr "Atmintis:"
+#. Some information about the indicator
+#. Unique name
+#: src/Indicator/Indicator.vala:43
+msgid "Monitor Indicator"
+msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:27 ../src/Widgets/OverallView.vala:116
-msgid "GiB"
-msgstr "GiB"
+#. Localised name
+#: src/Indicator/Indicator.vala:44
+msgid "Show system resources"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:11
+msgid "Monitor"
+msgstr "Monitor"
+
+#: src/Widgets/Headerbar.vala:18
+msgid "End process"
+msgstr "Užbaigti procesą"
 
-#: ../src/Widgets/OverallView.vala:32
+#: src/Widgets/Headerbar.vala:21
+msgid "Ctrl+E"
+msgstr "Ctrl(Vald)+E"
+
+#: src/Widgets/Headerbar.vala:28
+msgid "Settings"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:46
+msgid "Show an indicator"
+msgstr ""
+
+#. setup name column
+#: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr "Proceso pavadinimas"
 
-#: ../src/Widgets/OverallView.vala:51
+#: src/Widgets/OverallView.vala:42
 msgid "CPU"
 msgstr "CPU"
 
-#: ../src/Widgets/OverallView.vala:62
+#: src/Widgets/OverallView.vala:53
 msgid "Memory"
 msgstr "Atmintis"
 
-#: ../src/Widgets/OverallView.vala:72
+#: src/Widgets/OverallView.vala:63
 msgid "PID"
 msgstr "PID"
 
-#: ../src/Widgets/OverallView.vala:105
+#: src/Widgets/OverallView.vala:107
 msgid "KiB"
 msgstr "KiB"
 
-#: ../src/Widgets/OverallView.vala:110
+#: src/Widgets/OverallView.vala:112
 msgid "MiB"
 msgstr "MiB"
 
-#: ../src/Widgets/Search.vala:9
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+msgid "GiB"
+msgstr "GiB"
+
+#: src/Widgets/Search.vala:9
 msgid "Search Process"
 msgstr "Ieškoti proceso"
 
-#: ../src/Widgets/Search.vala:10
+#: src/Widgets/Search.vala:10
 msgid "Type Process Name or PID"
 msgstr "Įrašykite proceso pavadinimą ar PID"
 
-#: ../src/MainWindow.vala:53
-msgid "Monitor"
-msgstr "Monitor"
+#: src/Widgets/Statusbar.vala:9
+msgid "CPU:"
+msgstr "CPU:"
 
-#: ../src/MainWindow.vala:66
-msgid "End process"
-msgstr "Užbaigti procesą"
+#: src/Widgets/Statusbar.vala:10
+msgid "Memory:"
+msgstr "Atmintis:"
 
-#: ../src/MainWindow.vala:68
-msgid "Ctrl+E"
-msgstr "Ctrl(Vald)+E"
+#: src/Models/GenericModel.vala:274
+msgid "Background Applications"
+msgstr "Foninės programos"
diff --git a/po/nl.po b/po/nl.po
index a0d95b30..2c622e58 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,68 +1,98 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-04 21:13+0200\n"
+"POT-Creation-Date: 2019-02-03 22:44+0100\n"
 "PO-Revision-Date: 2017-09-04 21:35+0200\n"
 "Last-Translator: Jonathan Moerman <Unknown>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: ../src/Models/ApplicationProcessModel.vala:68
-msgid "Background Applications"
-msgstr "Achtergrond Toepassingen"
+#: src/Indicator/Widgets/PopoverWidget.vala:12
+#, fuzzy
+msgid "Show Monitor"
+msgstr "Monitor"
 
-#: ../src/Widgets/Statusbar.vala:25 ../src/Widgets/Statusbar.vala:41
-msgid "CPU:"
-msgstr "Processor:"
+#: src/Indicator/Widgets/PopoverWidget.vala:13
+#, fuzzy
+msgid "Quit Monitor"
+msgstr "Monitor"
 
-#: ../src/Widgets/Statusbar.vala:26 ../src/Widgets/Statusbar.vala:34
-msgid "Memory:"
-msgstr "Geheugen:"
+#. Some information about the indicator
+#. Unique name
+#: src/Indicator/Indicator.vala:43
+msgid "Monitor Indicator"
+msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:27 ../src/Widgets/OverallView.vala:116
-msgid "GiB"
-msgstr "GiB"
+#. Localised name
+#: src/Indicator/Indicator.vala:44
+msgid "Show system resources"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:11
+msgid "Monitor"
+msgstr "Monitor"
+
+#: src/Widgets/Headerbar.vala:18
+msgid "End process"
+msgstr "beëindig proces"
+
+#: src/Widgets/Headerbar.vala:21
+msgid "Ctrl+E"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:28
+msgid "Settings"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:46
+msgid "Show an indicator"
+msgstr ""
 
-#: ../src/Widgets/OverallView.vala:32
+#. setup name column
+#: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr "Naam van Proces"
 
-#: ../src/Widgets/OverallView.vala:51
+#: src/Widgets/OverallView.vala:42
 msgid "CPU"
 msgstr "Processor"
 
-#: ../src/Widgets/OverallView.vala:62
+#: src/Widgets/OverallView.vala:53
 msgid "Memory"
 msgstr "Geheugen"
 
-#: ../src/Widgets/OverallView.vala:72
+#: src/Widgets/OverallView.vala:63
 msgid "PID"
 msgstr "PID"
 
-#: ../src/Widgets/OverallView.vala:105
+#: src/Widgets/OverallView.vala:107
 msgid "KiB"
 msgstr "KiB"
 
-#: ../src/Widgets/OverallView.vala:110
+#: src/Widgets/OverallView.vala:112
 msgid "MiB"
 msgstr "MiB"
 
-#: ../src/Widgets/Search.vala:9
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+msgid "GiB"
+msgstr "GiB"
+
+#: src/Widgets/Search.vala:9
 msgid "Search Process"
 msgstr "Zoek naar Proces"
 
-#: ../src/Widgets/Search.vala:10
+#: src/Widgets/Search.vala:10
 msgid "Type Process Name or PID"
 msgstr "Typ Procesnaam of PID"
 
-#: ../src/MainWindow.vala:53
-msgid "Monitor"
-msgstr "Monitor"
+#: src/Widgets/Statusbar.vala:9
+msgid "CPU:"
+msgstr "Processor:"
 
-#: ../src/MainWindow.vala:66
-msgid "End process"
-msgstr "beëindig proces"
+#: src/Widgets/Statusbar.vala:10
+msgid "Memory:"
+msgstr "Geheugen:"
 
-#: ../src/MainWindow.vala:68
-msgid "Ctrl+E"
-msgstr ""
+#: src/Models/GenericModel.vala:274
+msgid "Background Applications"
+msgstr "Achtergrond Toepassingen"
diff --git a/po/pl.po b/po/pl.po
index 1e3239f7..971cdeb8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,66 +1,94 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-04 21:13+0200\n"
+"POT-Creation-Date: 2019-02-03 22:44+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: ../src/Models/ApplicationProcessModel.vala:68
-msgid "Background Applications"
-msgstr "Aplikacje w tle"
+#: src/Indicator/Widgets/PopoverWidget.vala:12
+msgid "Show Monitor"
+msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:25 ../src/Widgets/Statusbar.vala:41
-msgid "CPU:"
+#: src/Indicator/Widgets/PopoverWidget.vala:13
+msgid "Quit Monitor"
 msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:26 ../src/Widgets/Statusbar.vala:34
-msgid "Memory:"
-msgstr "Pamięć:"
+#. Some information about the indicator
+#. Unique name
+#: src/Indicator/Indicator.vala:43
+msgid "Monitor Indicator"
+msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:27 ../src/Widgets/OverallView.vala:116
-msgid "GiB"
+#. Localised name
+#: src/Indicator/Indicator.vala:44
+msgid "Show system resources"
+msgstr "Pokaż zasoby systemu"
+
+#: src/Widgets/Headerbar.vala:11
+msgid "Monitor"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:18
+msgid "End process"
+msgstr "Zakończ proces"
+
+#: src/Widgets/Headerbar.vala:21
+msgid "Ctrl+E"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:32
+#: src/Widgets/Headerbar.vala:28
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: src/Widgets/Headerbar.vala:46
+msgid "Show an indicator"
+msgstr "Pokaż indykator"
+
+#. setup name column
+#: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr "Nazwa procesu"
 
-#: ../src/Widgets/OverallView.vala:51
+#: src/Widgets/OverallView.vala:42
 msgid "CPU"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:62
+#: src/Widgets/OverallView.vala:53
 msgid "Memory"
 msgstr "Pamięć"
 
-#: ../src/Widgets/OverallView.vala:72
+#: src/Widgets/OverallView.vala:63
 msgid "PID"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:105
+#: src/Widgets/OverallView.vala:107
 msgid "KiB"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:110
+#: src/Widgets/OverallView.vala:112
 msgid "MiB"
 msgstr ""
 
-#: ../src/Widgets/Search.vala:9
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+msgid "GiB"
+msgstr ""
+
+#: src/Widgets/Search.vala:9
 msgid "Search Process"
 msgstr "Wyszukaj proces"
 
-#: ../src/Widgets/Search.vala:10
+#: src/Widgets/Search.vala:10
 msgid "Type Process Name or PID"
 msgstr "Wpisz nazwę procesu lub PID"
 
-#: ../src/MainWindow.vala:53
-msgid "Monitor"
+#: src/Widgets/Statusbar.vala:9
+msgid "CPU:"
 msgstr ""
 
-#: ../src/MainWindow.vala:66
-msgid "End process"
-msgstr "Zakończ proces"
+#: src/Widgets/Statusbar.vala:10
+msgid "Memory:"
+msgstr "Pamięć:"
 
-#: ../src/MainWindow.vala:68
-msgid "Ctrl+E"
-msgstr ""
+#: src/Models/GenericModel.vala:274
+msgid "Background Applications"
+msgstr "Aplikacje w tle"
diff --git a/po/ru.po b/po/ru.po
index 2b80d4a1..1ab57f17 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,72 +2,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-05 19:53+0400\n"
+"POT-Creation-Date: 2019-02-03 22:44+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Андрей Культяпов <camellan@yandex.ru>\n"
+"Last-Translator: Andrey Kultyapov <camellan@yandex.ru>\n"
 "Language-Team: \n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0\n"
+"X-Generator: Poedit 2.0.6\n"
 
-#: ../src/Models/ApplicationProcessModel.vala:68
-msgid "Background Applications"
-msgstr "Фоновые приложения"
+#: src/Indicator/Widgets/PopoverWidget.vala:12
+msgid "Show Monitor"
+msgstr "Показать монитор"
 
-#: ../src/Widgets/Statusbar.vala:25 ../src/Widgets/Statusbar.vala:41
-msgid "CPU:"
-msgstr "ЦПУ:"
+#: src/Indicator/Widgets/PopoverWidget.vala:13
+msgid "Quit Monitor"
+msgstr "Выход"
 
-#: ../src/Widgets/Statusbar.vala:26 ../src/Widgets/Statusbar.vala:34
-msgid "Memory:"
-msgstr "Память:"
+#. Some information about the indicator
+#. Unique name
+#: src/Indicator/Indicator.vala:43
+msgid "Monitor Indicator"
+msgstr "Индикатор монитора"
 
-#: ../src/Widgets/Statusbar.vala:27 ../src/Widgets/OverallView.vala:116
-msgid "GiB"
-msgstr "ГиБ"
+#. Localised name
+#: src/Indicator/Indicator.vala:44
+msgid "Show system resources"
+msgstr "Показывать системные ресурсы"
+
+#: src/Widgets/Headerbar.vala:11
+msgid "Monitor"
+msgstr "Monitor"
+
+#: src/Widgets/Headerbar.vala:18
+msgid "End process"
+msgstr "Завершить процесс"
+
+#: src/Widgets/Headerbar.vala:21
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
 
-#: ../src/Widgets/OverallView.vala:32
+#: src/Widgets/Headerbar.vala:28
+msgid "Settings"
+msgstr "Параметры"
+
+#: src/Widgets/Headerbar.vala:46
+msgid "Show an indicator"
+msgstr "Показывать индикатор"
+
+#. setup name column
+#: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr "Имя процесса"
 
-#: ../src/Widgets/OverallView.vala:51
+#: src/Widgets/OverallView.vala:42
 msgid "CPU"
 msgstr "ЦПУ"
 
-#: ../src/Widgets/OverallView.vala:62
+#: src/Widgets/OverallView.vala:53
 msgid "Memory"
 msgstr "Память"
 
-#: ../src/Widgets/OverallView.vala:72
+#: src/Widgets/OverallView.vala:63
 msgid "PID"
 msgstr "ИД"
 
-#: ../src/Widgets/OverallView.vala:105
+#: src/Widgets/OverallView.vala:107
 msgid "KiB"
 msgstr "КиБ"
 
-#: ../src/Widgets/OverallView.vala:110
+#: src/Widgets/OverallView.vala:112
 msgid "MiB"
 msgstr "МиБ"
 
-#: ../src/Widgets/Search.vala:9
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+msgid "GiB"
+msgstr "ГиБ"
+
+#: src/Widgets/Search.vala:9
 msgid "Search Process"
 msgstr "Найти процесс"
 
-#: ../src/Widgets/Search.vala:10
+#: src/Widgets/Search.vala:10
 msgid "Type Process Name or PID"
 msgstr "Введите имя или ИД процесса"
 
-#: ../src/MainWindow.vala:53
-msgid "Monitor"
-msgstr "Monitor"
+#: src/Widgets/Statusbar.vala:9
+msgid "CPU:"
+msgstr "ЦПУ:"
 
-#: ../src/MainWindow.vala:66
-msgid "End process"
-msgstr "Завершить процесс"
+#: src/Widgets/Statusbar.vala:10
+msgid "Memory:"
+msgstr "Память:"
 
-#: ../src/MainWindow.vala:68
-msgid "Ctrl+E"
-msgstr "Ctrl+E"
+#: src/Models/GenericModel.vala:274
+msgid "Background Applications"
+msgstr "Фоновые приложения"
diff --git a/po/uk.po b/po/uk.po
index cc6032b9..38122b01 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,66 +1,94 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-04 21:13+0200\n"
+"POT-Creation-Date: 2019-02-03 22:44+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: ../src/Models/ApplicationProcessModel.vala:68
-msgid "Background Applications"
-msgstr "Фонові додатки"
+#: src/Indicator/Widgets/PopoverWidget.vala:12
+msgid "Show Monitor"
+msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:25 ../src/Widgets/Statusbar.vala:41
-msgid "CPU:"
-msgstr "ЦП"
+#: src/Indicator/Widgets/PopoverWidget.vala:13
+msgid "Quit Monitor"
+msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:26 ../src/Widgets/Statusbar.vala:34
-msgid "Memory:"
-msgstr "Пам'ять:"
+#. Some information about the indicator
+#. Unique name
+#: src/Indicator/Indicator.vala:43
+msgid "Monitor Indicator"
+msgstr ""
 
-#: ../src/Widgets/Statusbar.vala:27 ../src/Widgets/OverallView.vala:116
-msgid "GiB"
-msgstr "ГіБ"
+#. Localised name
+#: src/Indicator/Indicator.vala:44
+msgid "Show system resources"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:11
+msgid "Monitor"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:18
+msgid "End process"
+msgstr "Закінчити процес"
+
+#: src/Widgets/Headerbar.vala:21
+msgid "Ctrl+E"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:28
+msgid "Settings"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:46
+msgid "Show an indicator"
+msgstr ""
 
-#: ../src/Widgets/OverallView.vala:32
+#. setup name column
+#: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr "Назва процесу"
 
-#: ../src/Widgets/OverallView.vala:51
+#: src/Widgets/OverallView.vala:42
 msgid "CPU"
 msgstr "ЦП"
 
-#: ../src/Widgets/OverallView.vala:62
+#: src/Widgets/OverallView.vala:53
 msgid "Memory"
 msgstr "Пам'ять"
 
-#: ../src/Widgets/OverallView.vala:72
+#: src/Widgets/OverallView.vala:63
 msgid "PID"
 msgstr ""
 
-#: ../src/Widgets/OverallView.vala:105
+#: src/Widgets/OverallView.vala:107
 msgid "KiB"
 msgstr "КіБ"
 
-#: ../src/Widgets/OverallView.vala:110
+#: src/Widgets/OverallView.vala:112
 msgid "MiB"
 msgstr "МіБ"
 
-#: ../src/Widgets/Search.vala:9
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+msgid "GiB"
+msgstr "ГіБ"
+
+#: src/Widgets/Search.vala:9
 msgid "Search Process"
 msgstr "Пошук процесу"
 
-#: ../src/Widgets/Search.vala:10
+#: src/Widgets/Search.vala:10
 msgid "Type Process Name or PID"
 msgstr "Введіть назву процесу або PID"
 
-#: ../src/MainWindow.vala:53
-msgid "Monitor"
-msgstr ""
+#: src/Widgets/Statusbar.vala:9
+msgid "CPU:"
+msgstr "ЦП"
 
-#: ../src/MainWindow.vala:66
-msgid "End process"
-msgstr "Закінчити процес"
+#: src/Widgets/Statusbar.vala:10
+msgid "Memory:"
+msgstr "Пам'ять:"
 
-#: ../src/MainWindow.vala:68
-msgid "Ctrl+E"
-msgstr ""
+#: src/Models/GenericModel.vala:274
+msgid "Background Applications"
+msgstr "Фонові додатки"
diff --git a/src/Indicator/Indicator.vala b/src/Indicator/Indicator.vala
index f0bad89a..9f587c21 100644
--- a/src/Indicator/Indicator.vala
+++ b/src/Indicator/Indicator.vala
@@ -7,6 +7,7 @@ public class Monitor.Indicator : Wingpanel.Indicator {
     private DBusClient dbusclient;
 
     construct {
+        Gtk.IconTheme.get_default().add_resource_path("/com/github/stsdc/monitor/icons");
         saved_state = Settings.get_default ();
         this.visible = false;
         display_widget = new Widgets.DisplayWidget ();
diff --git a/src/Indicator/Widgets/CPUWidget.vala b/src/Indicator/Widgets/CPUWidget.vala
index 4fe8b748..30daf7ad 100644
--- a/src/Indicator/Widgets/CPUWidget.vala
+++ b/src/Indicator/Widgets/CPUWidget.vala
@@ -5,21 +5,17 @@ public class Monitor.Widgets.CPUWidget : Gtk.Box {
     public int percentage {
         set { percentage_label.set_label ("%i%%".printf (value)); }
     }
-    Gtk.Image image;
 
     construct {
-        image = new Gtk.Image ();
-        //  image.icon_name = "multimedia-player-symbolic";
-        //  image.pixel_size = 16;
-
+        var icon = new Gtk.Image.from_icon_name ("cpu-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
         cpu_text = _("cpu");
         cpu_indicator_text = new Gtk.Label (cpu_text);
 
         percentage_label = new Gtk.Label ("N/A");
-        percentage_label.margin = 2;
+        percentage_label.margin = 1;
 
-        //  pack_start (image);
-        pack_start (cpu_indicator_text);
+        pack_start (icon);
+        //  pack_start (cpu_indicator_text);
         pack_start (percentage_label);
     }
 
diff --git a/src/Indicator/Widgets/MemoryWidget.vala b/src/Indicator/Widgets/MemoryWidget.vala
index 59b40548..9c953caa 100644
--- a/src/Indicator/Widgets/MemoryWidget.vala
+++ b/src/Indicator/Widgets/MemoryWidget.vala
@@ -6,21 +6,21 @@ public class Monitor.Widgets.MemoryWidget : Gtk.Box {
     public int percentage {
         set { percentage_label.set_label ("%i%%".printf (value)); }
     }
-    Gtk.Image image;
-
     construct {
         //  image = new Gtk.Image ();
         //  image.icon_name = "phone-symbolic";
         //  image.pixel_size = 16;
 
+        var icon = new Gtk.Image.from_icon_name ("ram-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
+
         mem_text = _("mem");
         mem_indicator_text = new Gtk.Label (mem_text);
 
         percentage_label = new Gtk.Label ("N/A");
         percentage_label.margin = 2;
 
-        //  pack_start (image);
-        pack_start (mem_indicator_text);
+        pack_start (icon);
+        //  pack_start (mem_indicator_text);
         pack_start (percentage_label);
 
     }
diff --git a/src/Managers/Process.vala b/src/Managers/Process.vala
index a89465fb..37fa1059 100644
--- a/src/Managers/Process.vala
+++ b/src/Managers/Process.vala
@@ -45,8 +45,7 @@ namespace Monitor {
             pid = _pid;
             last_total = 0;
 
-            exists = read_stat (0, 1);
-            read_cmdline ();
+            exists = read_stat (0, 1) && read_cmdline ();
         }
 
         // Updates the process to get latest information
diff --git a/src/Widgets/Statusbar.vala b/src/Widgets/Statusbar.vala
deleted file mode 100644
index 7adf6006..00000000
--- a/src/Widgets/Statusbar.vala
+++ /dev/null
@@ -1,29 +0,0 @@
-public class Monitor.Statusbar : Gtk.ActionBar {
-    Gtk.Label cpu_usage_label;
-    Gtk.Label memory_usage_label;
-
-    string cpu_text;
-    string memory_text;
-
-    construct {
-        cpu_text = _ ("CPU:");
-        memory_text = _ ("Memory:");
-        cpu_usage_label = new Gtk.Label (cpu_text);
-        pack_start (cpu_usage_label);
-
-        memory_usage_label = new Gtk.Label (memory_text);
-        memory_usage_label.margin_start = 6;
-        pack_start (memory_usage_label);
-    }
-
-    public Statusbar () {
-    }
-
-    public bool update (Utils.SystemResources sysres) {
-        cpu_usage_label.set_text (("%s %d%%").printf (cpu_text, sysres.cpu_percentage));
-        memory_usage_label.set_text (("%s %d%%").printf (memory_text, sysres.memory_percentage));
-        string tooltip_text = ("%.1f %s / %.1f %s").printf (sysres.memory_used, _ ("GiB"), sysres.memory_total, _ ("GiB"));
-        memory_usage_label.tooltip_text = tooltip_text;
-        return true;
-    }
-}
diff --git a/src/Widgets/Statusbar/Statusbar.vala b/src/Widgets/Statusbar/Statusbar.vala
new file mode 100644
index 00000000..ce9be7d2
--- /dev/null
+++ b/src/Widgets/Statusbar/Statusbar.vala
@@ -0,0 +1,32 @@
+public class Monitor.Statusbar : Gtk.ActionBar {
+    Gtk.Label cpu_usage_label;
+    Gtk.Label memory_usage_label;
+
+    construct {
+        var cpu_icon = new Gtk.Image.from_icon_name ("cpu-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
+        cpu_icon.tooltip_text = _ ("CPU");
+        
+        var ram_icon = new Gtk.Image.from_icon_name ("ram-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
+        ram_icon.tooltip_text = _ ("Memory");
+
+        cpu_usage_label = new Gtk.Label (_("Calculating…"));
+        pack_start (cpu_icon);
+        pack_start (cpu_usage_label);
+
+        memory_usage_label = new Gtk.Label (_("Calculating…"));
+        ram_icon.margin_start = 6;
+        pack_start (ram_icon);
+        pack_start (memory_usage_label);
+    }
+
+    public Statusbar () {
+    }
+
+    public bool update (Utils.SystemResources sysres) {
+        cpu_usage_label.set_text (("%d%%").printf (sysres.cpu_percentage));
+        memory_usage_label.set_text (("%d%%").printf (sysres.memory_percentage));
+        string tooltip_text = ("%.1f %s / %.1f %s").printf (sysres.memory_used, _ ("GiB"), sysres.memory_total, _ ("GiB"));
+        memory_usage_label.tooltip_text = tooltip_text;
+        return true;
+    }
+}