diff --git a/Modules/QtWidgets/files.cmake b/Modules/QtWidgets/files.cmake
index 73069607e5..8352fe4632 100644
--- a/Modules/QtWidgets/files.cmake
+++ b/Modules/QtWidgets/files.cmake
@@ -1,137 +1,139 @@
 file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
   QmitkAbstractDataStorageModel.cpp
   QmitkAbstractMultiWidget.cpp
   QmitkAbstractNodeSelectionWidget.cpp
   QmitkApplicationCursor.cpp
   QmitkDataStorageComboBox.cpp
   QmitkDataStorageDefaultListModel.cpp
   QmitkDataStorageHistoryModel.cpp
   QmitkDataStorageListModel.cpp
   QmitkDataStorageTableModel.cpp
   QmitkDataStorageSimpleTreeModel.cpp
   QmitkDataStorageTreeModel.cpp
   QmitkDataStorageTreeModelInternalItem.cpp
   QmitkDnDDataNodeWidget.cpp
   QmitkFileReaderOptionsDialog.cpp
   QmitkFileReaderWriterOptionsWidget.cpp
   QmitkFileWriterOptionsDialog.cpp
   QmitkInteractionSchemeToolBar.cpp
   QmitkIOUtil.cpp
   QmitkLevelWindowPresetDefinitionDialog.cpp
   QmitkLevelWindowRangeChangeDialog.cpp
   QmitkLevelWindowWidgetContextMenu.cpp
   QmitkLevelWindowWidget.cpp
   QmitkLineEditLevelWindowWidget.cpp
   QmitkMemoryUsageIndicatorView.cpp
   QmitkMouseModeSwitcher.cpp
   QmitkMimeTypes.cpp
   QmitkMultiWidgetConfigurationToolBar.cpp
   QmitkMultiWidgetLayoutManager.cpp
   QmitkMultiWidgetLayoutSelectionWidget.cpp
   QmitkNodeDescriptor.cpp
   QmitkColoredNodeDescriptor.cpp
   QmitkNodeDescriptorManager.cpp
   QmitkProgressBar.cpp
   QmitkPropertiesTableEditor.cpp
   QmitkPropertiesTableModel.cpp
   QmitkPropertyDelegate.cpp
   QmitkRegisterClasses.cpp
   QmitkRenderingManager.cpp
   QmitkRenderingManagerFactory.cpp
   QmitkRenderWindow.cpp
   QmitkRenderWindowMenu.cpp
   QmitkRenderWindowWidget.cpp
   QmitkServiceListWidget.cpp
   QmitkSliderLevelWindowWidget.cpp
   QmitkStdMultiWidget.cpp
   QmitkMxNMultiWidget.cpp
   QmitkDataStorageComboBoxWithSelectNone.cpp
   QmitkDataStorageFilterProxyModel.cpp
   QmitkPropertyItem.cpp
   QmitkPropertyItemDelegate.cpp
   QmitkPropertyItemModel.cpp
   QmitkStyleManager.cpp
   QmitkAbstractDataStorageInspector.cpp
   QmitkDataStorageFavoriteNodesInspector.cpp
   QmitkDataStorageListInspector.cpp
   QmitkDataStorageTreeInspector.cpp
   QmitkDataStorageSelectionHistoryInspector.cpp
   QmitkModelViewSelectionConnector.cpp
   mitkIDataStorageInspectorProvider.cpp
   mitkQtWidgetsActivator.cpp
   mitkDataStorageInspectorGenerator.cpp
   QmitkOverlayWidget.cpp
+  QmitkSimpleTextOverlayWidget.cpp
   QmitkNodeDetailsDialog.cpp
 )
 
 set(MOC_H_FILES
   include/QmitkAbstractDataStorageModel.h
   include/QmitkAbstractMultiWidget.h
   include/QmitkAbstractNodeSelectionWidget.h
   include/QmitkDataStorageComboBox.h
   include/QmitkDataStorageTableModel.h
   include/QmitkDataStorageTreeModel.h
   include/QmitkDataStorageSimpleTreeModel.h
   include/QmitkDataStorageDefaultListModel.h
   include/QmitkDnDDataNodeWidget.h
   include/QmitkFileReaderOptionsDialog.h
   include/QmitkFileReaderWriterOptionsWidget.h
   include/QmitkFileWriterOptionsDialog.h
   include/QmitkInteractionSchemeToolBar.h
   include/QmitkLevelWindowPresetDefinitionDialog.h
   include/QmitkLevelWindowRangeChangeDialog.h
   include/QmitkLevelWindowWidgetContextMenu.h
   include/QmitkLevelWindowWidget.h
   include/QmitkLineEditLevelWindowWidget.h
   include/QmitkMemoryUsageIndicatorView.h
   include/QmitkMouseModeSwitcher.h
   include/QmitkMultiWidgetConfigurationToolBar.h
   include/QmitkMultiWidgetLayoutManager.h
   include/QmitkMultiWidgetLayoutSelectionWidget.h
   include/QmitkNodeDescriptor.h
   include/QmitkColoredNodeDescriptor.h
   include/QmitkNodeDescriptorManager.h
   include/QmitkProgressBar.h
   include/QmitkPropertiesTableEditor.h
   include/QmitkPropertyDelegate.h
   include/QmitkRenderingManager.h
   include/QmitkRenderWindow.h
   include/QmitkRenderWindowMenu.h
   include/QmitkRenderWindowWidget.h
   include/QmitkServiceListWidget.h
   include/QmitkSliderLevelWindowWidget.h
   include/QmitkStdMultiWidget.h
   include/QmitkMxNMultiWidget.h
   include/QmitkDataStorageComboBoxWithSelectNone.h
   include/QmitkPropertyItemDelegate.h
   include/QmitkPropertyItemModel.h
   include/QmitkAbstractDataStorageInspector.h
   include/QmitkDataStorageFavoriteNodesInspector.h
   include/QmitkDataStorageListInspector.h
   include/QmitkDataStorageTreeInspector.h
   include/QmitkDataStorageHistoryModel.h
   include/QmitkDataStorageSelectionHistoryInspector.h
   include/QmitkModelViewSelectionConnector.h
   include/QmitkOverlayWidget.h
+  include/QmitkSimpleTextOverlayWidget.h
   include/QmitkNodeDetailsDialog.h
 )
 
 set(UI_FILES
   src/QmitkFileReaderOptionsDialog.ui
   src/QmitkFileWriterOptionsDialog.ui
   src/QmitkLevelWindowPresetDefinition.ui
   src/QmitkLevelWindowWidget.ui
   src/QmitkLevelWindowRangeChange.ui
   src/QmitkMemoryUsageIndicator.ui
   src/QmitkMultiWidgetLayoutSelectionWidget.ui
   src/QmitkServiceListWidgetControls.ui
   src/QmitkDataStorageListInspector.ui
   src/QmitkDataStorageTreeInspector.ui
   src/QmitkDataStorageSelectionHistoryInspector.ui
 )
 
 set(QRC_FILES
   resource/Qmitk.qrc
 )
diff --git a/Modules/QtWidgets/include/QmitkDataStorageFavoriteNodesInspector.h b/Modules/QtWidgets/include/QmitkDataStorageFavoriteNodesInspector.h
index 45312b974e..7153e02a75 100644
--- a/Modules/QtWidgets/include/QmitkDataStorageFavoriteNodesInspector.h
+++ b/Modules/QtWidgets/include/QmitkDataStorageFavoriteNodesInspector.h
@@ -1,53 +1,58 @@
 /*============================================================================
 
 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 QMITKDATASTORAGEFAVORITENODESINSPECTOR_H
 #define QMITKDATASTORAGEFAVORITENODESINSPECTOR_H
 
 #include <MitkQtWidgetsExports.h>
 
 #include <QmitkDataStorageListInspector.h>
 
 #include "mitkNodePredicateProperty.h"
+#include "QmitkSimpleTextOverlayWidget.h"
 
 /*
 * @brief This is an inspector that offers a simple list view on favorite nodes of a data storage.
 */
 class MITKQTWIDGETS_EXPORT QmitkDataStorageFavoriteNodesInspector : public QmitkDataStorageListInspector
 {
   Q_OBJECT
 
 public:
 
   QmitkDataStorageFavoriteNodesInspector(QWidget* parent = nullptr);
 
   /**
   * @brief Overrides the corresponding function of QmitkAbstractDataStorageInspector:
   *        The custom favorite nodes predicate is added to the parameter predicate
   *        which results in a combined node predicate that always filters nodes according
   *        to their favorite-property-state.
   *
   * @param nodePredicate    A pointer to a node predicate.
   */
   void SetNodePredicate(const mitk::NodePredicateBase* nodePredicate) override;
 
+  constexpr static const char* INSPECTOR_ID()
+  {
+    return "org.mitk.QmitkDataStorageFavoriteNodesInspector";
+  };
+
 protected Q_SLOTS:
 
   void OnFavoriteNodesButtonClicked();
 
 private:
 
   mitk::NodePredicateProperty::Pointer m_FavoriteNodeSelectionPredicate;
-
 };
 
 #endif // QMITKDATASTORAGEFAVORITENODESINSPECTOR_H
diff --git a/Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.h b/Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.h
index 44c32549e4..52d55d3d52 100644
--- a/Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.h
+++ b/Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.h
@@ -1,78 +1,81 @@
 /*============================================================================
 
 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 __QMITK_DATA_STORAGE_INSPECTOR_PROVIDER_BASE_H
 #define __QMITK_DATA_STORAGE_INSPECTOR_PROVIDER_BASE_H
 
 #include <memory>
 
 // Microservices
 #include <usGetModuleContext.h>
 #include <usServiceProperties.h>
 #include <usServiceRegistration.h>
 
 // MITK
 #include <mitkIDataStorageInspectorProvider.h>
 
 
 /**
  * @brief Base class for DataStorage inspector provider.
  *
  * This class is the default implementation for a inspector provider. You can template it with
  * the respective inspector class to directly use it.
  */
 template <class TInspector>
 class QmitkDataStorageInspectorProviderBase : public mitk::IDataStorageInspectorProvider
 {
 public:
   QmitkAbstractDataStorageInspector* CreateInspector() const override;
 
-  std::string GetInspectorID() const override;
+  using InspectorIDType = mitk::IDataStorageInspectorProvider::InspectorIDType;
+
+  InspectorIDType GetInspectorID() const override;
   std::string GetInspectorDisplayName() const override;
   std::string GetInspectorDescription() const override;
+  QIcon GetInspectorIcon() const override;
 
   us::ServiceRegistration<mitk::IDataStorageInspectorProvider> RegisterService(
     us::ModuleContext *context = us::GetModuleContext());
 
   void UnregisterService();
 
   QmitkDataStorageInspectorProviderBase(const std::string& id);
-  QmitkDataStorageInspectorProviderBase(const std::string& id, const std::string& displayName, const std::string& desc= "" );
+  QmitkDataStorageInspectorProviderBase(const std::string& id, const std::string& displayName, const std::string& desc = "", const std::string& pathToIconSVG = "");
   ~QmitkDataStorageInspectorProviderBase() override;
 
 protected:
   QmitkDataStorageInspectorProviderBase(const QmitkDataStorageInspectorProviderBase &other);
   QmitkDataStorageInspectorProviderBase &operator=(const QmitkDataStorageInspectorProviderBase &other) = delete;
 
   virtual us::ServiceProperties GetServiceProperties() const;
 
   /**
    * \brief Set the service ranking for this file reader.
    *
    * Default is zero and should only be chosen differently for a reason.
    * The ranking is used to determine which provider to use if several
    * equivalent providers have been found.
    * It may be used to replace a default provider from MITK in your own project.
    */
   void SetRanking(int ranking);
   int GetRanking() const;
 
 private:
   class Impl;
   std::unique_ptr<Impl> d;
 };
 
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "QmitkDataStorageInspectorProviderBase.tpp"
 #endif
 
 #endif /* __QMITK_DATA_STORAGE_INSPECTOR_PROVIDER_BASE_H */
diff --git a/Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.tpp b/Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.tpp
index ed49cd2311..686f1c3d16 100644
--- a/Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.tpp
+++ b/Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.tpp
@@ -1,145 +1,166 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include <QmitkDataStorageInspectorProviderBase.h>
 #include <mitkExceptionMacro.h>
 
 #include <usGetModuleContext.h>
 #include <usModuleContext.h>
 #include <usPrototypeServiceFactory.h>
 
-  template<class TInspector>
-  class QmitkDataStorageInspectorProviderBase<TInspector>::Impl
-  {
-  public:
-    Impl(const std::string& id, const std::string& displayName, const std::string& desc) : m_Ranking(0), m_ID(id), m_DisplayName(displayName), m_Desc(desc)
-    {
-    };
-
-    Impl(const Impl &other) = default;
-
-    void SetRanking(int ranking)
-    {
-      m_Ranking = ranking;
-    };
-
-    int GetRanking() const
-    {
-      return m_Ranking;
-    };
-
-    us::ServiceRegistration<mitk::IDataStorageInspectorProvider> m_Reg;
-    int m_Ranking;
-    std::string m_ID;
-    std::string m_DisplayName;
-    std::string m_Desc;
-  };
-
-  template<class TInspector>
-  QmitkDataStorageInspectorProviderBase<TInspector>::QmitkDataStorageInspectorProviderBase(const std::string& id) : QmitkDataStorageInspectorProviderBase(id, id)
-  {
-  }
-
-  template<class TInspector>
-  QmitkDataStorageInspectorProviderBase<TInspector>::QmitkDataStorageInspectorProviderBase(const std::string& id, const std::string& displayName, const std::string& desc)
-  {
-    d.reset(new Impl(id, displayName, desc));
-    RegisterService();
-  }
-
-  template<class TInspector>
-  QmitkDataStorageInspectorProviderBase<TInspector>::~QmitkDataStorageInspectorProviderBase()
-  {
-    UnregisterService();
-  }
+#include <QmitkStyleManager.h>
 
-  template<class TInspector>
-  QmitkDataStorageInspectorProviderBase<TInspector>::QmitkDataStorageInspectorProviderBase(const QmitkDataStorageInspectorProviderBase &other) : IDataStorageInspectorProvider(), d(new Impl(*other.d.get()))
-  {
-  }
+#include <QFile>
 
