diff --git a/Modules/QtWidgets/include/QmitkMemoryUsageIndicatorView.h b/Modules/QtWidgets/include/QmitkMemoryUsageIndicatorView.h
index b049ca84b1..9eb9a0514c 100644
--- a/Modules/QtWidgets/include/QmitkMemoryUsageIndicatorView.h
+++ b/Modules/QtWidgets/include/QmitkMemoryUsageIndicatorView.h
@@ -1,48 +1,49 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
-#ifndef QMITKMEMORYUSAGEINDICATORVIEW_WIDGET
-#define QMITKMEMORYUSAGEINDICATORVIEW_WIDGET
+#ifndef QmitkMemoryUsageIndicatorView_h
+#define QmitkMemoryUsageIndicatorView_h
 
 #include <MitkQtWidgetsExports.h>
 
-#include "ui_QmitkMemoryUsageIndicator.h"
 #include <QWidget>
-#include <qpixmap.h>
+
+#include <array>
+#include <utility>
+
+namespace Ui
+{
+  class QmitkMemoryUsageIndicator;
+}
 
 /// \ingroup QmitkModule
-class MITKQTWIDGETS_EXPORT QmitkMemoryUsageIndicatorView : public QWidget, public Ui::QmitkMemoryUsageIndicator
+class MITKQTWIDGETS_EXPORT QmitkMemoryUsageIndicatorView : public QWidget
 {
   Q_OBJECT
 
 public:
-  /// constructor
-  QmitkMemoryUsageIndicatorView(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
-
-  /// destructor
+  QmitkMemoryUsageIndicatorView(QWidget* parent = nullptr);
   ~QmitkMemoryUsageIndicatorView() override;
 
-protected slots:
+private:
   void UpdateMemoryUsage();
-
-protected:
   std::string FormatMemorySize(size_t size);
   std::string FormatPercentage(double val);
   std::string GetMemoryDescription(size_t processSize, float percentage);
 
-  QPixmap m_LEDGreen;
-  QPixmap m_LEDYellow;
-  QPixmap m_LEDOrange;
-  QPixmap m_LEDRed;
-  char m_PreviousState;
+  static std::array<std::pair<float, QPixmap>, 4> s_States;
+
+  Ui::QmitkMemoryUsageIndicator* m_Ui;
+  size_t m_PreviousState;
 };
-#endif // QMITKMEMORYUSAGEINDICATORVIEW_WIDGET
+
+#endif
diff --git a/Modules/QtWidgets/src/QmitkMemoryUsageIndicator.ui b/Modules/QtWidgets/src/QmitkMemoryUsageIndicator.ui
index 8af3c1c083..1c34f9572c 100644
--- a/Modules/QtWidgets/src/QmitkMemoryUsageIndicator.ui
+++ b/Modules/QtWidgets/src/QmitkMemoryUsageIndicator.ui
@@ -1,93 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <exportmacro>MITKQTWIDGETS_EXPORT</exportmacro>
  <class>QmitkMemoryUsageIndicator</class>
  <widget class="QWidget" name="QmitkMemoryUsageIndicator">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>124</width>
     <height>22</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="maximumSize">
    <size>
     <width>32000</width>
     <height>32000</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Form1</string>
   </property>
   <property name="toolTip">
    <string>Memory usage in % of physical memory</string>
   </property>
   <layout class="QHBoxLayout">
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
-    <widget class="QLabel" name="m_Label">
+    <widget class="QLabel" name="label">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>000,00 %</string>
      </property>
-     <property name="textFormat">
-      <enum>Qt::AutoText</enum>
-     </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="m_LED">
+    <widget class="QLabel" name="led">
      <property name="maximumSize">
       <size>
        <width>20</width>
        <height>20</height>
       </size>
      </property>
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
-     <property name="pixmap">
-      <pixmap>QmitkApplicationBase/image0</pixmap>
-     </property>
      <property name="scaledContents">
       <bool>true</bool>
      </property>
-     <property name="wordWrap">
-      <bool>false</bool>
-     </property>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <includes>
   <include location="local">mitkCommon.h</include>
   <include location="global">string</include>
   <include location="global">qpixmap.h</include>
  </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/Modules/QtWidgets/src/QmitkMemoryUsageIndicatorView.cpp b/Modules/QtWidgets/src/QmitkMemoryUsageIndicatorView.cpp
index e5f61ab68d..8f58e4fc00 100644
--- a/Modules/QtWidgets/src/QmitkMemoryUsageIndicatorView.cpp
+++ b/Modules/QtWidgets/src/QmitkMemoryUsageIndicatorView.cpp
@@ -1,146 +1,131 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you want to add, delete, or rename functions or slots, use
 ** Qt Designer to update this file, preserving your code.
 **
 ** You should not define a constructor or destructor in this file.
 ** Instead, write your code in functions called init() and destroy().
 ** These will automatically be called by the form's constructor and
 ** destructor.
 *****************************************************************************/
 
-#include "QmitkMemoryUsageIndicatorView.h"
-#include <mitkMemoryUtilities.h>
+#include <QmitkMemoryUsageIndicatorView.h>
 
-#include <qapplication.h>
-#include <qeventloop.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qtimer.h>
+#include <mitkMemoryUtilities.h>
 
 #include <iomanip>
-#include <iostream>
-#include <sstream>
 
-#include "QmitkMemoryUsageIndicatorImagesGreen.xpm"
-#include "QmitkMemoryUsageIndicatorImagesOrange.xpm"
-#include "QmitkMemoryUsageIndicatorImagesRed.xpm"
-#include "QmitkMemoryUsageIndicatorImagesYellow.xpm"
+#include <QTimer>
+
+#include <QmitkMemoryUsageIndicatorImagesGreen.xpm>
+#include <QmitkMemoryUsageIndicatorImagesOrange.xpm>
+#include <QmitkMemoryUsageIndicatorImagesRed.xpm>
+#include <QmitkMemoryUsageIndicatorImagesYellow.xpm>
+
+#include <ui_QmitkMemoryUsageIndicator.h>
 
-QmitkMemoryUsageIndicatorView::QmitkMemoryUsageIndicatorView(QWidget * /*parent*/, Qt::WindowFlags /*f*/)
+std::array<std::pair<float, QPixmap>, 4> QmitkMemoryUsageIndicatorView::s_States = {
+  std::make_pair(0.0f, QPixmap(QmitkMemoryUsageIndicatorImagesGreen_xpm)),
+  std::make_pair(50.0f, QPixmap(QmitkMemoryUsageIndicatorImagesYellow_xpm)),
+  std::make_pair(65.0f, QPixmap(QmitkMemoryUsageIndicatorImagesOrange_xpm)),
+  std::make_pair(85.0f, QPixmap(QmitkMemoryUsageIndicatorImagesRed_xpm))
+};
+
+QmitkMemoryUsageIndicatorView::QmitkMemoryUsageIndicatorView(QWidget*)
+  : m_Ui(new Ui::QmitkMemoryUsageIndicator),
+    m_PreviousState(0)
 {
-  this->setupUi(this);
+  m_Ui->setupUi(this);
+  m_Ui->led->setPixmap(s_States[0].second);
 
   auto timer = new QTimer(this);
-  QObject::connect(timer, SIGNAL(timeout()), this, SLOT(UpdateMemoryUsage()));
+  connect(timer, &QTimer::timeout, this, &QmitkMemoryUsageIndicatorView::UpdateMemoryUsage);
   timer->start(1000);
-  m_LEDGreen = QPixmap(QmitkMemoryUsageIndicatorImagesGreen_xpm);
-  m_LEDYellow = QPixmap(QmitkMemoryUsageIndicatorImagesYellow_xpm);
-  m_LEDOrange = QPixmap(QmitkMemoryUsageIndicatorImagesOrange_xpm);
-  m_LEDRed = QPixmap(QmitkMemoryUsageIndicatorImagesRed_xpm);
-  m_LED->setPixmap(m_LEDGreen);
-  m_PreviousState = 0;
 }
 
 QmitkMemoryUsageIndicatorView::~QmitkMemoryUsageIndicatorView()
 {
 }
 
 void QmitkMemoryUsageIndicatorView::UpdateMemoryUsage()
 {
   size_t processSize = mitk::MemoryUtilities::GetProcessMemoryUsage();
   size_t totalSize = mitk::MemoryUtilities::GetTotalSizeOfPhysicalRam();
-  float percentage = ((float)processSize / (float)totalSize) * 100.0;
-  m_Label->setText(GetMemoryDescription(processSize, percentage).c_str());
-  if (percentage < 50.0)
-  {
-    if (m_PreviousState != 0)
-    {
-      m_LED->setPixmap(m_LEDGreen);
-      m_PreviousState = 0;
-      m_LED->update();
-    }
-  }
-  else if (percentage < 65.0)
-  {
-    if (m_PreviousState != 1)
-    {
-      m_LED->setPixmap(m_LEDYellow);
-      m_PreviousState = 1;
-      m_LED->update();
-    }
-  }
-  else if (percentage < 80.0)
-  {
-    if (m_PreviousState != 2)
-    {
-      m_LED->setPixmap(m_LEDOrange);
-      m_PreviousState = 2;
-      m_LED->update();
-    }
-  }
-  else
+  float percentage = static_cast<float>(processSize) / totalSize * 100.0f;
+
+  m_Ui->label->setText(QString::fromStdString(this->GetMemoryDescription(processSize, percentage)));
+
+  for (size_t i = s_States.size() - 1; i >= 0; --i)
   {
-    if (m_PreviousState != 3)
+    if (percentage >= s_States[i].first)
     {
-      m_LED->setPixmap(m_LEDRed);
-      m_PreviousState = 3;
-      m_LED->update();
+      if (m_PreviousState != i)
+      {
+        m_Ui->led->setPixmap(s_States[i].second);
+        m_PreviousState = i;
+      }
+
+      break;
     }
   }
 }
 
 std::string QmitkMemoryUsageIndicatorView::FormatMemorySize(size_t size)
 {
   double val = size;
-  std::string descriptor("B");
-  if (val >= 1000.0)
+  std::string unit;
+
+  if (val >= 1024.0)
   {
     val /= 1024.0;
-    descriptor = "KB";
+    unit = "K";
   }
-  if (val >= 1000.0)
+
+  if (val >= 1024.0)
   {
     val /= 1024.0;
-    descriptor = "MB";
+    unit = "M";
   }
-  if (val >= 1000.0)
+
+  if (val >= 1024.0)
   {
     val /= 1024.0;
-    descriptor = "GB";
+    unit = "G";
   }
+
+  unit += "B";
+
   std::ostringstream str;
   str.imbue(std::locale::classic());
-  str << std::fixed << std::setprecision(2) << val << " " << descriptor;
+  str << std::fixed << std::setprecision(2) << val << " " << unit;
   return str.str();
 }
 
 std::string QmitkMemoryUsageIndicatorView::FormatPercentage(double val)
 {
   std::ostringstream str;
   str.imbue(std::locale::classic());
-  str << std::fixed << std::setprecision(2) << val << " "
-      << "%";
+  str << std::fixed << std::setprecision(2) << val << " " << "%";
   return str.str();
 }
 
 std::string QmitkMemoryUsageIndicatorView::GetMemoryDescription(size_t processSize, float percentage)
 {
   std::ostringstream str;
   str.imbue(std::locale::classic());
   str << FormatMemorySize(processSize) << " (" << FormatPercentage(percentage) << ")";
   return str.str();
 }