-  template<class TInspector>
-  QmitkAbstractDataStorageInspector*
-    QmitkDataStorageInspectorProviderBase<TInspector>::CreateInspector() const
+template<class TInspector>
+class QmitkDataStorageInspectorProviderBase<TInspector>::Impl
+{
+public:
+  Impl(const std::string& id, const std::string& displayName, const std::string& desc, const QByteArray& svg) : m_Ranking(0), m_ID(id), m_DisplayName(displayName), m_Desc(desc), m_SVG(svg)
   {
-    return new TInspector;
   };
 
-  template<class TInspector>
-  std::string
-    QmitkDataStorageInspectorProviderBase<TInspector>::GetInspectorID() const
-  {
-    return d->m_ID;
-  };
+  Impl(const Impl &other) = default;
 
-  template<class TInspector>
-  std::string
-    QmitkDataStorageInspectorProviderBase<TInspector>::GetInspectorDisplayName() const
+  void SetRanking(int ranking)
   {
-    return d->m_DisplayName;
+    m_Ranking = ranking;
   };
 
-  template<class TInspector>
-  std::string
-    QmitkDataStorageInspectorProviderBase<TInspector>::GetInspectorDescription() const
+  int GetRanking() const
   {
-    return d->m_Desc;
+    return m_Ranking;
   };
 
-  template<class TInspector>
-  us::ServiceRegistration<mitk::IDataStorageInspectorProvider>
-    QmitkDataStorageInspectorProviderBase<TInspector>::RegisterService(us::ModuleContext *context)
+  us::ServiceRegistration<mitk::IDataStorageInspectorProvider> m_Reg;
+  int m_Ranking;
+  std::string m_ID;
+  std::string m_DisplayName;
+  std::string m_Desc;
+  QByteArray m_SVG;
+};
+
+template<class TInspector>
+QmitkDataStorageInspectorProviderBase<TInspector>::QmitkDataStorageInspectorProviderBase(const std::string& id) : QmitkDataStorageInspectorProviderBase(id, id)
+{
+}
+
+template<class TInspector>
+QmitkDataStorageInspectorProviderBase<TInspector>::QmitkDataStorageInspectorProviderBase(const std::string& id, const std::string& displayName, const std::string& desc, const std::string& pathToIconSVG)
+{
+  QByteArray svg;
+
+  if (!pathToIconSVG.empty())
   {
-    if (d->m_Reg)
-      return d->m_Reg;
-
-    if (context == nullptr)
-    {
-      context = us::GetModuleContext();
-    }
+    QFile iconFile(QString::fromStdString(pathToIconSVG));
+    if (iconFile.open(QIODevice::ReadOnly))
+        svg = iconFile.readAll();
+  }
 
-    us::ServiceProperties props = this->GetServiceProperties();
-    d->m_Reg = context->RegisterService<IDataStorageInspectorProvider>(this, props);
+  d.reset(new Impl(id, displayName, desc, svg));
+  RegisterService();
+}
+
+template<class TInspector>
+QmitkDataStorageInspectorProviderBase<TInspector>::~QmitkDataStorageInspectorProviderBase()
+{
+  UnregisterService();
+}
+
+template<class TInspector>
+QmitkDataStorageInspectorProviderBase<TInspector>::QmitkDataStorageInspectorProviderBase(const QmitkDataStorageInspectorProviderBase &other) : IDataStorageInspectorProvider(), d(new Impl(*other.d.get()))
+{
+}
+
+template<class TInspector>
+QmitkAbstractDataStorageInspector*
+  QmitkDataStorageInspectorProviderBase<TInspector>::CreateInspector() const
+{
+  return new TInspector;
+}
+
+template<class TInspector>
+typename QmitkDataStorageInspectorProviderBase<TInspector>::InspectorIDType
+  QmitkDataStorageInspectorProviderBase<TInspector>::GetInspectorID() const
+{
+  return d->m_ID;
+}
+
+template<class TInspector>
+std::string
+  QmitkDataStorageInspectorProviderBase<TInspector>::GetInspectorDisplayName() const
+{
+  return d->m_DisplayName;
+}
+
+template<class TInspector>
+std::string
+  QmitkDataStorageInspectorProviderBase<TInspector>::GetInspectorDescription() const
+{
+  return d->m_Desc;
+}
+
+template<class TInspector>
+QIcon
+  QmitkDataStorageInspectorProviderBase<TInspector>::GetInspectorIcon() const
+{
+  return QmitkStyleManager::ThemeIcon(d->m_SVG);
+}
+
+template<class TInspector>
+us::ServiceRegistration<mitk::IDataStorageInspectorProvider>
+  QmitkDataStorageInspectorProviderBase<TInspector>::RegisterService(us::ModuleContext *context)
+{
+  if (d->m_Reg)
     return d->m_Reg;
-  }
 
-  template<class TInspector>
-  void
-    QmitkDataStorageInspectorProviderBase<TInspector>::UnregisterService()
+  if (context == nullptr)
   {
-    try
-    {
-      d->m_Reg.Unregister();
-    }
-    catch (const std::exception &)
-    {
-    }
+    context = us::GetModuleContext();
   }
 
-  template<class TInspector>
-  us::ServiceProperties
-  QmitkDataStorageInspectorProviderBase<TInspector>::GetServiceProperties() const
-  {
-    us::ServiceProperties result;
+  us::ServiceProperties props = this->GetServiceProperties();
+  d->m_Reg = context->RegisterService<IDataStorageInspectorProvider>(this, props);
+  return d->m_Reg;
+}
 
-    result[IDataStorageInspectorProvider::PROP_INSPECTOR_ID()] = this->d->m_ID;
-    result[us::ServiceConstants::SERVICE_RANKING()] = this->GetRanking();
-    return result;
+template<class TInspector>
+void
+  QmitkDataStorageInspectorProviderBase<TInspector>::UnregisterService()
+{
+  try
+  {
+    d->m_Reg.Unregister();
   }
-
-  template<class TInspector>
-  void
-  QmitkDataStorageInspectorProviderBase<TInspector>::SetRanking(int ranking) { d->SetRanking(ranking); }
-
-  template<class TInspector>
-  int
-  QmitkDataStorageInspectorProviderBase<TInspector>::GetRanking() const { return d->GetRanking(); }
+  catch (const std::exception &)
+  {
+  }
+}
+
+template<class TInspector>
+us::ServiceProperties
+QmitkDataStorageInspectorProviderBase<TInspector>::GetServiceProperties() const
+{
+  us::ServiceProperties result;
+
+  result[IDataStorageInspectorProvider::PROP_INSPECTOR_ID()] = this->d->m_ID;
+  result[us::ServiceConstants::SERVICE_RANKING()] = this->GetRanking();
+  return result;
+}
+
+template<class TInspector>
+void
+QmitkDataStorageInspectorProviderBase<TInspector>::SetRanking(int ranking) { d->SetRanking(ranking); }
+
+template<class TInspector>
+int
+QmitkDataStorageInspectorProviderBase<TInspector>::GetRanking() const { return d->GetRanking(); }
diff --git a/Modules/QtWidgets/include/QmitkDataStorageListInspector.h b/Modules/QtWidgets/include/QmitkDataStorageListInspector.h
index 1b87d0ff3c..082ef54ba4 100644
--- a/Modules/QtWidgets/include/QmitkDataStorageListInspector.h
+++ b/Modules/QtWidgets/include/QmitkDataStorageListInspector.h
@@ -1,46 +1,48 @@
 /*============================================================================
 
 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 QMITKDATASTORAGELISTINSPECTOR_H
 #define QMITKDATASTORAGELISTINSPECTOR_H
 
 #include <MitkQtWidgetsExports.h>
 
-#include <QmitkAbstractDataStorageInspector.h>
-#include <QSortFilterProxyModel>
+#include "QmitkAbstractDataStorageInspector.h"
+#include "QmitkSimpleTextOverlayWidget.h"
 
 #include "ui_QmitkDataStorageListInspector.h"
 
 /*
 * @brief This is an inspector that offers a simple list view on a data storage.
 */
 class MITKQTWIDGETS_EXPORT QmitkDataStorageListInspector : public QmitkAbstractDataStorageInspector
 {
   Q_OBJECT
 
 public:
   QmitkDataStorageListInspector(QWidget* parent = nullptr);
 
   QAbstractItemView* GetView() override;
   const QAbstractItemView* GetView() const override;
 
   void SetSelectionMode(SelectionMode mode) override;
   SelectionMode GetSelectionMode() const override;
 
 protected:
   void Initialize() override;
+  void OnModelReset();
 
   QmitkAbstractDataStorageModel* m_StorageModel;
   Ui_QmitkDataStorageListInspector m_Controls;
+  QmitkSimpleTextOverlayWidget* m_Overlay;
 };
 
 #endif // QMITKDATASTORAGELISTINSPECTOR_H
diff --git a/Modules/QtWidgets/include/QmitkDataStorageSelectionHistoryInspector.h b/Modules/QtWidgets/include/QmitkDataStorageSelectionHistoryInspector.h
index 80ba29e334..c03c22a3c4 100644
--- a/Modules/QtWidgets/include/QmitkDataStorageSelectionHistoryInspector.h
+++ b/Modules/QtWidgets/include/QmitkDataStorageSelectionHistoryInspector.h
@@ -1,49 +1,56 @@
 /*============================================================================
 
 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 QMITKDATASTORAGESELECTIONHISTORYINSPECTOR_H
 #define QMITKDATASTORAGESELECTIONHISTORYINSPECTOR_H
 
 #include <MitkQtWidgetsExports.h>
 
-#include <QmitkAbstractDataStorageInspector.h>
+#include "QmitkAbstractDataStorageInspector.h"
 #include <QSortFilterProxyModel>
+#include "QmitkSimpleTextOverlayWidget.h"
 
 #include "ui_QmitkDataStorageSelectionHistoryInspector.h"
 
 /*
 * @brief This is an inspector that offers a simple list view on the last selected nodes (in chronologic order) in a data storage.
 */
 class MITKQTWIDGETS_EXPORT QmitkDataStorageSelectionHistoryInspector : public QmitkAbstractDataStorageInspector
 {
   Q_OBJECT
 
 public:
   QmitkDataStorageSelectionHistoryInspector(QWidget* parent = nullptr);
 
   QAbstractItemView* GetView() override;
   const QAbstractItemView* GetView() const override;
 
   void SetSelectionMode(SelectionMode mode) override;
   SelectionMode GetSelectionMode() const override;
 
   static void AddNodeToHistory(mitk::DataNode* node);
   static void ResetHistory();
 
+  constexpr static const char* INSPECTOR_ID()
+  {
+    return "org.mitk.QmitkDataStorageSelectionHistoryInspector";
+  };
+
 protected:
   void Initialize() override;
 
   QmitkAbstractDataStorageModel* m_StorageModel;
   Ui_QmitkDataStorageSelectionHistoryInspector m_Controls;
+  QmitkSimpleTextOverlayWidget* m_Overlay;
 };
 
 #endif // QMITKDATASTORAGESELECTIONHISTORYINSPECTOR_H
diff --git a/Modules/QtWidgets/include/QmitkDataStorageTreeInspector.h b/Modules/QtWidgets/include/QmitkDataStorageTreeInspector.h
index b999ba6310..46442b55f7 100644
--- a/Modules/QtWidgets/include/QmitkDataStorageTreeInspector.h
+++ b/Modules/QtWidgets/include/QmitkDataStorageTreeInspector.h
@@ -1,48 +1,51 @@
 /*============================================================================
 
 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 QMITKDATASTORAGETREEINSPECTOR_H
 #define QMITKDATASTORAGETREEINSPECTOR_H
 
 #include <MitkQtWidgetsExports.h>
 
 #include <QmitkAbstractDataStorageInspector.h>
+#include "QmitkSimpleTextOverlayWidget.h"
 #include <QSortFilterProxyModel>
 
 #include "ui_QmitkDataStorageTreeInspector.h"
 
 /*
 * @brief This is an inspector that offers a simple tree view on a data storage.
 * Something like the "data manager plugin", but in simple/light (with less functionality)
 * It uses the QmitkDataStorageSimpleTreeModel.
 */
 class MITKQTWIDGETS_EXPORT QmitkDataStorageTreeInspector : public QmitkAbstractDataStorageInspector
 {
   Q_OBJECT
 
 public:
   QmitkDataStorageTreeInspector(QWidget* parent = nullptr);
 
   QAbstractItemView* GetView() override;
   const QAbstractItemView* GetView() const override;
 
   void SetSelectionMode(SelectionMode mode) override;
   SelectionMode GetSelectionMode() const override;
 
 protected:
   void Initialize() override;
+  void OnModelReset();
 
   QmitkAbstractDataStorageModel* m_StorageModel;
   Ui_QmitkDataStorageTreeInspector m_Controls;
+  QmitkSimpleTextOverlayWidget* m_Overlay;
 };
 
 #endif // QMITKDATASTORAGETREEINSPECTOR_H
diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkSimpleTextOverlayWidget.h b/Modules/QtWidgets/include/QmitkSimpleTextOverlayWidget.h
similarity index 89%
rename from Plugins/org.mitk.gui.qt.common/src/QmitkSimpleTextOverlayWidget.h
rename to Modules/QtWidgets/include/QmitkSimpleTextOverlayWidget.h
index d7ae90f67a..dd3d46b952 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkSimpleTextOverlayWidget.h
+++ b/Modules/QtWidgets/include/QmitkSimpleTextOverlayWidget.h
@@ -1,41 +1,41 @@
 /*============================================================================
 
 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 QMITK_SIMPLE_TEXT_OVERLAY_WIDGET_H
 #define QMITK_SIMPLE_TEXT_OVERLAY_WIDGET_H
 
 #include "QmitkOverlayWidget.h"
-#include "org_mitk_gui_qt_common_Export.h"
+#include <MitkQtWidgetsExports.h>
 
 /** Simple overlay that renders a passed string.
  You may pass an html string that will be rendered accordingly
  respecting the current application style sheet.*/
-class MITK_QT_COMMON QmitkSimpleTextOverlayWidget : public QmitkOverlayWidget
+class MITKQTWIDGETS_EXPORT QmitkSimpleTextOverlayWidget : public QmitkOverlayWidget
 {
   Q_OBJECT
   Q_PROPERTY(QString overlayText READ GetOverlayText WRITE SetOverlayText)
 
 public:
   explicit QmitkSimpleTextOverlayWidget(QWidget* parent = nullptr);
   ~QmitkSimpleTextOverlayWidget() override;
 
   QString GetOverlayText() const;
   void SetOverlayText(const QString& text);
 
 protected:
   void paintEvent(QPaintEvent* event) override;
 
 private:
   QString m_Text;
 };
 
 #endif
diff --git a/Modules/QtWidgets/include/mitkDataStorageInspectorGenerator.h b/Modules/QtWidgets/include/mitkDataStorageInspectorGenerator.h
index 4356c46e22..f6500115a7 100644
--- a/Modules/QtWidgets/include/mitkDataStorageInspectorGenerator.h
+++ b/Modules/QtWidgets/include/mitkDataStorageInspectorGenerator.h
@@ -1,41 +1,41 @@
 /*============================================================================
 
 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 mitkDataStorageInspectorGenerator_H
 #define mitkDataStorageInspectorGenerator_H
 
 #include "mitkIDataStorageInspectorProvider.h"
 
 #include <MitkQtWidgetsExports.h>
 
 namespace mitk
 {
-  /** Convinvience class to get all or specific DataStorageInspectorProvider. */
+  /** Convenience class to get all or specific DataStorageInspectorProvider. */
   class MITKQTWIDGETS_EXPORT DataStorageInspectorGenerator
   {
   public:
-    using IDType = std::string;
+    using IDType = mitk::IDataStorageInspectorProvider::InspectorIDType;
 
     using ProviderMapType = std::map<IDType, mitk::IDataStorageInspectorProvider*>;
     static ProviderMapType GetProviders();
 
     static mitk::IDataStorageInspectorProvider *GetProvider(const IDType &id);
 
   protected:
     DataStorageInspectorGenerator();
     virtual ~DataStorageInspectorGenerator();
     DataStorageInspectorGenerator(const DataStorageInspectorGenerator &source) = delete;
     DataStorageInspectorGenerator& operator=(const DataStorageInspectorGenerator &) = delete;
   };
 }
 
 #endif
diff --git a/Modules/QtWidgets/include/mitkIDataStorageInspectorProvider.h b/Modules/QtWidgets/include/mitkIDataStorageInspectorProvider.h
index 9a0f1ab9ae..220558b73e 100644
--- a/Modules/QtWidgets/include/mitkIDataStorageInspectorProvider.h
+++ b/Modules/QtWidgets/include/mitkIDataStorageInspectorProvider.h
@@ -1,67 +1,73 @@
 /*============================================================================
 
 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 __I_DATA_STORAGE_INSPECTOR_PROVIDER_H
 #define __I_DATA_STORAGE_INSPECTOR_PROVIDER_H
 
 #include <mitkServiceInterface.h>
 
 #include <MitkQtWidgetsExports.h>
 
+#include <QIcon>
+
 class QmitkAbstractDataStorageInspector;
 
 namespace mitk
 {
   /**
    * \ingroup MicroServices_Interfaces
    *
    * \brief The common interface for all DataStorage inspector providers.
    *
    * Implementations of this interface must be registered as a service
    * to make themselves available via the service registry.
    *
    * It is recommended to derive new implementations from QmitkDataStorageInspectorProviderBase
    * which provide correct service registration semantics.
    *
    * \sa QmitkDataStorageInspectorProviderBase
    */
   struct MITKQTWIDGETS_EXPORT IDataStorageInspectorProvider
   {
     virtual ~IDataStorageInspectorProvider();
 
     /**
      * \brief returns an inspector instance represented by the provider.
      */
     virtual QmitkAbstractDataStorageInspector* CreateInspector() const = 0;
 
+    using InspectorIDType = std::string;
     /** Return the uniqe ID for the inspector type provided.*/
-    virtual std::string GetInspectorID() const = 0;
+    virtual InspectorIDType GetInspectorID() const = 0;
     /** Return the display name (e.g. used in the UI) for the inspector type provided.*/
     virtual std::string GetInspectorDisplayName() const = 0;
     /** Returns a description of the inspector type provided.*/
     virtual std::string GetInspectorDescription() const = 0;
+    /** Returns the svg data of the icon of the inspector. Empty array indicates that no icon is defined.
+     @remark It is passed as svg file content and not as icon directly to allow later styling*/
+    virtual QIcon GetInspectorIcon() const = 0;
 
     /**
     * @brief Service property name for the inspector ID.
     *
     * The property value must be of type \c std::string.
     *
     * @return The property name.
     */
     static std::string PROP_INSPECTOR_ID();
   };
 
 } // namespace mitk
 
 MITK_DECLARE_SERVICE_INTERFACE(mitk::IDataStorageInspectorProvider, "org.mitk.IDataStorageInspectorProvider")
 
 #endif /* __I_DATA_STORAGE_INSPECTOR_PROVIDER_H */
diff --git a/Modules/QtWidgets/resource/Qmitk.qrc b/Modules/QtWidgets/resource/Qmitk.qrc
index e650d857e8..4f12f499d8 100644
--- a/Modules/QtWidgets/resource/Qmitk.qrc
+++ b/Modules/QtWidgets/resource/Qmitk.qrc
@@ -1,20 +1,26 @@
 <RCC>
     <qresource prefix="/Qmitk">
         <file>Binaerbilder_48.png</file>
         <file>Images_48.png</file>
         <file>PointSet_48.png</file>
         <file>Segmentation_48.png</file>
         <file>Surface_48.png</file>
         <file>mm_pointer.png</file>
         <file>mm_scroll.png</file>
         <file>mm_zoom.png</file>
         <file>mm_contrast.png</file>
         <file>mm_pan.png</file>
         <file>LabelSetImage_48.png</file>
 		<file>mwLayout.png</file>
 		<file>mwSynchronized.png</file>
 		<file>mwDesynchronized.png</file>
 		<file>mwMITK.png</file>
 		<file>mwPACS.png</file>
-    </qresource>
+		<file>star-solid.svg</file>
+		<file>history-solid.svg</file>
+		<file>tree_inspector.svg</file>
+		<file>list-solid.svg</file>
+		<file>favorite_add.svg</file>
+		<file>favorite_remove.svg</file>
+	</qresource>
 </RCC>
diff --git a/Modules/QtWidgets/resource/favorite_add.svg b/Modules/QtWidgets/resource/favorite_add.svg
new file mode 100644
index 0000000000..6240713584
--- /dev/null
+++ b/Modules/QtWidgets/resource/favorite_add.svg
@@ -0,0 +1,39 @@
+<?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"
+   id="svg827"
+   version="1.1"
+   viewBox="0 0 576 512"
+   role="img"
+   class="svg-inline--fa fa-star fa-w-18"
+   data-icon="star"
+   data-prefix="fas"
+   focusable="false"
+   aria-hidden="true">
+  <metadata
+     id="metadata833">
+    <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="defs831" />
+  <path
+     style="fill:#00ff00"
+     id="path825"
+     d="M 288.03711 -0.01171875 C 276.62461 -0.04921875 265.20078 5.8507813 259.30078 17.800781 L 194 150.19922 L 47.900391 171.5 C 21.700391 175.3 11.199219 207.59961 30.199219 226.09961 L 135.90039 329.09961 L 110.90039 474.59961 C 106.40039 500.89961 134.10078 520.60078 157.30078 508.30078 L 288 439.59961 L 359 476.91992 L 359 426.34961 L 274 426.34961 L 274 294.26367 C 302.32787 294.44437 330.65625 294.30173 358.98438 294.30273 C 359.08718 266.65177 358.9136 239.00061 359 211.34961 L 359 210.34961 L 359 209.34961 L 491 209.34961 L 491 279.5 L 545.80078 226.09961 C 564.80078 207.59961 554.29961 175.3 528.09961 171.5 L 382 150.19922 L 316.69922 17.800781 C 310.84922 6.0007812 299.44961 0.02578125 288.03711 -0.01171875 z M 427.17969 511.34961 C 431.46516 512.23949 435.74991 512.18675 439.82617 511.34961 L 427.17969 511.34961 z " />
+  <path
+     id="rect835-4"
+     d="m 385.00002,235.34957 v 85 h -85 v 80 h 85 v 85 h 80 v -85 h 85 v -80 h -85 v -85 z"
+     style="opacity:1;fill:#ff00ff;fill-opacity:1;stroke:#000000;stroke-width:12;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
+</svg>
diff --git a/Modules/QtWidgets/resource/favorite_remove.svg b/Modules/QtWidgets/resource/favorite_remove.svg
new file mode 100644
index 0000000000..c05b9c255e
--- /dev/null
+++ b/Modules/QtWidgets/resource/favorite_remove.svg
@@ -0,0 +1,42 @@
+<?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"
+   id="svg827"
+   version="1.1"
+   viewBox="0 0 576 512"
+   role="img"
+   class="svg-inline--fa fa-star fa-w-18"
+   data-icon="star"
+   data-prefix="fas"
+   focusable="false"
+   aria-hidden="true">
+  <metadata
+     id="metadata833">
+    <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="defs831" />
+  <path
+     id="path825-6"
+     d="M 288.03711 -0.01171875 C 276.62461 -0.04921875 265.20078 5.8507814 259.30078 17.800781 L 194 150.20117 L 47.900391 171.5 C 21.700391 175.3 11.199219 207.60156 30.199219 226.10156 L 135.90039 329.10156 L 110.90039 474.60156 C 106.40039 500.90156 134.10078 520.60078 157.30078 508.30078 L 288 439.60156 L 418.69922 508.30078 C 441.89922 520.50078 469.59961 500.90156 465.09961 474.60156 L 456.80859 426.34961 L 274 426.34961 L 274 296.34961 L 274 295.34961 L 274 294.34961 L 475.76367 294.34961 L 545.80078 226.10156 C 564.80078 207.60156 554.29961 175.3 528.09961 171.5 L 382 150.20117 L 316.69922 17.800781 C 310.84922 6.0007814 299.44961 0.02578125 288.03711 -0.01171875 z "
+     style="fill:#00ff00" />
+  <rect
+     y="320.34958"
+     x="300.00003"
+     height="80"
+     width="250"
+     id="rect835-7"
+     style="opacity:1;fill:#ff00ff;fill-opacity:1;stroke:#000000;stroke-width:12;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
+</svg>
diff --git a/Modules/QtWidgets/resource/history-solid.svg b/Modules/QtWidgets/resource/history-solid.svg
new file mode 100644
index 0000000000..625e17a3ef
--- /dev/null
+++ b/Modules/QtWidgets/resource/history-solid.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="history" class="svg-inline--fa fa-history fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#00ff00" d="M504 255.531c.253 136.64-111.18 248.372-247.82 248.468-59.015.042-113.223-20.53-155.822-54.911-11.077-8.94-11.905-25.541-1.839-35.607l11.267-11.267c8.609-8.609 22.353-9.551 31.891-1.984C173.062 425.135 212.781 440 256 440c101.705 0 184-82.311 184-184 0-101.705-82.311-184-184-184-48.814 0-93.149 18.969-126.068 49.932l50.754 50.754c10.08 10.08 2.941 27.314-11.313 27.314H24c-8.837 0-16-7.163-16-16V38.627c0-14.254 17.234-21.393 27.314-11.314l49.372 49.372C129.209 34.136 189.552 8 256 8c136.81 0 247.747 110.78 248 247.531zm-180.912 78.784l9.823-12.63c8.138-10.463 6.253-25.542-4.21-33.679L288 256.349V152c0-13.255-10.745-24-24-24h-16c-13.255 0-24 10.745-24 24v135.651l65.409 50.874c10.463 8.137 25.541 6.253 33.679-4.21z"></path></svg>
\ No newline at end of file
diff --git a/Modules/QtWidgets/resource/icon-license.txt b/Modules/QtWidgets/resource/icon-license.txt
new file mode 100644
index 0000000000..662c801d5f
--- /dev/null
+++ b/Modules/QtWidgets/resource/icon-license.txt
@@ -0,0 +1,6 @@
+See [Font Awsome 4] in Licenses/ICONS.md for:
+- history-solid.svg based on Font Awsome's history-solid.svg 
+- list-solid.svg based on Font Awsome's list-solid.svg
+- star-solid.svg based on Font Awsome's star-solid.svg
+- favorite_add.svg based on Font Awsome's star-solid.svg
+- favorite_remove.svg based on Font Awsome's star-solid.svg
diff --git a/Modules/QtWidgets/resource/list-solid.svg b/Modules/QtWidgets/resource/list-solid.svg
new file mode 100644
index 0000000000..f66f89c243
--- /dev/null
+++ b/Modules/QtWidgets/resource/list-solid.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="list" class="svg-inline--fa fa-list fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#00FF00" d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"></path></svg>
\ No newline at end of file
diff --git a/Modules/QtWidgets/resource/star-solid.svg b/Modules/QtWidgets/resource/star-solid.svg
new file mode 100644
index 0000000000..9ca5eb51ae
--- /dev/null
+++ b/Modules/QtWidgets/resource/star-solid.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="star" class="svg-inline--fa fa-star fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="#00ff00" d="M259.3 17.8L194 150.2 47.9 171.5c-26.2 3.8-36.7 36.1-17.7 54.6l105.7 103-25 145.5c-4.5 26.3 23.2 46 46.4 33.7L288 439.6l130.7 68.7c23.2 12.2 50.9-7.4 46.4-33.7l-25-145.5 105.7-103c19-18.5 8.5-50.8-17.7-54.6L382 150.2 316.7 17.8c-11.7-23.6-45.6-23.9-57.4 0z"></path></svg>
\ No newline at end of file
diff --git a/Modules/QtWidgets/resource/tree_inspector.svg b/Modules/QtWidgets/resource/tree_inspector.svg
new file mode 100644
index 0000000000..82a332cdab
--- /dev/null
+++ b/Modules/QtWidgets/resource/tree_inspector.svg
@@ -0,0 +1,55 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 1792 1792"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="data-manager.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1378"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.37249375"
+     inkscape:cx="2483.1212"
+     inkscape:cy="1102.7655"
+     inkscape:window-x="1592"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <path
+     id="path4326"
+     d="m 1082.734,833.75533 q 0,-25.2869 -18.4789,-43.76579 -18.4789,-18.47889 -43.7657,-18.47889 l -248.97878,0 q -25.2869,0 -43.76579,18.47889 -18.47889,18.47889 -18.47889,43.76579 0,25.2869 18.47889,43.76578 18.47889,18.4789 43.76579,18.4789 l 248.97878,0 q 25.2868,0 43.7657,-18.4789 18.4789,-18.47888 18.4789,-43.76578 z m 560.2022,-186.73404 0,933.67021 q 0,25.2869 -18.4789,43.7657 -18.4788,18.4789 -43.7657,18.4789 l -1369.38309,0 q -25.2869,0 -43.7658,-18.4789 -18.47889,-18.4788 -18.47889,-43.7657 l 0,-933.67021 q 0,-25.2869 18.47889,-43.76578 18.4789,-18.4789 43.7658,-18.4789 l 1369.38309,0 q 25.2869,0 43.7657,18.4789 18.4789,18.47888 18.4789,43.76578 z m 62.2447,-435.71275 0,248.97871 q 0,25.28691 -18.4788,43.76579 -18.4789,18.47889 -43.7659,18.47889 l -1493.87238,0 q -25.2869,0 -43.76579,-18.47889 -18.478887,-18.47888 -18.478887,-43.76579 l 0,-248.97871 q 0,-25.2869 18.478887,-43.76579 18.47889,-18.47889 43.76579,-18.47889 l 1493.87238,0 q 25.287,0 43.7658,18.47889 18.4788,18.47889 18.4788,43.76579 z"
+     inkscape:connector-curvature="0"
+     style="fill:#00ff00;fill-opacity:1" />
+</svg>
diff --git a/Modules/QtWidgets/src/QmitkDataStorageFavoriteNodesInspector.cpp b/Modules/QtWidgets/src/QmitkDataStorageFavoriteNodesInspector.cpp
index 489263a5a1..f64a2a8146 100644
--- a/Modules/QtWidgets/src/QmitkDataStorageFavoriteNodesInspector.cpp
+++ b/Modules/QtWidgets/src/QmitkDataStorageFavoriteNodesInspector.cpp
@@ -1,50 +1,55 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include <QmitkDataStorageFavoriteNodesInspector.h>
 
-#include <QmitkDataStorageDefaultListModel.h>
+#include "QmitkDataStorageDefaultListModel.h"
 
 #include "mitkNodePredicateAnd.h"
 
 #include "QPushButton"
+#include "QmitkStyleManager.h"
 
 QmitkDataStorageFavoriteNodesInspector::QmitkDataStorageFavoriteNodesInspector(QWidget* parent/* = nullptr*/)
   : QmitkDataStorageListInspector(parent)
 {
-  auto favoriteNodesButton = new QPushButton("Remove selection from favorites", parent);
+  auto favoriteNodesButton = new QPushButton(parent);
   QmitkDataStorageListInspector::m_Controls.verticalLayout->addWidget(favoriteNodesButton, 0, Qt::AlignRight);
 
+  favoriteNodesButton->setIcon(QmitkStyleManager::ThemeIcon(QStringLiteral(":/Qmitk/favorite_remove.svg")));
+  favoriteNodesButton->setIconSize(QSize(24, 24));
+  favoriteNodesButton->setToolTip("Remove selected nodes as favorite");
+
   m_FavoriteNodeSelectionPredicate = mitk::NodePredicateProperty::New("org.mitk.selection.favorite", mitk::BoolProperty::New(true));
   m_NodePredicate = m_FavoriteNodeSelectionPredicate;
 
   connect(favoriteNodesButton, &QPushButton::clicked, this, &QmitkDataStorageFavoriteNodesInspector::OnFavoriteNodesButtonClicked);
 }
 
 void QmitkDataStorageFavoriteNodesInspector::SetNodePredicate(const mitk::NodePredicateBase* nodePredicate)
 {
   mitk::NodePredicateAnd::Pointer combinedPredicate = mitk::NodePredicateAnd::New();
 
   combinedPredicate->AddPredicate(m_FavoriteNodeSelectionPredicate);
   combinedPredicate->AddPredicate(nodePredicate);
 
   QmitkDataStorageListInspector::SetNodePredicate(combinedPredicate);
 }
 
 void QmitkDataStorageFavoriteNodesInspector::OnFavoriteNodesButtonClicked()
 {
   auto selectedNodes = GetSelectedNodes();
   for (auto node : selectedNodes)
   {
     node->SetBoolProperty("org.mitk.selection.favorite", false);
   }
 }
diff --git a/Modules/QtWidgets/src/QmitkDataStorageListInspector.cpp b/Modules/QtWidgets/src/QmitkDataStorageListInspector.cpp
index dff7f3b3c9..5b8da1aa36 100644
--- a/Modules/QtWidgets/src/QmitkDataStorageListInspector.cpp
+++ b/Modules/QtWidgets/src/QmitkDataStorageListInspector.cpp
@@ -1,57 +1,68 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include <QmitkDataStorageListInspector.h>
 
 #include <QmitkDataStorageDefaultListModel.h>
 
 QmitkDataStorageListInspector::QmitkDataStorageListInspector(QWidget* parent/* = nullptr*/)
   : QmitkAbstractDataStorageInspector(parent)
 {
   m_Controls.setupUi(this);
 
   m_Controls.view->setSelectionMode(QAbstractItemView::ExtendedSelection);
   m_Controls.view->setSelectionBehavior(QAbstractItemView::SelectRows);
   m_Controls.view->setAlternatingRowColors(true);
 
+  m_Overlay = new QmitkSimpleTextOverlayWidget(this);
+  m_Overlay->setVisible(false);
+  m_Overlay->SetOverlayText(QStringLiteral("<font class=\"normal\"><p style=\"text-align:center\">No suitable data available in data storage.</p></center></font>"));
+
   m_StorageModel = new QmitkDataStorageDefaultListModel(this);
 
   m_Controls.view->setModel(m_StorageModel);
+
+  connect(m_StorageModel, &QAbstractItemModel::modelReset, this, &QmitkDataStorageListInspector::OnModelReset);
 }
 
 QAbstractItemView* QmitkDataStorageListInspector::GetView()
 {
   return m_Controls.view;
 }
 
 const QAbstractItemView* QmitkDataStorageListInspector::GetView() const
 {
   return m_Controls.view;
 }
 
 void QmitkDataStorageListInspector::Initialize()
 {
   m_StorageModel->SetDataStorage(m_DataStorage.Lock());
   m_StorageModel->SetNodePredicate(m_NodePredicate);
 
   m_Connector->SetView(m_Controls.view);
 }
 
 void QmitkDataStorageListInspector::SetSelectionMode(SelectionMode mode)
 {
   m_Controls.view->setSelectionMode(mode);
 }
 
 QmitkDataStorageListInspector::SelectionMode QmitkDataStorageListInspector::GetSelectionMode() const
 {
   return m_Controls.view->selectionMode();
 }
+
+void QmitkDataStorageListInspector::OnModelReset()
+{
+  m_Overlay->setVisible(m_StorageModel->rowCount() == 0);
+}
diff --git a/Modules/QtWidgets/src/QmitkDataStorageSelectionHistoryInspector.cpp b/Modules/QtWidgets/src/QmitkDataStorageSelectionHistoryInspector.cpp
index a9fe9b5722..ef35513131 100644
--- a/Modules/QtWidgets/src/QmitkDataStorageSelectionHistoryInspector.cpp
+++ b/Modules/QtWidgets/src/QmitkDataStorageSelectionHistoryInspector.cpp
@@ -1,67 +1,73 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include <QmitkDataStorageSelectionHistoryInspector.h>
 
-#include <QmitkDataStorageHistoryModel.h>
+#include "QmitkDataStorageHistoryModel.h"
 
 QmitkDataStorageSelectionHistoryInspector::QmitkDataStorageSelectionHistoryInspector(QWidget* parent/* = nullptr*/)
   : QmitkAbstractDataStorageInspector(parent)
 {
   m_Controls.setupUi(this);
 
   m_Controls.view->setSelectionMode(QAbstractItemView::ExtendedSelection);
   m_Controls.view->setSelectionBehavior(QAbstractItemView::SelectRows);
   m_Controls.view->setAlternatingRowColors(true);
 
+  m_Overlay = new QmitkSimpleTextOverlayWidget(this);
+  m_Overlay->setVisible(false);
+  m_Overlay->SetOverlayText(QStringLiteral("<font class=\"normal\"><p style=\"text-align:center\">No history available yet.</p></center></font>"));
+
   m_StorageModel = new QmitkDataStorageHistoryModel(this);
 
   m_Controls.view->setModel(m_StorageModel);
 }
 
 QAbstractItemView* QmitkDataStorageSelectionHistoryInspector::GetView()
 {
   return m_Controls.view;
 }
 
 const QAbstractItemView* QmitkDataStorageSelectionHistoryInspector::GetView() const
 {
   return m_Controls.view;
 }
 
 void QmitkDataStorageSelectionHistoryInspector::Initialize()
 {
   m_StorageModel->SetDataStorage(m_DataStorage.Lock());
   m_StorageModel->SetNodePredicate(m_NodePredicate);
 
   m_Connector->SetView(m_Controls.view);
+
+  m_Overlay->setVisible(m_StorageModel->rowCount() == 0);
 }
 
 void QmitkDataStorageSelectionHistoryInspector::SetSelectionMode(SelectionMode mode)
 {
   m_Controls.view->setSelectionMode(mode);
 }
 
 QmitkDataStorageSelectionHistoryInspector::SelectionMode QmitkDataStorageSelectionHistoryInspector::GetSelectionMode() const
 {
   return m_Controls.view->selectionMode();
 }
 
 void QmitkDataStorageSelectionHistoryInspector::AddNodeToHistory(mitk::DataNode* node)
 {
     QmitkDataStorageHistoryModel::AddNodeToHistory(node);
 }
 
 void QmitkDataStorageSelectionHistoryInspector::ResetHistory()
 {
     QmitkDataStorageHistoryModel::ResetHistory();
 }
diff --git a/Modules/QtWidgets/src/QmitkDataStorageSimpleTreeModel.cpp b/Modules/QtWidgets/src/QmitkDataStorageSimpleTreeModel.cpp
index f75cfbd875..5f7b269025 100644
--- a/Modules/QtWidgets/src/QmitkDataStorageSimpleTreeModel.cpp
+++ b/Modules/QtWidgets/src/QmitkDataStorageSimpleTreeModel.cpp
@@ -1,366 +1,370 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include <QmitkDataStorageSimpleTreeModel.h>
 #include <QmitkDataStorageTreeModelInternalItem.h>
 #include <QmitkNodeDescriptorManager.h>
 
 // qt widgets module
 #include "QmitkCustomVariants.h"
 #include "QmitkEnums.h"
 
 QmitkDataStorageSimpleTreeModel::QmitkDataStorageSimpleTreeModel(QObject *parent)
   : QmitkAbstractDataStorageModel(parent), m_Root(nullptr)
 {
   ResetTree();
 }
 
 QmitkDataStorageSimpleTreeModel::~QmitkDataStorageSimpleTreeModel()
 {
   m_Root->Delete();
   m_Root = nullptr;
 };
 
 void QmitkDataStorageSimpleTreeModel::ResetTree()
 {
   mitk::DataNode::Pointer rootDataNode = mitk::DataNode::New();
   rootDataNode->SetName("Data Storage");
   m_Root = new TreeItem(rootDataNode, nullptr);
 }
 
 void QmitkDataStorageSimpleTreeModel::DataStorageChanged()
 {
   if (m_Root)
   {
     m_Root->Delete();
   }
 
+  beginResetModel();
   ResetTree();
   UpdateModelData();
+  endResetModel();
 }
 
 void QmitkDataStorageSimpleTreeModel::NodePredicateChanged()
 {
+  beginResetModel();
   ResetTree();
   UpdateModelData();
+  endResetModel();
 }
 
 void QmitkDataStorageSimpleTreeModel::NodeAdded(const mitk::DataNode *node)
 {
   if (node == nullptr || m_DataStorage.IsExpired() || !m_DataStorage.Lock()->Exists(node) ||
       m_Root->Find(node) != nullptr)
     return;
 
   this->AddNodeInternal(node);
 }
 
 void QmitkDataStorageSimpleTreeModel::NodeChanged(const mitk::DataNode *node)
 {
   TreeItem *treeItem = m_Root->Find(node);
   if (treeItem)
   {
     TreeItem *parentTreeItem = treeItem->GetParent();
     // as the root node should not be removed one should always have a parent item
     if (!parentTreeItem)
       return;
     QModelIndex index = this->createIndex(treeItem->GetIndex(), 0, treeItem);
 
     // now emit the dataChanged signal
     emit dataChanged(index, index);
   }
 }
 
 void QmitkDataStorageSimpleTreeModel::NodeRemoved(const mitk::DataNode *node)
 {
   if (node == nullptr || !m_Root)
     return;
 
   TreeItem *treeItem = m_Root->Find(node);
   if (!treeItem)
     return; // return because there is no treeitem containing this node
 
   TreeItem *parentTreeItem = treeItem->GetParent();
   QModelIndex parentIndex = this->IndexFromTreeItem(parentTreeItem);
 
   // emit beginRemoveRows event (QModelIndex is empty because we dont have a tree model)
   this->beginRemoveRows(parentIndex, treeItem->GetIndex(), treeItem->GetIndex());
 
   // remove node
   std::vector<TreeItem *> children = treeItem->GetChildren();
   m_TreeItems.remove(treeItem);
   delete treeItem; //delete in tree
 
   if (!children.empty())
   {
     //if not empty we have to rebuild the whole representation,
     //because the children could be now top level, or at another
     //source/parent.
     this->UpdateModelData();
   }
 }
 
 QModelIndex QmitkDataStorageSimpleTreeModel::index(int row, int column, const QModelIndex &parent) const
 {
   TreeItem *parentItem;
 
   if (!parent.isValid() || parent.model() != this)
     parentItem = m_Root;
   else
     parentItem = static_cast<TreeItem *>(parent.internalPointer());
 
   if (parentItem)
   {
     TreeItem *childItem = parentItem->GetChild(row);
     if (childItem)
       return createIndex(row, column, childItem);
   }
 
   return QModelIndex();
 }
 
 QModelIndex QmitkDataStorageSimpleTreeModel::parent(const QModelIndex &child) const
 {
   if (!child.isValid() || !m_Root || child.model() != this)
     return QModelIndex();
 
   TreeItem *childItem = this->TreeItemFromIndex(child);
 
   if (!childItem)
     return QModelIndex();
 
   TreeItem *parentItem = childItem->GetParent();
 
   if (parentItem == m_Root)
     return QModelIndex();
 
   return this->createIndex(parentItem->GetIndex(), 0, parentItem);
 }
 
 QmitkDataStorageSimpleTreeModel::TreeItem *QmitkDataStorageSimpleTreeModel::TreeItemFromIndex(
   const QModelIndex &index) const
 {
   if (index.isValid() && index.model() == this)
   {
     auto item = static_cast<TreeItem *>(index.internalPointer());
     auto finding = std::find(std::begin(m_TreeItems), std::end(m_TreeItems), item);
     if (finding == std::end(m_TreeItems))
     {
       return nullptr;
     }
     return item;
   }
   else
     return m_Root;
 }
 
 int QmitkDataStorageSimpleTreeModel::rowCount(const QModelIndex &parent) const
 {
   TreeItem *parentTreeItem = this->TreeItemFromIndex(parent);
   if (parentTreeItem)
     return parentTreeItem->GetChildCount();
   else
     return 0;
 }
 
 int QmitkDataStorageSimpleTreeModel::columnCount(const QModelIndex &/*parent*/) const
 {
   return 1;
 }
 
 QVariant QmitkDataStorageSimpleTreeModel::data(const QModelIndex &index, int role) const
 {
   if (!index.isValid() || index.model() != this)
   {
     return QVariant();
   }
 
   auto treeItem = this->TreeItemFromIndex(index);
   if (!treeItem)
     return QVariant();
 
   mitk::DataNode *dataNode = treeItem->GetDataNode();
 
   QString nodeName = QString::fromStdString(dataNode->GetName());
   if (nodeName.isEmpty())
   {
     nodeName = "unnamed";
   }
 
   if (role == Qt::DisplayRole)
     return nodeName;
   else if (role == Qt::ToolTipRole)
     return nodeName;
   else if (role == Qt::DecorationRole)
   {
     QmitkNodeDescriptor *nodeDescriptor = QmitkNodeDescriptorManager::GetInstance()->GetDescriptor(dataNode);
     return nodeDescriptor->GetIcon(dataNode);
   }
   else if (role == QmitkDataNodeRole)
   {
     return QVariant::fromValue<mitk::DataNode::Pointer>(mitk::DataNode::Pointer(dataNode));
   }
   else if (role == QmitkDataNodeRawPointerRole)
   {
     return QVariant::fromValue<mitk::DataNode *>(dataNode);
   }
 
   return QVariant();
 }
 
 bool QmitkDataStorageSimpleTreeModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
   if (!index.isValid() || index.model() != this)
     return false;
 
   auto treeItem = this->TreeItemFromIndex(index);
   if (!treeItem)
     return false;
 
   mitk::DataNode *dataNode = treeItem->GetDataNode();
   if (!dataNode)
     return false;
 
   if (role == Qt::EditRole && !value.toString().isEmpty())
   {
     dataNode->SetName(value.toString().toStdString().c_str());
   }
   else if (role == Qt::CheckStateRole)
   {
     // Please note: value.toInt() returns 2, independentely from the actual checkstate of the index element.
     // Therefore the checkstate is being estimated again here.
 
     QVariant qcheckstate = index.data(Qt::CheckStateRole);
     int checkstate = qcheckstate.toInt();
     bool isVisible = bool(checkstate);
     dataNode->SetVisibility(!isVisible);
   }
   // inform listeners about changes
   emit dataChanged(index, index);
   return true;
 }
 
 QVariant QmitkDataStorageSimpleTreeModel::headerData(int /*section*/, Qt::Orientation orientation, int role) const
 {
   if (orientation == Qt::Horizontal && role == Qt::DisplayRole && m_Root)
     return QString::fromStdString(m_Root->GetDataNode()->GetName());
 
   return QVariant();
 }
 
 Qt::ItemFlags QmitkDataStorageSimpleTreeModel::flags(const QModelIndex &index) const
 {
   if (index.isValid() && index.model() == this)
   {
     auto treeItem = this->TreeItemFromIndex(index);
     if (!treeItem)
       return Qt::NoItemFlags;
 
     const auto dataNode = treeItem->GetDataNode();
     if (m_NodePredicate.IsNull() || m_NodePredicate->CheckNode(dataNode))
     {
       return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
     }
     else
     {
       return Qt::NoItemFlags;
     }
 
   }
 
   return Qt::NoItemFlags;
 }
 
 mitk::DataNode *QmitkDataStorageSimpleTreeModel::GetParentNode(const mitk::DataNode *node) const
 {
   mitk::DataNode *dataNode = nullptr;
 
   mitk::DataStorage::SetOfObjects::ConstPointer _Sources = m_DataStorage.Lock()->GetSources(node);
 
   if (_Sources->Size() > 0)
     dataNode = _Sources->front();
 
   return dataNode;
 }
 
 void QmitkDataStorageSimpleTreeModel::AddNodeInternal(const mitk::DataNode *node)
 {
   if (node == nullptr || m_DataStorage.IsExpired() || !m_DataStorage.Lock()->Exists(node) || m_Root->Find(node) != nullptr)
     return;
 
   // find out if we have a root node
   TreeItem *parentTreeItem = m_Root;
   QModelIndex index;
   mitk::DataNode *parentDataNode = this->GetParentNode(node);
 
   if (parentDataNode) // no top level data node
   {
     parentTreeItem = m_Root->Find(parentDataNode); // find the corresponding tree item
     if (!parentTreeItem)
     {
       this->NodeAdded(parentDataNode);
       parentTreeItem = m_Root->Find(parentDataNode);
       if (!parentTreeItem)
         return;
     }
 
     // get the index of this parent with the help of the grand parent
     index = this->createIndex(parentTreeItem->GetIndex(), 0, parentTreeItem);
   }
 
   int firstRowWithASiblingBelow = 0;
   int nodeLayer = -1;
   node->GetIntProperty("layer", nodeLayer);
   for (TreeItem *siblingTreeItem : parentTreeItem->GetChildren())
   {
     int siblingLayer = -1;
     if (mitk::DataNode *siblingNode = siblingTreeItem->GetDataNode())
     {
       siblingNode->GetIntProperty("layer", siblingLayer);
     }
     if (nodeLayer > siblingLayer)
     {
       break;
     }
     ++firstRowWithASiblingBelow;
   }
   beginInsertRows(index, firstRowWithASiblingBelow, firstRowWithASiblingBelow);
   auto newNode = new TreeItem(const_cast<mitk::DataNode *>(node));
   parentTreeItem->InsertChild(newNode, firstRowWithASiblingBelow);
   m_TreeItems.push_back(newNode);
 
   endInsertRows();
 }
 
 QModelIndex QmitkDataStorageSimpleTreeModel::IndexFromTreeItem(TreeItem *item) const
 {
   if (item == m_Root)
     return QModelIndex();
   else
     return this->createIndex(item->GetIndex(), 0, item);
 }
 
 void QmitkDataStorageSimpleTreeModel::UpdateModelData()
 {
   if (!m_DataStorage.IsExpired())
   {
     auto nodeset = m_DataStorage.Lock()->GetAll();
     if (m_NodePredicate != nullptr)
     {
       nodeset = m_DataStorage.Lock()->GetSubset(m_NodePredicate);
     }
 
     for (const auto& node : *nodeset)
     {
       this->AddNodeInternal(node);
     }
   }
 }
diff --git a/Modules/QtWidgets/src/QmitkDataStorageTreeInspector.cpp b/Modules/QtWidgets/src/QmitkDataStorageTreeInspector.cpp
index 7afc8d39da..f1d7d95eab 100644
--- a/Modules/QtWidgets/src/QmitkDataStorageTreeInspector.cpp
+++ b/Modules/QtWidgets/src/QmitkDataStorageTreeInspector.cpp
@@ -1,61 +1,72 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include <QmitkDataStorageTreeInspector.h>
 
 #include <QmitkDataStorageSimpleTreeModel.h>
 
 QmitkDataStorageTreeInspector::QmitkDataStorageTreeInspector(QWidget* parent/* = nullptr*/)
   : QmitkAbstractDataStorageInspector(parent)
 {
   m_Controls.setupUi(this);
 
   m_Controls.view->setSelectionMode(QAbstractItemView::ExtendedSelection);
   m_Controls.view->setSelectionBehavior(QAbstractItemView::SelectRows);
   m_Controls.view->setAlternatingRowColors(true);
   m_Controls.view->setHeaderHidden(true);
   m_Controls.view->setTextElideMode(Qt::ElideMiddle);
 
+  m_Overlay = new QmitkSimpleTextOverlayWidget(this);
+  m_Overlay->setVisible(false);
+  m_Overlay->SetOverlayText(QStringLiteral("<font class=\"normal\"><p style=\"text-align:center\">No suitable data available in data storage.</p></center></font>"));
+
   m_StorageModel = new QmitkDataStorageSimpleTreeModel(this);
 
   m_Controls.view->setModel(m_StorageModel);
+
+  connect(m_StorageModel, &QAbstractItemModel::modelReset, this, &QmitkDataStorageTreeInspector::OnModelReset);
 }
 
 QAbstractItemView* QmitkDataStorageTreeInspector::GetView()
 {
   return m_Controls.view;
 }
 
 const QAbstractItemView* QmitkDataStorageTreeInspector::GetView() const
 {
   return m_Controls.view;
 }
 
 void QmitkDataStorageTreeInspector::Initialize()
 {
   m_StorageModel->SetDataStorage(m_DataStorage.Lock());
   m_StorageModel->SetNodePredicate(m_NodePredicate);
 
   m_Connector->SetView(m_Controls.view);
 
   m_Controls.view->expandAll();
 }
 
 void QmitkDataStorageTreeInspector::SetSelectionMode(SelectionMode mode)
 {
   m_Controls.view->setSelectionMode(mode);
 }
 
 QmitkDataStorageTreeInspector::SelectionMode QmitkDataStorageTreeInspector::GetSelectionMode() const
 {
   return m_Controls.view->selectionMode();
 }
+
+void QmitkDataStorageTreeInspector::OnModelReset()
+{
+  m_Overlay->setVisible(!m_StorageModel->hasChildren());
+}
diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkSimpleTextOverlayWidget.cpp b/Modules/QtWidgets/src/QmitkSimpleTextOverlayWidget.cpp
similarity index 73%
rename from Plugins/org.mitk.gui.qt.common/src/QmitkSimpleTextOverlayWidget.cpp
rename to Modules/QtWidgets/src/QmitkSimpleTextOverlayWidget.cpp
index c8832a3fa5..4c21847399 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkSimpleTextOverlayWidget.cpp
+++ b/Modules/QtWidgets/src/QmitkSimpleTextOverlayWidget.cpp
@@ -1,72 +1,62 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include "QmitkSimpleTextOverlayWidget.h"
 
-#include <berryWorkbenchPlugin.h>
-#include <berryQtStyleManager.h>
-
 #include "QTextDocument"
 #include "QPainter"
+#include "QApplication" 
 
 QmitkSimpleTextOverlayWidget::QmitkSimpleTextOverlayWidget(QWidget* parent)
   : QmitkOverlayWidget(parent)
 {
 }
 
 QmitkSimpleTextOverlayWidget::~QmitkSimpleTextOverlayWidget()
 {
 }
 
 QString QmitkSimpleTextOverlayWidget::GetOverlayText() const
 {
   return m_Text;
 }
 
 void QmitkSimpleTextOverlayWidget::SetOverlayText(const QString& text)
 {
   m_Text = text;
   this->update();
 }
 
 void QmitkSimpleTextOverlayWidget::paintEvent(QPaintEvent* p)
 {
   QmitkOverlayWidget::paintEvent(p);
 
-  QString stylesheet;
-
-  ctkPluginContext* context = berry::WorkbenchPlugin::GetDefault()->GetPluginContext();
-  ctkServiceReference styleManagerRef = context->getServiceReference<berry::IQtStyleManager>();
-  if (styleManagerRef)
-  {
-    auto styleManager = context->getService<berry::IQtStyleManager>(styleManagerRef);
-    stylesheet = styleManager->GetStylesheet();
-  }
+  auto styleSheet = qApp->styleSheet();
 
   QPainter painter(this);
   QTextDocument td(this);
-  td.setDefaultStyleSheet(stylesheet);
+  td.setDefaultStyleSheet(styleSheet);
 
   auto widgetSize = this->size();
   td.setTextWidth(widgetSize.width()-20.);
   QPoint origin = QPoint(10, 5);
 
   td.setHtml(m_Text);
 
   auto textSize = td.size();
 
   origin.setX((widgetSize.width() - textSize.width()) / 2.);
   origin.setY((widgetSize.height() - textSize.height()) / 2.);
 
   painter.translate(origin);
   td.drawContents(&painter);
 }
diff --git a/Modules/QtWidgets/src/mitkQtWidgetsActivator.cpp b/Modules/QtWidgets/src/mitkQtWidgetsActivator.cpp
index deaf7af8b7..5496077667 100644
--- a/Modules/QtWidgets/src/mitkQtWidgetsActivator.cpp
+++ b/Modules/QtWidgets/src/mitkQtWidgetsActivator.cpp
@@ -1,38 +1,39 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include "mitkQtWidgetsActivator.h"
 
 // Micro Services
 #include <usModuleActivator.h>
 #include <usModuleContext.h>
 
 // Qmitk
 #include "QmitkDataStorageInspectorProviderBase.h"
 #include "QmitkDataStorageListInspector.h"
 #include "QmitkDataStorageTreeInspector.h"
 #include "QmitkDataStorageSelectionHistoryInspector.h"
 #include "QmitkDataStorageFavoriteNodesInspector.h"
 
 void MitkQtWidgetsActivator::Load(us::ModuleContext * /*context*/)
 {
-  m_TreeInspector.reset(new QmitkDataStorageInspectorProviderBase<QmitkDataStorageListInspector>("org.mitk.QmitkDataStorageListInspector", "Simple list", "Displays the filtered content of the data storage in a simple list."));
-  m_ListInspector.reset(new QmitkDataStorageInspectorProviderBase<QmitkDataStorageTreeInspector>("org.mitk.QmitkDataStorageTreeInspector", "Rendering tree", "Displays the filtered content of the data storage as the current rendering tree. \n(Equals the old data manager view)"));
-  m_HistoryInspector.reset(new QmitkDataStorageInspectorProviderBase<QmitkDataStorageSelectionHistoryInspector>("org.mitk.QmitkDataStorageSelectionHistoryInspector", "Selection history", "Displays the filtered history of all node selections in this application session. \nThe nodes are sorted from new to old selections.\nOnly nodes that are still in the data storage will be displayed."));
-  m_FavoriteNodesInspector.reset(new QmitkDataStorageInspectorProviderBase<QmitkDataStorageFavoriteNodesInspector>("org.mitk.QmitkDataStorageFavoriteNodesInspector", "Favorite nodes list", "Displays the favorite nodes of the data storage in a simple list."));
+  Q_INIT_RESOURCE(Qmitk);
+  m_TreeInspector.reset(new QmitkDataStorageInspectorProviderBase<QmitkDataStorageListInspector>("org.mitk.QmitkDataStorageListInspector", "Simple list", "Displays the filtered content of the data storage in a simple list.", ":/Qmitk/list-solid.svg"));
+  m_ListInspector.reset(new QmitkDataStorageInspectorProviderBase<QmitkDataStorageTreeInspector>("org.mitk.QmitkDataStorageTreeInspector", "Rendering tree", "Displays the filtered content of the data storage as the current rendering tree. \n(Equals the old data manager view)", ":/Qmitk/tree_inspector.svg"));
+  m_HistoryInspector.reset(new QmitkDataStorageInspectorProviderBase<QmitkDataStorageSelectionHistoryInspector>(QmitkDataStorageSelectionHistoryInspector::INSPECTOR_ID(), "Selection history", "Displays the filtered history of all node selections in this application session. \nThe nodes are sorted from new to old selections.\nOnly nodes that are still in the data storage will be displayed.", ":/Qmitk/history-solid.svg"));
+  m_FavoriteNodesInspector.reset(new QmitkDataStorageInspectorProviderBase<QmitkDataStorageFavoriteNodesInspector>(QmitkDataStorageFavoriteNodesInspector::INSPECTOR_ID(), "Favorite nodes list", "Displays the favorite nodes of the data storage in a simple list.",":/Qmitk/star-solid.svg"));
 }
 
 void MitkQtWidgetsActivator::Unload(us::ModuleContext *)
 {
 }
 
 US_EXPORT_MODULE_ACTIVATOR(MitkQtWidgetsActivator)
diff --git a/Plugins/org.mitk.gui.qt.common/files.cmake b/Plugins/org.mitk.gui.qt.common/files.cmake
index b9621a8d79..bb57973a0e 100755
--- a/Plugins/org.mitk.gui.qt.common/files.cmake
+++ b/Plugins/org.mitk.gui.qt.common/files.cmake
@@ -1,69 +1,67 @@
 set(SRC_CPP_FILES
   QmitkAbstractMultiWidgetEditor.cpp
   QmitkAbstractRenderEditor.cpp
   QmitkAbstractView.cpp
   QmitkDataNodeSelectionProvider.cpp
   QmitkDnDFrameWidget.cpp
   QmitkSelectionServiceConnector.cpp
   QmitkSliceNavigationListener.cpp
   QmitkSingleNodeSelectionWidget.cpp
   QmitkNodeSelectionDialog.cpp
   QmitkMultiNodeSelectionWidget.cpp
   QmitkMultiWidgetDecorationManager.cpp
   QmitkNodeSelectionPreferenceHelper.cpp
   QmitkNodeSelectionButton.cpp
-  QmitkSimpleTextOverlayWidget.cpp
 )
 
 set(INTERNAL_CPP_FILES
   QmitkCommonActivator.cpp
   QmitkDataNodeItemModel.cpp
   QmitkDataNodeSelection.cpp
   QmitkViewCoordinator.cpp
   QmitkNodeSelectionConstants.cpp
   QmitkNodeSelectionPreferencePage.cpp
   QmitkNodeSelectionListItemWidget.cpp
 )
 
 set(UI_FILES
   src/QmitkSingleNodeSelectionWidget.ui
   src/QmitkMultiNodeSelectionWidget.ui
   src/QmitkNodeSelectionDialog.ui
   src/internal/QmitkNodeSelectionPreferencePage.ui
   src/internal/QmitkNodeSelectionListItemWidget.ui
 )
 
 set(MOC_H_FILES
   src/QmitkAbstractMultiWidgetEditor.h
   src/QmitkAbstractRenderEditor.h
   src/QmitkDnDFrameWidget.h
   src/QmitkSelectionServiceConnector.h
   src/QmitkSliceNavigationListener.h
   src/QmitkSingleNodeSelectionWidget.h
   src/QmitkNodeSelectionDialog.h
   src/QmitkMultiNodeSelectionWidget.h
   src/QmitkNodeSelectionButton.h
-  src/QmitkSimpleTextOverlayWidget.h
   src/internal/QmitkCommonActivator.h
   src/internal/QmitkNodeSelectionPreferencePage.h
   src/internal/QmitkNodeSelectionListItemWidget.h
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
   resources/times.svg
 )
 
 set(QRC_FILES
   resources/common.qrc
 )
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Plugins/org.mitk.gui.qt.common/resources/icon-license.txt b/Plugins/org.mitk.gui.qt.common/resources/icon-license.txt
new file mode 100644
index 0000000000..167ecb6def
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.common/resources/icon-license.txt
@@ -0,0 +1,2 @@
+See [Font Awsome 4] in Licenses/ICONS.md for:
+- times.svg
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.cpp b/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.cpp
index 73d4a15fb9..4094044f3f 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.cpp
+++ b/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.cpp
@@ -1,222 +1,254 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include "QmitkNodeSelectionDialog.h"
 
+#include <berryQtStyleManager.h>
+
 #include <mitkDataStorageInspectorGenerator.h>
 #include <QmitkNodeSelectionPreferenceHelper.h>
 #include <QmitkDataStorageSelectionHistoryInspector.h>
+#include <QmitkDataStorageFavoriteNodesInspector.h>
 
 QmitkNodeSelectionDialog::QmitkNodeSelectionDialog(QWidget* parent, QString title, QString hint) : QDialog(parent),
   m_NodePredicate(nullptr), m_SelectOnlyVisibleNodes(false), m_SelectedNodes(NodeList()), m_SelectionMode(QAbstractItemView::SingleSelection)
 {
   m_Controls.setupUi(this);
 
   m_CheckFunction = [](const NodeList &) { return ""; };
 
   auto providers = mitk::DataStorageInspectorGenerator::GetProviders();
   auto visibleProviders = mitk::GetVisibleDataStorageInspectors();
-  auto favoriteID = mitk::GetFavoriteDataStorageInspector();
+  auto preferredID = mitk::GetPreferredDataStorageInspector();
 
   if (visibleProviders.empty())
   {
     MITK_DEBUG << "No presets for visible node selection inspectors available. Use fallback (show all available inspectors)";
     unsigned int order = 0;
     for (auto proIter : providers)
     {
       visibleProviders.insert(std::make_pair(order, proIter.first));
       ++order;
     }
   }
 
-  int favIndex = 0;
-  bool favoriteFound = false;
+  int preferredIndex = 0;
+  bool preferredFound = false;
   for (auto proIter : visibleProviders)
   {
     auto finding = providers.find(proIter.second);
     if (finding != providers.end())
     {
-      auto inspector = finding->second->CreateInspector();
-      QString name = QString::fromStdString(finding->second->GetInspectorDisplayName());
-      QString desc = QString::fromStdString(finding->second->GetInspectorDescription());
-      AddPanel(inspector, name, desc);
-
-      favoriteFound = favoriteFound || proIter.second == favoriteID;
-      if (!favoriteFound)
+      if (finding->second->GetInspectorID() != QmitkDataStorageFavoriteNodesInspector::INSPECTOR_ID() && finding->second->GetInspectorID() != QmitkDataStorageSelectionHistoryInspector::INSPECTOR_ID())
       {
-        ++favIndex;
+        auto provider = finding->second;
+        this->AddPanel(provider, preferredID, preferredFound, preferredIndex);
       }
     }
     else
     {
       MITK_DEBUG << "No provider registered for inspector that is defined as visible in the preferences. Illegal inspector ID: " << proIter.second;
     }
   }
 
-  m_Controls.tabWidget->setCurrentIndex(favIndex);
+  if (mitk::GetShowFavoritesInspector())
+  {
+    auto favoritesPorvider = mitk::DataStorageInspectorGenerator::GetProvider(QmitkDataStorageFavoriteNodesInspector::INSPECTOR_ID());
+    if (favoritesPorvider != nullptr)
+    {
+      this->AddPanel(favoritesPorvider, preferredID, preferredFound, preferredIndex);
+    }
+  }
+
+  if (mitk::GetShowHistoryInspector())
+  {
+    auto historyPorvider = mitk::DataStorageInspectorGenerator::GetProvider(QmitkDataStorageSelectionHistoryInspector::INSPECTOR_ID());
+    if (historyPorvider != nullptr)
+    {
+      this->AddPanel(historyPorvider, preferredID, preferredFound, preferredIndex);
+    }
+  }
+
+  m_Controls.tabWidget->setCurrentIndex(preferredIndex);
   this->setWindowTitle(title);
   this->setToolTip(hint);
 
   m_Controls.hint->setText(hint);
   m_Controls.hint->setVisible(!hint.isEmpty());
 
-  m_FavoriteNodesButton = new QPushButton("Add to favorites");
-  m_Controls.buttonBox->addButton(m_FavoriteNodesButton, QDialogButtonBox::ActionRole);
+  m_Controls.btnAddToFav->setIcon(berry::QtStyleManager::ThemeIcon(QStringLiteral(":/Qmitk/favorite_add.svg")));
 
-  connect(m_FavoriteNodesButton, &QPushButton::clicked, this, &QmitkNodeSelectionDialog::OnFavoriteNodesButtonClicked);
-  connect(m_Controls.buttonBox, SIGNAL(accepted()), this, SLOT(OnOK()));
-  connect(m_Controls.buttonBox, SIGNAL(rejected()), this, SLOT(OnCancel()));
+  connect(m_Controls.btnAddToFav, &QPushButton::clicked, this, &QmitkNodeSelectionDialog::OnFavoriteNodesButtonClicked);
+  connect(m_Controls.buttonBox, &QDialogButtonBox::accepted, this, &QmitkNodeSelectionDialog::OnOK);
+  connect(m_Controls.buttonBox, &QDialogButtonBox::rejected, this, &QmitkNodeSelectionDialog::OnCancel);
 }
 
 void QmitkNodeSelectionDialog::SetDataStorage(mitk::DataStorage* dataStorage)
 {
   if (m_DataStorage != dataStorage)
   {
     m_DataStorage = dataStorage;
 
     if (!m_DataStorage.IsExpired())
     {
       for (auto panel : m_Panels)
       {
         panel->SetDataStorage(dataStorage);
       }
     }
   }
 }
 
 void QmitkNodeSelectionDialog::SetNodePredicate(const mitk::NodePredicateBase* nodePredicate)
 {
   if (m_NodePredicate != nodePredicate)
   {
     m_NodePredicate = nodePredicate;
 
     for (auto panel : m_Panels)
     {
       panel->SetNodePredicate(m_NodePredicate);
     }
   }
 }
 
 const mitk::NodePredicateBase* QmitkNodeSelectionDialog::GetNodePredicate() const
 {
   return m_NodePredicate;
 }
 
 QmitkNodeSelectionDialog::NodeList QmitkNodeSelectionDialog::GetSelectedNodes() const
 {
   return m_SelectedNodes;
 }
 
 void QmitkNodeSelectionDialog::SetSelectionCheckFunction(const SelectionCheckFunctionType &checkFunction)
 {
   m_CheckFunction = checkFunction;
   auto checkResponse = m_CheckFunction(m_SelectedNodes);
 
   m_Controls.hint->setText(QString::fromStdString(checkResponse));
   m_Controls.hint->setVisible(!checkResponse.empty());
   m_Controls.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(checkResponse.empty());
 }
 
 bool QmitkNodeSelectionDialog::GetSelectOnlyVisibleNodes() const
 {
   return m_SelectOnlyVisibleNodes;
 }
 
 void QmitkNodeSelectionDialog::SetSelectionMode(SelectionMode mode)
 {
   m_SelectionMode = mode;
   for (auto panel : m_Panels)
   {
     panel->SetSelectionMode(mode);
   }
 }
 
 QmitkNodeSelectionDialog::SelectionMode QmitkNodeSelectionDialog::GetSelectionMode() const
 {
   return m_SelectionMode;
 }
 
 void QmitkNodeSelectionDialog::SetSelectOnlyVisibleNodes(bool selectOnlyVisibleNodes)
 {
   if (m_SelectOnlyVisibleNodes != selectOnlyVisibleNodes)
   {
     m_SelectOnlyVisibleNodes = selectOnlyVisibleNodes;
 
     for (auto panel : m_Panels)
     {
       panel->SetSelectOnlyVisibleNodes(m_SelectOnlyVisibleNodes);
     }
   }
 }
 
 void QmitkNodeSelectionDialog::SetCurrentSelection(NodeList selectedNodes)
 {
   m_SelectedNodes = selectedNodes;
   auto checkResponse = m_CheckFunction(m_SelectedNodes);
 
   m_Controls.hint->setText(QString::fromStdString(checkResponse));
   m_Controls.hint->setVisible(!checkResponse.empty());
   m_Controls.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(checkResponse.empty());
 
   for (auto panel : m_Panels)
   {
     panel->SetCurrentSelection(selectedNodes);
   }
 }
 
 void QmitkNodeSelectionDialog::OnSelectionChanged(NodeList selectedNodes)
 {
   SetCurrentSelection(selectedNodes);
   emit CurrentSelectionChanged(selectedNodes);
 }
 
 void QmitkNodeSelectionDialog::OnFavoriteNodesButtonClicked()
 {
   for (auto node : m_SelectedNodes)
   {
     node->SetBoolProperty("org.mitk.selection.favorite", true);
   }
 }
 
 void QmitkNodeSelectionDialog::OnOK()
 {
   for (auto node : m_SelectedNodes)
   {
     QmitkDataStorageSelectionHistoryInspector::AddNodeToHistory(node);
   }
 
   this->accept();
 }
 
 void QmitkNodeSelectionDialog::OnCancel()
 {
   this->reject();
 }
 
-void QmitkNodeSelectionDialog::AddPanel(QmitkAbstractDataStorageInspector* view, QString name, QString desc)
+void QmitkNodeSelectionDialog::AddPanel(const mitk::IDataStorageInspectorProvider * provider, const mitk::IDataStorageInspectorProvider::InspectorIDType& preferredID, bool &preferredFound, int &preferredIndex)
 {
-  view->setParent(this);
-  view->SetSelectionMode(m_SelectionMode);
+  auto inspector = provider->CreateInspector();
+  QString name = QString::fromStdString(provider->GetInspectorDisplayName());
+  QString desc = QString::fromStdString(provider->GetInspectorDescription());
+
+  inspector->setParent(this);
+  inspector->SetSelectionMode(m_SelectionMode);
 
   auto tabPanel = new QWidget();
   tabPanel->setObjectName(QString("tab_") + name);
   tabPanel->setToolTip(desc);
-  m_Controls.tabWidget->insertTab(m_Controls.tabWidget->count(), tabPanel, name);
 
   auto verticalLayout = new QVBoxLayout(tabPanel);
   verticalLayout->setSpacing(0);
   verticalLayout->setContentsMargins(0, 0, 0, 0);
-  verticalLayout->addWidget(view);
+  verticalLayout->addWidget(inspector);
+
+  auto panelPos = m_Controls.tabWidget->insertTab(m_Controls.tabWidget->count(), tabPanel, name);
+
+  auto icon = provider->GetInspectorIcon();
+  if (!icon.isNull())
+  {
+    m_Controls.tabWidget->setTabIcon(panelPos, icon);
+  }
+
+  m_Panels.push_back(inspector);
+  connect(inspector, &QmitkAbstractDataStorageInspector::CurrentSelectionChanged, this, &QmitkNodeSelectionDialog::OnSelectionChanged);
 
-  m_Panels.push_back(view);
-  connect(view, &QmitkAbstractDataStorageInspector::CurrentSelectionChanged, this, &QmitkNodeSelectionDialog::OnSelectionChanged);
+  preferredFound = preferredFound || provider->GetInspectorID() == preferredID;
+  if (!preferredFound)
+  {
+    ++preferredIndex;
+  }
 }
diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.h b/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.h
index 3ba21e481f..c529aae35b 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.h
+++ b/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.h
@@ -1,139 +1,141 @@
 /*============================================================================
 
 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 QMITK_NODE_SELECTION_DIALOG_H
 #define QMITK_NODE_SELECTION_DIALOG_H
 
 #include <mitkDataStorage.h>
 #include <mitkWeakPointer.h>
 #include <mitkNodePredicateBase.h>
+#include "mitkIDataStorageInspectorProvider.h"
 
 #include <QmitkAbstractDataStorageInspector.h>
 
 #include "org_mitk_gui_qt_common_Export.h"
 
 #include "ui_QmitkNodeSelectionDialog.h"
 
 #include <QDialog>
 #include <QPushButton>
 
 /**
 * \class QmitkNodeSelectionDialog
 * \brief Widget that allows to show and edit the content of an mitk::IsoDoseLevel instance.
 */
 class MITK_QT_COMMON QmitkNodeSelectionDialog : public QDialog
 {
   Q_OBJECT
 
 public:
   explicit QmitkNodeSelectionDialog(QWidget* parent = nullptr, QString caption = "", QString hint = "");
 
   /**
   * @brief Sets the data storage that will be used /monitored by widget.
   *
   * @param dataStorage      A pointer to the data storage to set.
   */
   void SetDataStorage(mitk::DataStorage* dataStorage);
 
   /**
   * @brief Sets the node predicate and updates the widget, according to the node predicate.
   *
   * @param nodePredicate    A pointer to node predicate.
   */
   virtual void SetNodePredicate(const mitk::NodePredicateBase* nodePredicate);
 
   const mitk::NodePredicateBase* GetNodePredicate() const;
 
   using NodeList = QList<mitk::DataNode::Pointer>;
   NodeList GetSelectedNodes() const;
 
   /**
   * @brief Helper function that is used to check the given selection for consistency.
   *        Returning an empty string assumes that everything is alright and the selection is valid.
   *        If the string is not empty, the content of the string will be used as error message.
   */
   using SelectionCheckFunctionType = std::function<std::string(const NodeList &)>;
   /**
   * @brief A selection check function can be set. If set the dialog uses this function to check the made/set selection.
   *        If the selection is valid, everything is fine.
   *        If the selection is indicated as invalid, the dialog will display the selection check function error message.
   */
   void SetSelectionCheckFunction(const SelectionCheckFunctionType &checkFunction);
 
   bool GetSelectOnlyVisibleNodes() const;
 
   using SelectionMode = QAbstractItemView::SelectionMode;
   void SetSelectionMode(SelectionMode mode);
   SelectionMode GetSelectionMode() const;
 
 Q_SIGNALS:
   /*
   * @brief A signal that will be emitted if the selected node has changed.
   *
   * @param nodes		A list of data nodes that are newly selected.
   */
   void CurrentSelectionChanged(NodeList nodes);
 
   public Q_SLOTS:
   /*
   * @brief Change the selection modus of the item view's selection model.
   *
   *   If true, an incoming selection will be filtered (reduced) to only those nodes that are visible by the current view.
   *   An outgoing selection can then at most contain the filtered nodes.
   *   If false, the incoming non-visible selection will be stored and later added to the outgoing selection,
   *   to include the original selection that could not be modified.
   *   The part of the original selection, that is non-visible are the nodes that are not
   *
   * @param selectOnlyVisibleNodes   The bool value to define the selection modus.
   */
   void SetSelectOnlyVisibleNodes(bool selectOnlyVisibleNodes);
 
   /*
   * @brief Transform a list of data nodes into a model selection and set this as a new selection of the
   *        selection model of the private member item view.
   *
   *   The function filters the given list of nodes according to the 'm_SelectOnlyVisibleNodes' member variable. If
   *   necessary, the non-visible nodes are stored. This is done if 'm_SelectOnlyVisibleNodes' is false: In this case
   *   the selection may be filtered and only a subset of the selected nodes may be visible and therefore (de-)selectable
   *   in the data storage viewer. By storing the non-visible nodes it is possible to send the new, modified selection
   *   but also include the selected nodes from the original selection that could not be modified (see 'SetSelectOnlyVisibleNodes').
   *
   * @param nodes		A list of data nodes that should be newly selected.
   */
   void SetCurrentSelection(NodeList selectedNodes);
 
 protected Q_SLOTS:
 
   void OnSelectionChanged(NodeList selectedNodes);
   void OnFavoriteNodesButtonClicked();
   void OnOK();
   void OnCancel();
 
 protected:
-  void AddPanel(QmitkAbstractDataStorageInspector* view, QString name, QString desc);
+
+  void AddPanel(const mitk::IDataStorageInspectorProvider* provider, const mitk::IDataStorageInspectorProvider::InspectorIDType &preferredID, bool &preferredFound, int &preferredIndex);
 
   mitk::WeakPointer<mitk::DataStorage> m_DataStorage;
   mitk::NodePredicateBase::ConstPointer m_NodePredicate;
   bool m_SelectOnlyVisibleNodes;
   NodeList m_SelectedNodes;
 
   SelectionCheckFunctionType m_CheckFunction;
 
   SelectionMode m_SelectionMode;
 
   using PanelVectorType = std::vector<QmitkAbstractDataStorageInspector*>;
   PanelVectorType m_Panels;
 
   QPushButton* m_FavoriteNodesButton;
   Ui_QmitkNodeSelectionDialog m_Controls;
 };
 #endif // QMITK_NODE_SELECTION_DIALOG_H
diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.ui b/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.ui
index 190293767e..a07b9670ae 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.ui
+++ b/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.ui
@@ -1,82 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkNodeSelectionDialog</class>
  <widget class="QDialog" name="QmitkNodeSelectionDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>596</width>
-    <height>539</height>
+    <width>800</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
   <property name="modal">
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>5</number>
    </property>
    <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>
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <property name="leftMargin">
       <number>6</number>
      </property>
      <property name="topMargin">
       <number>6</number>
      </property>
      <property name="rightMargin">
       <number>6</number>
      </property>
      <item>
       <widget class="QLabel" name="hint">
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
        </property>
        <property name="text">
         <string>Info text ...</string>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>-1</number>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>24</width>
+       <height>24</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="btnAddToFav">
+       <property name="toolTip">
+        <string>Add the current selection to the favorites.</string>
+       </property>
+       <property name="text">
+        <string>Add to favorites</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionPreferenceHelper.cpp b/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionPreferenceHelper.cpp
index 442e8f9a37..24c157539b 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionPreferenceHelper.cpp
+++ b/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionPreferenceHelper.cpp
@@ -1,119 +1,161 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include "QmitkNodeSelectionPreferenceHelper.h"
 
 #include <internal/QmitkNodeSelectionConstants.h>
 
 #include <berryIPreferencesService.h>
 
 #include <berryIPreferences.h>
 #include <berryIPreferencesService.h>
 #include <berryPlatform.h>
 
 
 #include "mitkExceptionMacro.h"
 
 void mitk::PutVisibleDataStorageInspectors(const VisibleDataStorageInspectorMapType &inspectors)
 {
   berry::IPreferencesService *prefService = berry::Platform::GetPreferencesService();
   berry::IPreferences::Pointer prefNode =
     prefService->GetSystemPreferences()->Node(mitk::NodeSelectionConstants::ROOT_PREFERENCE_NODE_ID.c_str());
   berry::IPreferences::Pointer visNode =
     prefNode->Node(mitk::NodeSelectionConstants::VISIBLE_INSPECTORS_NODE_ID.c_str());
 
   visNode->RemoveNode();
   prefNode->Flush();
 
   // new empty preset node
   visNode = prefNode->Node(mitk::NodeSelectionConstants::VISIBLE_INSPECTORS_NODE_ID.c_str());
 
   // store map in new node
   for (const auto &inspector : inspectors)
   {
     std::ostringstream sstr;
     sstr << inspector.first;
     berry::IPreferences::Pointer aNode = visNode->Node(QString::fromStdString(sstr.str()));
 
     aNode->Put(mitk::NodeSelectionConstants::VISIBLE_INSPECTOR_ID.c_str(), inspector.second.c_str());
     aNode->Flush();
   }
 
   visNode->Flush();
 }
 
 mitk::VisibleDataStorageInspectorMapType mitk::GetVisibleDataStorageInspectors()
 {
   berry::IPreferencesService *prefService = berry::Platform::GetPreferencesService();
 
   berry::IPreferences::Pointer prefNode =
     prefService->GetSystemPreferences()->Node(mitk::NodeSelectionConstants::ROOT_PREFERENCE_NODE_ID.c_str());
   berry::IPreferences::Pointer visNode =
     prefNode->Node(mitk::NodeSelectionConstants::VISIBLE_INSPECTORS_NODE_ID.c_str());
 
   typedef QStringList NamesType;
   NamesType names = visNode->ChildrenNames();
 
   VisibleDataStorageInspectorMapType visMap;
 
   if (!names.empty())
   {
     for (NamesType::const_iterator pos = names.begin(); pos != names.end(); ++pos)
     {
       berry::IPreferences::Pointer aNode = visNode->Node(*pos);
 
       if (aNode.IsNull())
       {
         mitkThrow() << "Error in preference interface. Cannot find preset node under given name. Name: "
                     << (*pos).toStdString();
       }
 
       std::istringstream isstr(pos->toStdString());
       unsigned int order = 0;
       isstr >> order;
 
       auto id = aNode->Get(mitk::NodeSelectionConstants::VISIBLE_INSPECTOR_ID.c_str(), "");
       if (id.isEmpty())
       {
         mitkThrow() << "Error in preference interface. ID of visible inspector is not set. Inspector position: "
                     << order;
       }
 
       visMap.insert(std::make_pair(order, id.toStdString()));
     }
   }
   return visMap;
 }
 
-mitk::DataStorageInspectorIDType mitk::GetFavoriteDataStorageInspector()
+mitk::DataStorageInspectorIDType mitk::GetPreferredDataStorageInspector()
 {
   berry::IPreferencesService *prefService = berry::Platform::GetPreferencesService();
 
   berry::IPreferences::Pointer prefNode =
     prefService->GetSystemPreferences()->Node(mitk::NodeSelectionConstants::ROOT_PREFERENCE_NODE_ID.c_str());
 
-  auto id = prefNode->Get(mitk::NodeSelectionConstants::FAVORITE_INSPECTOR_ID.c_str(), "");
+  auto id = prefNode->Get(mitk::NodeSelectionConstants::PREFERRED_INSPECTOR_ID.c_str(), "");
 
   mitk::DataStorageInspectorIDType result = id.toStdString();
   return result;
 }
 
-void mitk::PutFavoriteDataStorageInspector(const DataStorageInspectorIDType &id)
+void mitk::PutPreferredDataStorageInspector(const DataStorageInspectorIDType &id)
 {
   berry::IPreferencesService *prefService = berry::Platform::GetPreferencesService();
 
   berry::IPreferences::Pointer prefNode =
     prefService->GetSystemPreferences()->Node(mitk::NodeSelectionConstants::ROOT_PREFERENCE_NODE_ID.c_str());
 
-  prefNode->Put(mitk::NodeSelectionConstants::FAVORITE_INSPECTOR_ID.c_str(), id.c_str());
+  prefNode->Put(mitk::NodeSelectionConstants::PREFERRED_INSPECTOR_ID.c_str(), id.c_str());
   prefNode->Flush();
 }
+
+void mitk::PutShowFavoritesInspector(bool show)
+{
+  berry::IPreferencesService *prefService = berry::Platform::GetPreferencesService();
+
+  berry::IPreferences::Pointer prefNode =
+    prefService->GetSystemPreferences()->Node(mitk::NodeSelectionConstants::ROOT_PREFERENCE_NODE_ID.c_str());
+
+  prefNode->PutBool(mitk::NodeSelectionConstants::SHOW_FAVORITE_INSPECTOR.c_str(), show);
+  prefNode->Flush();
+}
+
+bool mitk::GetShowFavoritesInspector()
+{
+  berry::IPreferencesService *prefService = berry::Platform::GetPreferencesService();
+
+  berry::IPreferences::Pointer prefNode =
+    prefService->GetSystemPreferences()->Node(mitk::NodeSelectionConstants::ROOT_PREFERENCE_NODE_ID.c_str());
+
+  return prefNode->GetBool(mitk::NodeSelectionConstants::SHOW_FAVORITE_INSPECTOR.c_str(), true);
+}
+
+void mitk::PutShowHistoryInspector(bool show)
+{
+  berry::IPreferencesService *prefService = berry::Platform::GetPreferencesService();
+
+  berry::IPreferences::Pointer prefNode =
+    prefService->GetSystemPreferences()->Node(mitk::NodeSelectionConstants::ROOT_PREFERENCE_NODE_ID.c_str());
+
+  prefNode->PutBool(mitk::NodeSelectionConstants::SHOW_HISTORY_INSPECTOR.c_str(), show);
+  prefNode->Flush();
+}
+
+bool mitk::GetShowHistoryInspector()
+{
+  berry::IPreferencesService *prefService = berry::Platform::GetPreferencesService();
+
+  berry::IPreferences::Pointer prefNode =
+    prefService->GetSystemPreferences()->Node(mitk::NodeSelectionConstants::ROOT_PREFERENCE_NODE_ID.c_str());
+
+  return prefNode->GetBool(mitk::NodeSelectionConstants::SHOW_HISTORY_INSPECTOR.c_str(), true);
+}
diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionPreferenceHelper.h b/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionPreferenceHelper.h
index ecfdc573f0..477493c03e 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionPreferenceHelper.h
+++ b/Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionPreferenceHelper.h
@@ -1,40 +1,55 @@
 /*============================================================================
 
 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 __QMITK_NODE_SELECTION_PREFERENCE_HELPER_H
 #define __QMITK_NODE_SELECTION_PREFERENCE_HELPER_H
 
 #include <string>
 #include <map>
 
 namespace mitk
 {
   using DataStorageInspectorIDType = std::string;
 
+  /** map containing the IDs of all inspectors that should be visible. The map key is the order of appearance
+  of the respective inspector.*/
   using VisibleDataStorageInspectorMapType = std::map<unsigned int, DataStorageInspectorIDType>;
 
     /** Stores the given ID as favorite inspector.*/
-    void PutFavoriteDataStorageInspector(const DataStorageInspectorIDType& id);
+    void PutPreferredDataStorageInspector(const DataStorageInspectorIDType& id);
 
     /** Gets the ID of the current favorite data storage inspector.
      * If empty string is returned, no favorite is set.*/
-    DataStorageInspectorIDType GetFavoriteDataStorageInspector();
+    DataStorageInspectorIDType GetPreferredDataStorageInspector();
 
     /** Stores the given map of visible inspectors.*/
     void PutVisibleDataStorageInspectors(const VisibleDataStorageInspectorMapType& inspectors);
 
     /** Gets the map of current visible inspectors.*/
     VisibleDataStorageInspectorMapType GetVisibleDataStorageInspectors();
+
+
+    /** Stores the given show state of the favorite inspector.*/
+    void PutShowFavoritesInspector(bool show);
+
+    /** Indicates if the favorites inspector should be shown. */
+    bool GetShowFavoritesInspector();
+
+    /** Stores the given show state of the history inspector.*/
+    void PutShowHistoryInspector(bool show);
+
+    /** Indicates if the history inspector should be shown. */
+    bool GetShowHistoryInspector();
 }
 
 #endif
diff --git a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.cpp b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.cpp
index 4692c11a9e..4ab85ab5e1 100644
--- a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.cpp
+++ b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.cpp
@@ -1,18 +1,20 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 #include "QmitkNodeSelectionConstants.h"
 
 const std::string mitk::NodeSelectionConstants::ROOT_PREFERENCE_NODE_ID = "/NODESELECTION/UI";
 const std::string mitk::NodeSelectionConstants::VISIBLE_INSPECTORS_NODE_ID = "visibleInspectors";
-const std::string mitk::NodeSelectionConstants::FAVORITE_INSPECTOR_ID = "inspectorID";
+const std::string mitk::NodeSelectionConstants::PREFERRED_INSPECTOR_ID = "inspectorID";
 const std::string mitk::NodeSelectionConstants::VISIBLE_INSPECTOR_ID = "inspectorID";
+const std::string mitk::NodeSelectionConstants::SHOW_FAVORITE_INSPECTOR = "showFavoriteInspector";
+const std::string mitk::NodeSelectionConstants::SHOW_HISTORY_INSPECTOR = "showHistoryInspector";
diff --git a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.h b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.h
index 61196de261..7aa5326fd1 100644
--- a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.h
+++ b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.h
@@ -1,38 +1,42 @@
 /*============================================================================
 
 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 _QMITK_NODE_SELECTION_CONSTANTS_H_
 #define _QMITK_NODE_SELECTION_CONSTANTS_H_
 
 #include <string>
 
 #include "org_mitk_gui_qt_common_Export.h"
 
 namespace mitk
 {
 struct MITK_QT_COMMON NodeSelectionConstants
 {
   /** ID/Path of main preference node for node selections.  */
   static const std::string ROOT_PREFERENCE_NODE_ID;
 
   /** ID of main preference node where all visible inspectors are stored (e.g. ROOT_PREFERENCE_NODE_ID+"/"+VISIBLE_INSPECTORS_NODE_ID+"/[orderering #]").
    The sub node naming encodes the ordering number of the visible inspector.*/
   static const std::string VISIBLE_INSPECTORS_NODE_ID;
-  /** ID for the value that stores the favorite inspector ID in the root preference node.*/
-  static const std::string FAVORITE_INSPECTOR_ID;
+  /** ID for the value that stores the preferred inspector ID in the root preference node.*/
+  static const std::string PREFERRED_INSPECTOR_ID;
   /** ID for the value that stores the inspector ID in the preference node.*/
   static const std::string VISIBLE_INSPECTOR_ID;
+  /** ID for the value that stores if the favorite inspector should be visible.*/
+  static const std::string SHOW_FAVORITE_INSPECTOR;
+  /** ID for the value that stores if the history inspector should be visible.*/
+  static const std::string SHOW_HISTORY_INSPECTOR;
 };
 
 }
 
 #endif
diff --git a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.cpp b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.cpp
index 3223a49e83..be25ed2846 100644
--- a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.cpp
+++ b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.cpp
@@ -1,194 +1,221 @@
 /*============================================================================
 
 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.
 
 ============================================================================*/
 
 
 #include "QmitkNodeSelectionPreferencePage.h"
 
 #include "QmitkNodeSelectionPreferenceHelper.h"
 
+#include <QmitkDataStorageSelectionHistoryInspector.h>
+#include <QmitkDataStorageFavoriteNodesInspector.h>
+
 //-----------------------------------------------------------------------------
 QmitkNodeSelectionPreferencePage::QmitkNodeSelectionPreferencePage()
   : m_MainControl(nullptr), m_Controls(nullptr)
 {
 
 }
 
 
 //-----------------------------------------------------------------------------
 QmitkNodeSelectionPreferencePage::~QmitkNodeSelectionPreferencePage()
 {
   delete m_Controls;
 }
 
 
 //-----------------------------------------------------------------------------
 void QmitkNodeSelectionPreferencePage::Init(berry::IWorkbench::Pointer )
 {
 
 }
 
 
 //-----------------------------------------------------------------------------
 void QmitkNodeSelectionPreferencePage::CreateQtControl(QWidget* parent)
 {
   m_MainControl = new QWidget(parent);
   m_Controls = new Ui::QmitkNodeSelectionPreferencePage;
   m_Controls->setupUi( m_MainControl );
 
-  connect(m_Controls->comboFavorite, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateWidgets()));
+  connect(m_Controls->comboPreferred, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateWidgets()));
   connect(m_Controls->btnUp, SIGNAL(clicked(bool)), this, SLOT(MoveUp()));
   connect(m_Controls->btnDown, SIGNAL(clicked(bool)), this, SLOT(MoveDown()));
-  connect(m_Controls->listInspectors, SIGNAL(itemSelectionChanged()), this, SLOT(UpdateWidgets()));
+  connect(m_Controls->listInspectors, &QListWidget::itemSelectionChanged, this, &QmitkNodeSelectionPreferencePage::UpdateWidgets);
 
   this->Update();
 }
 
 
 //-----------------------------------------------------------------------------
 QWidget* QmitkNodeSelectionPreferencePage::GetQtControl() const
 {
   return m_MainControl;
 }
 
 //-----------------------------------------------------------------------------
 bool QmitkNodeSelectionPreferencePage::PerformOk()
 {
   //store favorite
-  auto id = m_Controls->comboFavorite->currentData().toString();
-  mitk::PutFavoriteDataStorageInspector(id.toStdString());
+  auto id = m_Controls->comboPreferred->currentData().toString();
+  mitk::PutPreferredDataStorageInspector(id.toStdString());
 
   //store visible
   mitk::VisibleDataStorageInspectorMapType visibles;
 
   unsigned int visiblePos = 0;
 
   for (int i = 0; i < m_Controls->listInspectors->count(); ++i)
   {
     auto item = m_Controls->listInspectors->item(i);
     if (item->checkState() == Qt::Checked)
     {
       visibles.insert(std::make_pair(visiblePos++, item->data(Qt::UserRole).toString().toStdString()));
     }
   }
   mitk::PutVisibleDataStorageInspectors(visibles);
+  mitk::PutShowFavoritesInspector(m_Controls->checkShowFav->isChecked());
+  mitk::PutShowHistoryInspector(m_Controls->checkShowHistory->isChecked());
 
   return true;
 }
 
 
 //-----------------------------------------------------------------------------
 void QmitkNodeSelectionPreferencePage::PerformCancel()
 {
 }
 
 
 //-----------------------------------------------------------------------------
 void QmitkNodeSelectionPreferencePage::Update()
 {
   m_Providers = mitk::DataStorageInspectorGenerator::GetProviders();
 
   auto visibleProviders = mitk::GetVisibleDataStorageInspectors();
   auto allProviders = mitk::DataStorageInspectorGenerator::GetProviders();
-  auto favorite = mitk::GetFavoriteDataStorageInspector();
+  auto favorite = mitk::GetPreferredDataStorageInspector();
 
   auto finding = m_Providers.find(favorite);
   if (finding == m_Providers.cend())
   {
     favorite = m_Providers.begin()->first;
   }
 
   //fill favorite combo
   int index = 0;
   int currentIndex = 0;
-  m_Controls->comboFavorite->clear();
+  m_Controls->comboPreferred->clear();
   for (auto iter : m_Providers)
   {
-    m_Controls->comboFavorite->addItem(QString::fromStdString(iter.second->GetInspectorDisplayName()),QVariant::fromValue(QString::fromStdString(iter.first)));
+    m_Controls->comboPreferred->addItem(QString::fromStdString(iter.second->GetInspectorDisplayName()),QVariant::fromValue(QString::fromStdString(iter.first)));
     if (iter.first == favorite)
     {
       currentIndex = index;
     };
     ++index;
   }
-  m_Controls->comboFavorite->setCurrentIndex(currentIndex);
+  m_Controls->comboPreferred->setCurrentIndex(currentIndex);
 
   //fill inspector list
   m_Controls->listInspectors->clear();
   for (const auto iter : allProviders)
   {
-    auto currentID = iter.first;
-    QListWidgetItem* item = new QListWidgetItem;
-    item->setText(QString::fromStdString(iter.second->GetInspectorDisplayName()));
-    item->setData(Qt::UserRole, QVariant::fromValue(QString::fromStdString(currentID)));
-    item->setToolTip(QString::fromStdString(iter.second->GetInspectorDescription()));
-
-    auto finding = std::find_if(visibleProviders.cbegin(), visibleProviders.cend(), [&currentID](auto v) {return v.second == currentID; });
-    if (finding == visibleProviders.cend())
-    {
-      item->setCheckState(Qt::Unchecked);
-      m_Controls->listInspectors->addItem(item);
-    }
-    else
+    if (iter.first != QmitkDataStorageFavoriteNodesInspector::INSPECTOR_ID() && iter.first != QmitkDataStorageSelectionHistoryInspector::INSPECTOR_ID())
     {
-      item->setCheckState(Qt::Checked);
-      m_Controls->listInspectors->insertItem(finding->first, item);
+      auto currentID = iter.first;
+      QListWidgetItem* item = new QListWidgetItem;
+      item->setText(QString::fromStdString(iter.second->GetInspectorDisplayName()));
+      item->setData(Qt::UserRole, QVariant::fromValue(QString::fromStdString(currentID)));
+      item->setToolTip(QString::fromStdString(iter.second->GetInspectorDescription()));
+
+      auto finding = std::find_if(visibleProviders.cbegin(), visibleProviders.cend(), [&currentID](auto v) {return v.second == currentID; });
+      if (finding == visibleProviders.cend())
+      {
+        item->setCheckState(Qt::Unchecked);
+        m_Controls->listInspectors->addItem(item);
+      }
+      else
+      {
+        item->setCheckState(Qt::Checked);
+        m_Controls->listInspectors->insertItem(finding->first, item);
+      }
     }
   }
 
+  m_Controls->checkShowFav->setChecked(mitk::GetShowFavoritesInspector());
+  m_Controls->checkShowHistory->setChecked(mitk::GetShowHistoryInspector());
+
   this->UpdateWidgets();
 }
 
 void QmitkNodeSelectionPreferencePage::UpdateWidgets()
 {
   int currentIndex = m_Controls->listInspectors->currentRow();
   m_Controls->btnUp->setEnabled(!m_Controls->listInspectors->selectedItems().empty() && currentIndex > 0);
   m_Controls->btnDown->setEnabled(!m_Controls->listInspectors->selectedItems().empty() && currentIndex + 1 < m_Controls->listInspectors->count());
 
   for (int i = 0; i < m_Controls->listInspectors->count(); ++i)
   {
     auto item = m_Controls->listInspectors->item(i);
-    if (item->data(Qt::UserRole).toString() == m_Controls->comboFavorite->currentData().toString())
+    if (item->data(Qt::UserRole).toString() == m_Controls->comboPreferred->currentData().toString())
     {
-      //favorites are always visible.
+      //preferred inspector is always visible.
       item->setCheckState(Qt::Checked);
       item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled);
     }
     else
     {
       item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsUserCheckable);
     }
   }
-};
+
+  auto isFavSelected =
+    QmitkDataStorageFavoriteNodesInspector::INSPECTOR_ID() == m_Controls->comboPreferred->currentData().toString();
+  if (isFavSelected)
+  {
+    m_Controls->checkShowFav->setChecked(true);
+  }
+  m_Controls->checkShowFav->setEnabled(!isFavSelected);
+
+  auto isHistorySelected =
+    QmitkDataStorageSelectionHistoryInspector::INSPECTOR_ID() == m_Controls->comboPreferred->currentData().toString();
+  if (isHistorySelected)
+  {
+    m_Controls->checkShowHistory->setChecked(true);
+  }
+  m_Controls->checkShowHistory->setEnabled(!isHistorySelected);
+}
 
 void QmitkNodeSelectionPreferencePage::MoveDown()
 {
   int currentIndex = m_Controls->listInspectors->currentRow();
   if (currentIndex+1 < m_Controls->listInspectors->count())
   {
     QListWidgetItem *currentItem = m_Controls->listInspectors->takeItem(currentIndex);
     m_Controls->listInspectors->insertItem(currentIndex + 1, currentItem);
     m_Controls->listInspectors->setCurrentRow(currentIndex + 1);
   }
   this->UpdateWidgets();
-};
+}
 
 void QmitkNodeSelectionPreferencePage::MoveUp()
 {
   int currentIndex = m_Controls->listInspectors->currentRow();
   if (currentIndex > 0)
   {
     QListWidgetItem *currentItem = m_Controls->listInspectors->takeItem(currentIndex);
     m_Controls->listInspectors->insertItem(currentIndex - 1, currentItem);
     m_Controls->listInspectors->setCurrentRow(currentIndex - 1);
   }
   this->UpdateWidgets();
-};
+}
diff --git a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.ui b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.ui
index c88f7330f2..1599ef75ad 100644
--- a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.ui
+++ b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.ui
@@ -1,145 +1,165 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkNodeSelectionPreferencePage</class>
  <widget class="QWidget" name="QmitkNodeSelectionPreferencePage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>715</width>
     <height>713</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="4" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QPushButton" name="btnUp">
        <property name="text">
         <string>Up</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="btnDown">
        <property name="text">
         <string>Down</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Favorite inspector:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="6" column="0">
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="1" column="0">
-    <widget class="QComboBox" name="comboFavorite">
+    <widget class="QComboBox" name="comboPreferred">
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The favorite inspector is always visible.&lt;/p&gt;&lt;p&gt;Additionally the favorite inspector has always the focus when opening a node selection dialoge.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The preferred inspector is always visible.&lt;/p&gt;&lt;p&gt;Additionally the preferred inspector has always the focus when opening a node selection dialoge.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <item>
       <property name="text">
        <string>Neues Element</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>2</string>
       </property>
      </item>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="7" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Instruction:&lt;/span&gt;&lt;br/&gt;Only checked inspectors will be shown in node selection dialogs.&lt;br/&gt;You may change the order in the inspector list, to change the order of the tabs in the node selection dialog.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Inspector visiblitiy and order:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QListWidget" name="listInspectors">
        <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="toolTip">
         <string>List of all available inspectors. Checked inspectores will be display</string>
        </property>
        <item>
         <property name="text">
          <string>TreeInspector</string>
         </property>
         <property name="toolTip">
          <string>ffffff</string>
         </property>
         <property name="checkState">
          <enum>Checked</enum>
         </property>
        </item>
        <item>
         <property name="text">
          <string>List</string>
         </property>
         <property name="checkState">
          <enum>Checked</enum>
         </property>
        </item>
       </widget>
      </item>
     </layout>
    </item>
+   <item row="8" column="0">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Preferred inspector:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QCheckBox" name="checkShowFav">
+     <property name="text">
+      <string>Show favorites inspector</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0">
+    <widget class="QCheckBox" name="checkShowHistory">
+     <property name="text">
+      <string>Show history inspector</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>