diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIQtStyleManager.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIQtStyleManager.h
index 6eb4a8b420..7cba05eecc 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIQtStyleManager.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIQtStyleManager.h
@@ -1,89 +1,115 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIQTSTYLEMANAGER_H_
 #define BERRYIQTSTYLEMANAGER_H_
 
 #include <berryService.h>
 
 #include <QString>
 #include <QList>
 #include <QtPlugin>
 
 #include <Poco/Exception.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 struct BERRY_UI_QT IQtStyleManager : public Service
 {
 
   berryInterfaceMacro(IQtStyleManager, berry);
 
   struct Style {
     QString name;
     QString fileName;
 
     Style() {}
 
     Style(const QString& name, const QString& fn)
     : name(name), fileName(fn) {}
 
     Style& operator=(const Style& s)
     {
       this->name = s.name;
       this->fileName = s.fileName;
       return *this;
     }
 
     bool operator<(const Style& s) const
     { return name < s.name; }
 
     bool operator==(const Style& s) const
     { return name == s.name; }
   };
 
+    struct IconTheme {
+    QString name;
+
+    IconTheme() {}
+
+    IconTheme(const QString& name)
+    : name(name) {}
+
+    IconTheme& operator=(const IconTheme& s)
+    {
+      this->name = s.name;
+      return *this;
+    }
+
+    bool operator<(const IconTheme& s) const
+    { return name < s.name; }
+
+    bool operator==(const IconTheme& s) const
+    { return name == s.name; }
+  };
+
   static const std::string ID; // = "org.blueberry.service.qtstylemanager";
 
   typedef QList<Style> StyleList;
+  typedef QList<IconTheme> IconThemeList;
 
   virtual Style GetStyle() const = 0;
   virtual QString GetStylesheet() const = 0;
   virtual QString GetActiveTabStylesheet() const = 0;
   virtual QString GetTabStylesheet() const = 0;
 
   virtual void AddStyle(const QString& styleFileName, const QString& styleName = QString()) = 0;
   virtual void AddStyles(const QString& path) = 0;
   virtual void RemoveStyle(const QString& styleFileName) = 0;
   virtual void RemoveStyles(const QString& repository = QString()) = 0;
 
   virtual void GetStyles(StyleList& styles) const = 0;
   virtual void SetStyle(const QString& fileName) = 0;
 
   virtual Style GetDefaultStyle() const = 0;
   virtual void SetDefaultStyle() = 0;
 
+  virtual void GetIconThemes(IconThemeList& iconThemes) const = 0;
+
+  virtual void SetIconTheme(const QString& themeName) = 0;
+
   virtual bool Contains(const QString& fileName) const = 0;
 
 };
 
 }
 
 Q_DECLARE_INTERFACE(berry::IQtStyleManager, "org.blueberry.service.IQtStyleManager")
 
 #endif /* BERRYIQTSTYLEMANAGER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtPreferences.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtPreferences.cpp
index dc252da3a8..1638795900 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtPreferences.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtPreferences.cpp
@@ -1,25 +1,26 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtPreferences.h"
 
 namespace berry {
 
 const std::string QtPreferences::QT_STYLES_NODE = "qtstyles";
 const std::string QtPreferences::QT_STYLE_NAME = "stylename";
 const std::string QtPreferences::QT_STYLE_SEARCHPATHS = "searchpaths";
+const std::string QtPreferences::QT_ICON_THEME = "icontheme";
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtPreferences.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtPreferences.h
index 204d96dab5..9dcd2a62d7 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtPreferences.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtPreferences.h
@@ -1,35 +1,36 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTPREFERENCES_H_
 #define BERRYQTPREFERENCES_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <string>
 
 namespace berry {
 
 struct BERRY_UI_QT QtPreferences
 {
   static const std::string QT_STYLES_NODE; // = "qtstyles";
   static const std::string QT_STYLE_NAME; // = "stylename";
   static const std::string QT_STYLE_SEARCHPATHS; // = "searchpaths";
+  static const std::string QT_ICON_THEME; // = "icontheme";
 };
 }
 
 #endif /* BERRYQTPREFERENCES_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStyleManager.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStyleManager.cpp
index be9f2bc5d6..e0a94ad3f7 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStyleManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStyleManager.cpp
@@ -1,314 +1,352 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtStyleManager.h"
 
 #include <QApplication>
 #include <QFile>
 #include <QTextStream>
 #include <QFileInfo>
 #include <QStringList>
 #include <QDirIterator>
+#include <QIcon>
 
 #include <berryLog.h>
 #include <berryPlatform.h>
 #include <berryPlatformUI.h>
 #include <berryIPreferencesService.h>
 #include <berryIPreferences.h>
 
 #include "berryQtPreferences.h"
 
 namespace berry
 {
 
 bool QtStyleManager::IsA(const std::type_info& type) const
 {
   std::string name(GetType().name());
   return name == type.name() || Service::IsA(type);
 }
 
 const std::type_info& QtStyleManager::GetType() const
 {
   return typeid(berry::IQtStyleManager);
 }
 
 QtStyleManager::QtStyleManager()
 {
   AddDefaultStyle();
   ReadPreferences();
 }
 
 void QtStyleManager::ReadPreferences()
 {
   IPreferencesService::Pointer prefService
     = Platform::GetServiceRegistry()
     .GetServiceById<IPreferencesService>(IPreferencesService::ID);
 
   IPreferences::Pointer stylePref = prefService->GetSystemPreferences()->Node(QtPreferences::QT_STYLES_NODE);
 
   QString paths = QString::fromStdString(stylePref->Get(QtPreferences::QT_STYLE_SEARCHPATHS, ""));
   QStringList pathList = paths.split(";", QString::SkipEmptyParts);
   QStringListIterator it(pathList);
   while (it.hasNext())
   {
     AddStyles(it.next());
   }
 
   QString styleName = QString::fromStdString(stylePref->Get(QtPreferences::QT_STYLE_NAME, ""));
   // if a style is contributed via the Qt resource mechanism, it may not be
   // registered yet.
   if (Contains(styleName))
     // do not update the style in the QApplication instance,
     // since it might not be created yet
     SetStyle(styleName, false);
   else
     SetDefaultStyle(false);
 }
 
 QtStyleManager::~QtStyleManager()
 {
   for (FileNameToStyleMap::const_iterator i = styles.begin(); i != styles.end(); ++i)
   {
     delete i.value();
   }
 }
 
 void QtStyleManager::AddDefaultStyle()
 {
 #ifndef _APPLE_
   AddStyle(":/org.blueberry.ui.qt/defaultstyle.qss", "Default");
   defaultStyle = styles[":/org.blueberry.ui.qt/defaultstyle.qss"];
 #endif
 }
 
 void QtStyleManager::ClearStyles()
 {
   for (FileNameToStyleMap::iterator i = styles.begin(); i != styles.end(); )
   {
     if (!i.value()->fileName.startsWith(':'))
     {
       delete i.value();
       i = styles.erase(i);
     }
     else ++i;
   }
   SetDefaultStyle();
 }
 
 QtStyleManager::Style QtStyleManager::GetStyle() const
 {
   return Style(currentStyle->name, currentStyle->fileName);
 }
 
 QString QtStyleManager::GetStylesheet() const
 {
   return currentStyle->stylesheet;
 }
 
 QString QtStyleManager::GetActiveTabStylesheet() const
 {
   return currentStyle->activeTabStylesheet;
 }
 
 QString QtStyleManager::GetTabStylesheet() const
 {
   return currentStyle->tabStylesheet;
 }
 
 void QtStyleManager::AddStyle(const QString& styleFileName,
     const QString& styleName)
 {
   ExtStyle* newStyle = new ExtStyle();
 
   if (styleName.isEmpty())
   {
     QFileInfo info(styleFileName);
     newStyle->name = info.completeBaseName();
   }
   else
   {
     newStyle->name = styleName;
   }
 
   newStyle->fileName = styleFileName;
 
   styles.insert(newStyle->fileName, newStyle);
 }
 
 void QtStyleManager::AddStyles(const QString& path)
 {
   QDirIterator dirIt(path);
   while (dirIt.hasNext())
   {
     QString current = dirIt.next();
     QFileInfo info = dirIt.fileInfo();
     if (info.isFile() && info.isReadable())
     {
       QString fileName = info.fileName();
       if (fileName.endsWith("-tab.qss") || fileName.endsWith("-activetab.qss"))
         continue;
 
       if (fileName.endsWith(".qss"))
         AddStyle(current);
     }
   }
 }
 
 void QtStyleManager::ReadStyleData(ExtStyle* style)
 {
   QString tabStyleFileName(style->fileName);
   QString activeTabStyleFileName(style->fileName);
 
   int index = style->fileName.lastIndexOf(".qss");
   tabStyleFileName.replace(index, 4, "-tab.qss");
   activeTabStyleFileName.replace(index, 4, "-activetab.qss");
 
   QFile styleFile(style->fileName);
   if (styleFile.open(QIODevice::ReadOnly))
   {
     QTextStream in(&styleFile);
     style->stylesheet = in.readAll();
   }
   else
   {
     BERRY_WARN << "Could not read " << style->fileName.toStdString();
   }
 
   QFile tabStyleFile(tabStyleFileName);
   if (tabStyleFile.open(QIODevice::ReadOnly))
   {
     QTextStream in(&tabStyleFile);
     style->tabStylesheet = in.readAll();
   }
   else
   {
     BERRY_WARN << "Could not read " << tabStyleFileName.toStdString();
   }
 
   QFile activeTabStyleFile(activeTabStyleFileName);
   if (activeTabStyleFile.open(QIODevice::ReadOnly))
   {
     QTextStream in(&activeTabStyleFile);
     style->activeTabStylesheet = in.readAll();
   }
   else
   {
     BERRY_WARN << "Could not read " << activeTabStyleFileName.toStdString();
   }
 }
 
 void QtStyleManager::RemoveStyle(const QString& styleFileName)
 {
   if (currentStyle->fileName == styleFileName)
   {
     SetDefaultStyle();
   }
 
   delete styles.take(styleFileName);
 }
 
 void QtStyleManager::RemoveStyles(const QString& repo)
 {
   if (repo.isEmpty())
   {
     ClearStyles();
     return;
   }
 
   for (FileNameToStyleMap::iterator i = styles.begin(); i != styles.end();)
   {
     ExtStyle* style = i.value();
     QFileInfo info(style->fileName);
     if (info.absolutePath() == repo)
     {
       if (style->name == currentStyle->name)
       {
         SetDefaultStyle();
       }
 
       i = styles.erase(i);
       delete style;
     }
     else
     {
       ++i;
     }
   }
 }
 
 void QtStyleManager::GetStyles(StyleList& styleNames) const
 {
   for (FileNameToStyleMap::const_iterator i = styles.begin(); i != styles.end(); ++i)
     styleNames.push_back(Style(i.value()->name, i.value()->fileName));
 }
 
+void QtStyleManager::GetIconThemes(IconThemeList& iconThemes) const
+{
+  iconThemes.clear();
+  iconThemes.push_back(IconTheme(QString( "<<default>>" )));
+
+  QStringList iconSearchPaths = QIcon::themeSearchPaths();
+
+  for(QStringList::Iterator pathIt = iconSearchPaths.begin(); pathIt != iconSearchPaths.end(); ++pathIt)
+  {
+    QDirIterator dirIt(*pathIt);
+    while (dirIt.hasNext())
+    {
+      QString current = dirIt.next();
+      QFileInfo info = dirIt.fileInfo();
+      if (info.isDir() && info.isReadable())
+      {
+        QFileInfo themeFile( info.filePath() + QString("/index.theme") );
+        if( themeFile.exists() && themeFile.isFile() && themeFile.isReadable() )
+        {
+          QString fileName = info.fileName();
+          iconThemes.push_back( IconTheme(fileName) );
+        }
+      }
+    }
+  }
+}
+
 void QtStyleManager::SetStyle(const QString& fileName)
 {
   SetStyle(fileName, true);
 }
 
 void QtStyleManager::SetStyle(const QString& fileName, bool update)
 {
   if (fileName.isEmpty())
   {
     SetDefaultStyle();
     return;
   }
 
   FileNameToStyleMap::const_iterator i = styles.find(fileName);
 
   ExtStyle* style = 0;
   if (i == styles.end())
   {
     BERRY_WARN << "Style " + fileName.toStdString() << " does not exist";
     style = defaultStyle;
   }
   else
   {
     style = i.value();
   }
   currentStyle = style;
 
   ReadStyleData(style);
 
   if (update)
   {
     qApp->setStyleSheet(currentStyle->stylesheet);
     PlatformUI::GetWorkbench()->UpdateTheme();
   }
 }
 
+void QtStyleManager::SetIconTheme(const QString& themeName)
+{
+  SetIconTheme(themeName, true);
+}
+
+void QtStyleManager::SetIconTheme(const QString& themeName, bool update)
+{
+  QIcon::setThemeName( themeName );
+}
+
 QtStyleManager::Style QtStyleManager::GetDefaultStyle() const
 {
   return Style(defaultStyle->name, defaultStyle->fileName);
 }
 
 void QtStyleManager::SetDefaultStyle()
 {
   SetDefaultStyle(true);
 }
 
 void QtStyleManager::SetDefaultStyle(bool update)
 {
   SetStyle(defaultStyle->fileName, update);
 }
 
 bool QtStyleManager::Contains(const QString& fileName) const
 {
   return styles.contains(fileName);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStyleManager.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStyleManager.h
index 2f60af255e..c09918bf15 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStyleManager.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStyleManager.h
@@ -1,85 +1,91 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTSTYLEMANAGER_H_
 #define BERRYQTSTYLEMANAGER_H_
 
 #include "berryIQtStyleManager.h"
 
 #include <QHash>
 
 namespace berry {
 
 class QtStyleManager : public QObject, public IQtStyleManager
 {
   Q_OBJECT
   Q_INTERFACES(berry::IQtStyleManager)
 
 public:
 
   QtStyleManager();
   ~QtStyleManager();
 
   Style GetStyle() const;
   QString GetStylesheet() const;
   QString GetActiveTabStylesheet() const;
   QString GetTabStylesheet() const;
 
   void AddStyle(const QString& styleFileName, const QString& styleName = QString());
   void AddStyles(const QString& path);
   void RemoveStyle(const QString& styleFileName);
   void RemoveStyles(const QString& path = QString());
 
   void GetStyles(StyleList& styles) const;
   void SetStyle(const QString& fileName);
 
   Style GetDefaultStyle() const;
   void SetDefaultStyle();
 
+  void GetIconThemes(IconThemeList& iconThemes) const;
+
+  void SetIconTheme(const QString& themeName);
+
   bool Contains(const QString& fileName) const;
 
   bool IsA( const std::type_info& type ) const;
   const std::type_info& GetType() const;
 
 private:
 
   void AddDefaultStyle();
   void ClearStyles();
   void ReadPreferences();
 
   void SetStyle(const QString& fileName, bool update);
   void SetDefaultStyle(bool update);
 
+  void SetIconTheme(const QString& themeName, bool update);
+
   struct ExtStyle : public Style
   {
     QString stylesheet;
     QString tabStylesheet;
     QString activeTabStylesheet;
   };
 
   void ReadStyleData(ExtStyle* style);
 
   typedef QHash<QString, ExtStyle*> FileNameToStyleMap;
   FileNameToStyleMap styles;
 
   ExtStyle const* currentStyle;
   ExtStyle* defaultStyle;
 
 };
 }
 
 #endif /* BERRYQTSTYLEMANAGER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp
index b8cf93b256..f95fb8296c 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp
@@ -1,209 +1,235 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtStylePreferencePage.h"
 
 #include <berryIPreferencesService.h>
 #include <berryQtPreferences.h>
 
 #include <QFileDialog>
 #include <QDirIterator>
 
 namespace berry
 {
 
 QtStylePreferencePage::QtStylePreferencePage()
 {
 
 }
 
 QtStylePreferencePage::QtStylePreferencePage(const QtStylePreferencePage& other)
 {
   Q_UNUSED(other)
 }
 
 void QtStylePreferencePage::Init(IWorkbench::Pointer )
 {
 
 }
 
 void QtStylePreferencePage::CreateQtControl(QWidget* parent)
 {
   mainWidget = new QWidget(parent);
   controls.setupUi(mainWidget);
 
   berry::IPreferencesService::Pointer prefService
     = berry::Platform::GetServiceRegistry()
     .GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
 
   styleManager = berry::Platform::GetServiceRegistry()
     .GetServiceById<berry::IQtStyleManager>(berry::IQtStyleManager::ID);
 
   m_StylePref = prefService->GetSystemPreferences()->Node(berry::QtPreferences::QT_STYLES_NODE);
 
   Update();
 
   connect(controls.m_StylesCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(StyleChanged(int)));
+  connect(controls.m_IconThemeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(IconThemeChanged(int)));
   connect(controls.m_PathList, SIGNAL(itemSelectionChanged()), this, SLOT(UpdatePathListButtons()));
   connect(controls.m_AddButton, SIGNAL(clicked(bool)), this, SLOT(AddPathClicked(bool)));
   connect(controls.m_EditButton, SIGNAL(clicked(bool)), this, SLOT(EditPathClicked(bool)));
   connect(controls.m_RemoveButton, SIGNAL(clicked(bool)), this, SLOT(RemovePathClicked(bool)));
 }
 
 void QtStylePreferencePage::FillStyleCombo(const berry::IQtStyleManager::Style& currentStyle)
 {
   controls.m_StylesCombo->clear();
   styles.clear();
   styleManager->GetStyles(styles);
 
   qSort(styles);
   for (int i = 0; i < styles.size(); ++i)
   {
     controls.m_StylesCombo->addItem(styles.at(i).name, QVariant(styles.at(i).fileName));
   }
   controls.m_StylesCombo->setCurrentIndex(styles.indexOf(currentStyle));
 }
 
+void QtStylePreferencePage::FillIconThemeComboBox()
+{
+  controls.m_IconThemeComboBox->clear();
+  berry::IQtStyleManager::IconThemeList iconThemes;
+  styleManager->GetIconThemes(iconThemes);
+
+  qSort(iconThemes);
+  for (int i = 0; i < iconThemes.size(); ++i)
+  {
+    controls.m_IconThemeComboBox->addItem(iconThemes.at(i).name);
+  }
+  controls.m_IconThemeComboBox->setCurrentIndex(iconThemes.indexOf( QIcon::themeName() ));
+}
+
 void QtStylePreferencePage::AddPath(const QString& path, bool updateCombo)
 {
   if (!controls.m_PathList->findItems(path, Qt::MatchCaseSensitive).isEmpty()) return;
 
   new QListWidgetItem(path, controls.m_PathList);
 
   styleManager->AddStyles(path);
 
   if (updateCombo)
     FillStyleCombo(oldStyle);
 }
 
 void QtStylePreferencePage::StyleChanged(int /*index*/)
 {
   QString fileName = controls.m_StylesCombo->itemData(controls.m_StylesCombo->currentIndex()).toString();
   styleManager->SetStyle(fileName);
 }
 
+void QtStylePreferencePage::IconThemeChanged(int /*index*/)
+{
+  QString themeName = controls.m_IconThemeComboBox->currentText();
+  styleManager->SetIconTheme(themeName);
+}
+
 void QtStylePreferencePage::AddPathClicked(bool /*checked*/)
 {
   QListWidgetItem* item = controls.m_PathList->currentItem();
   QString initialDir;
   if (item) initialDir = item->text();
   QString dir = QFileDialog::getExistingDirectory(mainWidget, "", initialDir);
 
   if (!dir.isEmpty()) this->AddPath(dir, true);
 }
 
 void QtStylePreferencePage::RemovePathClicked(bool /*checked*/)
 {
   QList<QListWidgetItem*> selection = controls.m_PathList->selectedItems();
   QListIterator<QListWidgetItem*> it(selection);
   while (it.hasNext())
   {
     QListWidgetItem* item = it.next();
     QString dir = item->text();
 
     controls.m_PathList->takeItem(controls.m_PathList->row(item));
     delete item;
     styleManager->RemoveStyles(dir);
   }
 
   if (!styleManager->Contains(oldStyle.fileName))
   {
     oldStyle = styleManager->GetDefaultStyle();
   }
 
   FillStyleCombo(oldStyle);
 }
 
 void QtStylePreferencePage::EditPathClicked(bool checked)
 {
   QListWidgetItem* item = controls.m_PathList->currentItem();
   QString initialDir = item->text();
   QString dir = QFileDialog::getExistingDirectory(mainWidget, "", initialDir);
 
   if (!dir.isEmpty())
   {
     this->RemovePathClicked(checked);
     this->AddPath(dir, true);
   }
 }
 
 void QtStylePreferencePage::UpdatePathListButtons()
 {
   int s = controls.m_PathList->selectedItems().size();
 
   if (s == 0)
   {
     controls.m_EditButton->setEnabled(false);
     controls.m_RemoveButton->setEnabled(false);
   }
   else if (s == 1)
   {
     controls.m_EditButton->setEnabled(true);
     controls.m_RemoveButton->setEnabled(true);
   }
   else
   {
     controls.m_EditButton->setEnabled(false);
     controls.m_RemoveButton->setEnabled(true);
   }
 }
 
 QWidget* QtStylePreferencePage::GetQtControl() const
 {
   return mainWidget;
 }
 
 bool QtStylePreferencePage::PerformOk()
 {
   m_StylePref->Put(berry::QtPreferences::QT_STYLE_NAME,
       controls.m_StylesCombo->itemData(controls.m_StylesCombo->currentIndex()).toString().toStdString());
 
   std::string paths;
   for (int i = 0; i < controls.m_PathList->count(); ++i)
   {
     QString path = controls.m_PathList->item(i)->text() + ";";
     paths += path.toStdString();
   }
 
   m_StylePref->Put(berry::QtPreferences::QT_STYLE_SEARCHPATHS, paths);
+  m_StylePref->Put(berry::QtPreferences::QT_ICON_THEME, QIcon::themeName().toStdString());
   return true;
 }
 
 void QtStylePreferencePage::PerformCancel()
 {
   Update();
 }
 
 void QtStylePreferencePage::Update()
 {
   styleManager->RemoveStyles();
 
   QString paths = QString::fromStdString(m_StylePref->Get(berry::QtPreferences::QT_STYLE_SEARCHPATHS, ""));
   QStringList pathList = paths.split(";", QString::SkipEmptyParts);
   QStringListIterator it(pathList);
   while (it.hasNext())
   {
     AddPath(it.next(), false);
   }
 
+  QString iconTheme = QString::fromStdString(m_StylePref->Get(berry::QtPreferences::QT_ICON_THEME, "<<default>>"));
+  styleManager->SetIconTheme( iconTheme );
+
   std::string name = m_StylePref->Get(berry::QtPreferences::QT_STYLE_NAME, "");
   styleManager->SetStyle(QString::fromStdString(name));
   oldStyle = styleManager->GetStyle();
 
   FillStyleCombo(oldStyle);
+  FillIconThemeComboBox();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h
index 9eba06af73..124458db09 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h
@@ -1,81 +1,83 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTSTYLEPREFERENCEPAGE_H_
 #define BERRYQTSTYLEPREFERENCEPAGE_H_
 
 #include <berryIQtPreferencePage.h>
 
 #include <berryIPreferences.h>
 #include <berryIQtStyleManager.h>
 
 #include <ui_berryQtStylePreferencePage.h>
 
 #include <QStringList>
 
 namespace berry {
 
 class QtStylePreferencePage : public QObject, public IQtPreferencePage
 {
 
   Q_OBJECT
   Q_INTERFACES(berry::IPreferencePage)
 
 public:
 
   QtStylePreferencePage();
   QtStylePreferencePage(const QtStylePreferencePage& other);
 
   void Init(IWorkbench::Pointer workbench);
 
   void CreateQtControl(QWidget* parent);
   QWidget* GetQtControl() const;
 
   bool PerformOk();
   void PerformCancel();
   void Update();
 
 protected:
 
   void AddPath(const QString& path, bool updateCombo);
   void FillStyleCombo(const berry::IQtStyleManager::Style& currentStyle);
+  void FillIconThemeComboBox();
 
 protected slots:
 
   void StyleChanged(int /*index*/);
+  void IconThemeChanged(int /*index*/);
   void AddPathClicked(bool /*checked*/);
   void RemovePathClicked(bool /*checked*/);
   void EditPathClicked(bool checked);
 
   void UpdatePathListButtons();
 
 private:
 
   berry::IQtStyleManager::Pointer styleManager;
 
   Ui::QtStylePreferencePageUI controls;
   berry::IPreferences::Pointer m_StylePref;
   berry::IQtStyleManager::Style oldStyle;
 
   berry::IQtStyleManager::StyleList styles;
 
   QWidget* mainWidget;
 };
 
 }
 
 #endif /* BERRYQTSTYLEPREFERENCEPAGE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.ui b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.ui
index acfcf648a2..a3f939dbce 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.ui
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.ui
@@ -1,137 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QtStylePreferencePageUI</class>
  <widget class="QWidget" name="QtStylePreferencePageUI">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>348</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QFrame" name="frame">
      <property name="frameShape">
       <enum>QFrame::Panel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <property name="lineWidth">
       <number>1</number>
      </property>
      <property name="midLineWidth">
       <number>0</number>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
-         <string>Active Theme</string>
+         <string>Active Style Theme</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QComboBox" name="m_StylesCombo">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QFrame" name="m_IconThemeFrame">
+     <property name="frameShape">
+      <enum>QFrame::Panel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <item>
+       <widget class="QLabel" name="m_IconThemeLabel">
+        <property name="text">
+         <string>Active Icon Theme</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="m_IconThemeComboBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>1</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer_2">
      <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>10</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Search Paths</string>
+      <string>Style Search Paths</string>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QListWidget" name="m_PathList">
        <property name="selectionMode">
         <enum>QAbstractItemView::ExtendedSelection</enum>
        </property>
        <property name="sortingEnabled">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QPushButton" name="m_AddButton">
          <property name="text">
           <string>Add...</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="m_EditButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="text">
           <string>Edit...</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="m_RemoveButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="text">
           <string>Remove</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.ext/files.cmake b/Plugins/org.mitk.gui.qt.ext/files.cmake
index ba1181ca41..64ec7a325a 100644
--- a/Plugins/org.mitk.gui.qt.ext/files.cmake
+++ b/Plugins/org.mitk.gui.qt.ext/files.cmake
@@ -1,58 +1,59 @@
 set(SRC_CPP_FILES
   QmitkExtActionBarAdvisor.cpp
   QmitkExtWorkbenchWindowAdvisor.cpp
   QmitkExtFileSaveProjectAction.cpp
   QmitkOpenDicomEditorAction.cpp
   QmitkOpenXnatEditorAction.cpp
 )
 
 set(INTERNAL_CPP_FILES
   QmitkAppInstancesPreferencePage.cpp
   QmitkExternalProgramsPreferencePage.cpp
   QmitkCommonExtPlugin.cpp
   QmitkInputDevicesPrefPage.cpp
   QmitkModuleView.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkAppInstancesPreferencePage.ui
   src/internal/QmitkExternalProgramsPreferencePage.ui
 )
 
 set(MOC_H_FILES
   src/QmitkExtFileSaveProjectAction.h
   src/QmitkExtWorkbenchWindowAdvisor.h
 
   src/internal/QmitkAppInstancesPreferencePage.h
   src/internal/QmitkExternalProgramsPreferencePage.h
   src/internal/QmitkCommonExtPlugin.h
   src/internal/QmitkExtWorkbenchWindowAdvisorHack.h
   src/internal/QmitkInputDevicesPrefPage.h
   src/internal/QmitkModuleView.h
   src/QmitkOpenDicomEditorAction.h
   src/QmitkOpenXnatEditorAction.h
 )
 
 set(CACHED_RESOURCE_FILES
 # list of resource files which can be used by the plug-in
 # system without loading the plug-ins shared library,
 # for example the icon used in the menu and tabs for the
 # plug-in views in the workbench
   plugin.xml
   resources/ModuleView.png
 )
 
 set(QRC_FILES
 # uncomment the following line if you want to use Qt resources
  resources/org_mitk_gui_qt_ext.qrc
+ resources/org_mitk_icons.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.ext/resources/icons/awesome/README.txt b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/README.txt
new file mode 100644
index 0000000000..7a2762e162
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/README.txt
@@ -0,0 +1 @@
+This icon theme is based on Font Awesome by Dave Gandy - http://fontawesome.io
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/index.theme b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/index.theme
new file mode 100644
index 0000000000..a35413f503
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/index.theme
@@ -0,0 +1,11 @@
+[Icon Theme]
+Name=awesome
+Comment=An icon theme using the awesome font
+Directories=scalable/actions
+
+[scalable/actions]
+Size=48
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Actions
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/document-open.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/document-open.svg
new file mode 100644
index 0000000000..bc9d4b345e
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/document-open.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg contentScriptType="text/ecmascript" contentStyleType="text/css" enable-background="new 0 0 2048 2048" height="2048px" id="Layer_1" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox="0.0 0 1909.0 2048" width="1909.0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" zoomAndPan="magnify"><path d="M1781,1059c0-23.333-17.667-35-53-35H640c-26.667,0-55.167,7.167-85.5,21.5s-54.167,31.833-71.5,52.5l-294,363  c-12,16-18,29.333-18,40c0,23.333,17.667,35,53,35h1088c26.667,0,55.333-7.333,86-22s54.333-32.333,71-53l294-363  C1775,1083.333,1781,1070.333,1781,1059z M640,896h768V736c0-26.667-9.333-49.333-28-68s-41.333-28-68-28H736  c-26.667,0-49.333-9.333-68-28s-28-41.333-28-68v-64c0-26.667-9.333-49.333-28-68s-41.333-28-68-28H224  c-26.667,0-49.333,9.333-68,28s-28,41.333-28,68v853l256-315c29.333-35.333,68-64.5,116-87.5S594.667,896,640,896z M1909,1059  c0,41.333-15.333,81.333-46,120l-295,363c-28.667,35.333-67.333,64.5-116,87.5s-95.333,34.5-140,34.5H224c-61.333,0-114-22-158-66  s-66-96.667-66-158V480c0-61.333,22-114,66-158s96.667-66,158-66h320c61.333,0,114,22,158,66s66,96.667,66,158v32h544  c61.333,0,114,22,158,66s66,96.667,66,158v160h192c36,0,69,8.167,99,24.5s52.333,39.833,67,70.5C1904,1012.333,1909,1035,1909,1059z  "/></svg>
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/document-save.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/document-save.svg
new file mode 100644
index 0000000000..6186219863
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/document-save.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg contentScriptType="text/ecmascript" contentStyleType="text/css" enable-background="new 0 0 2048 2048" height="2048px" id="Layer_1" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox="0.0 0 1536.0 2048" width="1536.0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" zoomAndPan="magnify"><path d="M384,1664h768v-384H384V1664z M1280,1664h128V768c0-9.333-3.333-22.167-10-38.5s-13.333-27.833-20-34.5l-281-281  c-6.667-6.667-18-13.333-34-20s-29-10-39-10v416c0,26.667-9.333,49.333-28,68s-41.333,28-68,28H352c-26.667,0-49.333-9.333-68-28  s-28-41.333-28-68V384H128v1280h128v-416c0-26.667,9.333-49.333,28-68s41.333-28,68-28h832c26.667,0,49.333,9.333,68,28  s28,41.333,28,68V1664z M896,736V416c0-8.667-3.167-16.167-9.5-22.5S872.667,384,864,384H672c-8.667,0-16.167,3.167-22.5,9.5  S640,407.333,640,416v320c0,8.667,3.167,16.167,9.5,22.5s13.833,9.5,22.5,9.5h192c8.667,0,16.167-3.167,22.5-9.5  S896,744.667,896,736z M1536,768v928c0,26.667-9.333,49.333-28,68s-41.333,28-68,28H96c-26.667,0-49.333-9.333-68-28  s-28-41.333-28-68V352c0-26.667,9.333-49.333,28-68s41.333-28,68-28h928c26.667,0,56,6.667,88,20s57.333,29.333,76,48l280,280  c18.667,18.667,34.667,44,48,76S1536,741.333,1536,768z"/></svg>
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/edit-delete.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/edit-delete.svg
new file mode 100644
index 0000000000..27119428d3
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/edit-delete.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg contentScriptType="text/ecmascript" contentStyleType="text/css" enable-background="new 0 0 2048 2048" height="2048px" id="Layer_1" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox="0.0 0 1408.0 2048" width="1408.0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" zoomAndPan="magnify"><path d="M512,864v576c0,9.333-3,17-9,23s-13.667,9-23,9h-64c-9.333,0-17-3-23-9s-9-13.667-9-23V864c0-9.333,3-17,9-23s13.667-9,23-9  h64c9.333,0,17,3,23,9S512,854.667,512,864z M768,864v576c0,9.333-3,17-9,23s-13.667,9-23,9h-64c-9.333,0-17-3-23-9s-9-13.667-9-23  V864c0-9.333,3-17,9-23s13.667-9,23-9h64c9.333,0,17,3,23,9S768,854.667,768,864z M1024,864v576c0,9.333-3,17-9,23s-13.667,9-23,9  h-64c-9.333,0-17-3-23-9s-9-13.667-9-23V864c0-9.333,3-17,9-23s13.667-9,23-9h64c9.333,0,17,3,23,9S1024,854.667,1024,864z   M1152,1588V640H256v948c0,14.667,2.333,28.167,7,40.5s9.5,21.333,14.5,27s8.5,8.5,10.5,8.5h832c2,0,5.5-2.833,10.5-8.5  s9.833-14.667,14.5-27S1152,1602.667,1152,1588z M480,512h448l-48-117c-4.667-6-10.333-9.667-17-11H546c-6.667,1.333-12.333,5-17,11  L480,512z M1408,544v64c0,9.333-3,17-9,23s-13.667,9-23,9h-96v948c0,55.333-15.667,103.167-47,143.5s-69,60.5-113,60.5H288  c-44,0-81.667-19.5-113-58.5s-47-86.167-47-141.5V640H32c-9.333,0-17-3-23-9s-9-13.667-9-23v-64c0-9.333,3-17,9-23s13.667-9,23-9  h309l70-167c10-24.667,28-45.667,54-63s52.333-26,79-26h320c26.667,0,53,8.667,79,26s44,38.333,54,63l70,167h309c9.333,0,17,3,23,9  S1408,534.667,1408,544z"/></svg>
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/edit-redo.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/edit-redo.svg
new file mode 100644
index 0000000000..0a6f7237ee
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/edit-redo.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg contentScriptType="text/ecmascript" contentStyleType="text/css" enable-background="new 0 0 2048 2048" height="2048px" id="Layer_1" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox="0.0 0 1536.0 2048" width="1536.0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" zoomAndPan="magnify"><path d="M1536,384v448c0,17.333-6.333,32.333-19,45s-27.667,19-45,19h-448c-28,0-47.667-13.333-59-40c-11.333-26-6.667-49,14-69  l138-138c-98.667-91.333-215-137-349-137c-69.333,0-135.5,13.5-198.5,40.5S452,616,406,662s-82.5,100.5-109.5,163.5  S256,954.667,256,1024s13.5,135.5,40.5,198.5S360,1340,406,1386s100.5,82.5,163.5,109.5S698.667,1536,768,1536  c79.333,0,154.333-17.333,225-52s130.333-83.667,179-147c4.667-6.667,12.333-10.667,23-12c9.333,0,17.667,3,25,9l137,138  c6,5.333,9.167,12.167,9.5,20.5s-2.167,15.833-7.5,22.5c-72.667,88-160.667,156.167-264,204.5S882.667,1792,768,1792  c-104,0-203.333-20.333-298-61s-176.333-95.333-245-164s-123.333-150.333-164-245S0,1128,0,1024s20.333-203.333,61-298  s95.333-176.333,164-245s150.333-123.333,245-164s194-61,298-61c98,0,192.833,18.5,284.5,55.5S1225.667,400.667,1297,468l130-129  c19.333-20.667,42.667-25.333,70-14C1523,336.333,1536,356,1536,384z"/></svg>
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/edit-undo.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/edit-undo.svg
new file mode 100644
index 0000000000..7d61e9226b
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/edit-undo.svg
@@ -0,0 +1,48 @@
+<?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"
+   contentScriptType="text/ecmascript"
+   contentStyleType="text/css"
+   enable-background="new 0 0 2048 2048"
+   height="2048px"
+   id="Layer_1"
+   preserveAspectRatio="xMidYMid meet"
+   version="1.1"
+   viewBox="0.0 0 1536.0 2048"
+   width="1536.0px"
+   xml:space="preserve"
+   zoomAndPan="magnify"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="edit-redo.svg"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="0.11523438"
+     inkscape:cx="768"
+     inkscape:cy="1024"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 0,384 v 448 c 0,17.333 6.333,32.333 19,45 12.667,12.667 27.667,19 45,19 h 448 c 28,0 47.667,-13.333 59,-40 11.333,-26 6.667,-49 -14,-69 L 419,649 c 98.667,-91.333 215,-137 349,-137 69.333,0 135.5,13.5 198.5,40.5 63,27 117.5,63.5 163.5,109.5 46,46 82.5,100.5 109.5,163.5 27,63 40.5,129.167 40.5,198.5 0,69.333 -13.5,135.5 -40.5,198.5 -27,63 -63.5,117.5 -109.5,163.5 -46,46 -100.5,82.5 -163.5,109.5 -63,27 -129.167,40.5 -198.5,40.5 -79.333,0 -154.333,-17.333 -225,-52 -70.667,-34.667 -130.333,-83.667 -179,-147 -4.667,-6.667 -12.333,-10.667 -23,-12 -9.333,0 -17.667,3 -25,9 l -137,138 c -6,5.333 -9.167,12.167 -9.5,20.5 -0.333,8.333 2.167,15.833 7.5,22.5 72.667,88 160.667,156.167 264,204.5 103.333,48.333 212.333,72.5 327,72.5 104,0 203.333,-20.333 298,-61 94.667,-40.667 176.333,-95.333 245,-164 68.667,-68.667 123.333,-150.333 164,-245 40.667,-94.667 61,-194 61,-298 0,-104 -20.333,-203.333 -61,-298 C 1434.333,631.333 1379.667,549.667 1311,481 1242.333,412.333 1160.667,357.667 1066,317 971.333,276.333 872,256 768,256 670,256 575.167,274.5 483.5,311.5 391.833,348.5 310.333,400.667 239,468 L 109,339 C 89.667,318.333 66.333,313.667 39,325 13,336.333 0,356 0,384 z"
+     id="path3"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/system-log-out.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/system-log-out.svg
new file mode 100644
index 0000000000..270bef7652
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/system-log-out.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2989"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="Neues Dokument 2">
+  <defs
+     id="defs2991" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="19.037879"
+     inkscape:cy="13.76466"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     inkscape:window-x="1592"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2994">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <text
+       xml:space="preserve"
+       style="font-size:70.42821503px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:FontAwesome;-inkscape-font-specification:FontAwesome"
+       x="2.324388"
+       y="58.524879"
+       id="text2985"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan2987"
+         x="2.324388"
+         y="58.524879"></tspan></text>
+  </g>
+</svg>
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/README.txt b/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/README.txt
new file mode 100644
index 0000000000..ff53220de5
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/README.txt
@@ -0,0 +1 @@
+This icon theme is based on the tango-icon-theme of the Tango Desktop Project ( http://tango.freedesktop.org/ )
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/index.theme b/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/index.theme
new file mode 100644
index 0000000000..8da6a07f1c
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/index.theme
@@ -0,0 +1,11 @@
+[Icon Theme]
+Name=tango
+Comment=An icon theme following the tango style guide
+Directories=scalable/actions
+
+[scalable/actions]
+Size=48
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Actions
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/document-open.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/document-open.svg
similarity index 100%
rename from Plugins/org.mitk.gui.qt.ext/resources/document-open.svg
rename to Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/document-open.svg
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/document-save.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/document-save.svg
similarity index 100%
rename from Plugins/org.mitk.gui.qt.ext/resources/document-save.svg
rename to Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/document-save.svg
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/edit-delete.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/edit-delete.svg
similarity index 100%
rename from Plugins/org.mitk.gui.qt.ext/resources/edit-delete.svg
rename to Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/edit-delete.svg
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/edit-redo.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/edit-redo.svg
similarity index 100%
rename from Plugins/org.mitk.gui.qt.ext/resources/edit-redo.svg
rename to Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/edit-redo.svg
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/edit-undo.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/edit-undo.svg
similarity index 100%
rename from Plugins/org.mitk.gui.qt.ext/resources/edit-undo.svg
rename to Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/edit-undo.svg
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/system-log-out.svg b/Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/system-log-out.svg
similarity index 100%
rename from Plugins/org.mitk.gui.qt.ext/resources/system-log-out.svg
rename to Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/system-log-out.svg
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc b/Plugins/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc
index 28fac18f60..d674e5c226 100644
--- a/Plugins/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc
+++ b/Plugins/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc
@@ -1,15 +1,9 @@
 <RCC>
     <qresource prefix="/org.mitk.gui.qt.ext">
-        <file>document-open.svg</file>
-        <file>document-save.svg</file>
-        <file>edit-delete.svg</file>
-        <file>edit-redo.svg</file>
-        <file>edit-undo.svg</file>
-        <file>system-log-out.svg</file>
         <file>dcm-icon.png</file>
         <file>Slider.png</file>
         <file>index.html</file>
         <file>xnat-icon.png</file>
         <file>view-manager_48.png</file>
     </qresource>
 </RCC>
diff --git a/Plugins/org.mitk.gui.qt.ext/resources/org_mitk_icons.qrc b/Plugins/org.mitk.gui.qt.ext/resources/org_mitk_icons.qrc
new file mode 100644
index 0000000000..a23a3c2242
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.ext/resources/org_mitk_icons.qrc
@@ -0,0 +1,18 @@
+<!DOCTYPE RCC><RCC version="1.0">
+ <qresource prefix="/org_mitk_icons">
+     <file>icons/awesome/index.theme</file>
+     <file>icons/awesome/scalable/actions/document-open.svg</file>
+     <file>icons/awesome/scalable/actions/document-save.svg</file>
+     <file>icons/awesome/scalable/actions/edit-delete.svg</file>
+     <file>icons/awesome/scalable/actions/edit-redo.svg</file>
+     <file>icons/awesome/scalable/actions/edit-undo.svg</file>
+     <file>icons/awesome/scalable/actions/system-log-out.svg</file>
+     <file>icons/tango/index.theme</file>
+     <file>icons/tango/scalable/actions/document-open.svg</file>
+     <file>icons/tango/scalable/actions/document-save.svg</file>
+     <file>icons/tango/scalable/actions/edit-delete.svg</file>
+     <file>icons/tango/scalable/actions/edit-redo.svg</file>
+     <file>icons/tango/scalable/actions/edit-undo.svg</file>
+     <file>icons/tango/scalable/actions/system-log-out.svg</file>
+ </qresource>
+ </RCC>
diff --git a/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp
index c4b4992f62..c8277c77df 100644
--- a/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp
+++ b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp
@@ -1,1323 +1,1338 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkExtWorkbenchWindowAdvisor.h"
 #include "QmitkExtActionBarAdvisor.h"
 
 #include <QMenu>
 #include <QMenuBar>
 #include <QMainWindow>
 #include <QStatusBar>
 #include <QString>
 #include <QFile>
 #include <QRegExp>
 #include <QTextStream>
 #include <QSettings>
 
 #include <ctkPluginException.h>
 #include <service/event/ctkEventAdmin.h>
 
 #include <berryPlatform.h>
 #include <berryPlatformUI.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIPreferencesService.h>
 #include <berryIPerspectiveRegistry.h>
 #include <berryIPerspectiveDescriptor.h>
 #include <berryIWorkbenchPartConstants.h>
+#include <berryQtPreferences.h>
 
 #include <internal/berryQtShowViewAction.h>
 #include <internal/berryQtOpenPerspectiveAction.h>
 
 #include <QmitkFileOpenAction.h>
 #include <QmitkExtFileSaveProjectAction.h>
 #include <QmitkFileExitAction.h>
 #include <QmitkCloseProjectAction.h>
 #include <QmitkDefaultDropTargetListener.h>
 #include <QmitkStatusBar.h>
 #include <QmitkProgressBar.h>
 #include <QmitkMemoryUsageIndicatorView.h>
 #include <QmitkPreferencesDialog.h>
 #include <QmitkOpenDicomEditorAction.h>
 #include <QmitkOpenXnatEditorAction.h>
 
 #include <itkConfigure.h>
 #include <vtkConfigure.h>
 #include <mitkVersion.h>
 #include <mitkIDataStorageService.h>
 #include <mitkIDataStorageReference.h>
 #include <mitkDataStorageEditorInput.h>
 #include <mitkWorkbenchUtil.h>
 #include <vtkVersionMacros.h>
 
 // UGLYYY
 #include "internal/QmitkExtWorkbenchWindowAdvisorHack.h"
 #include "internal/QmitkCommonExtPlugin.h"
 #include "mitkUndoController.h"
 #include "mitkVerboseLimitedLinearUndo.h"
 #include <QToolBar>
 #include <QMessageBox>
 #include <QLabel>
 #include <QmitkAboutDialog/QmitkAboutDialog.h>
 
 QmitkExtWorkbenchWindowAdvisorHack
 * QmitkExtWorkbenchWindowAdvisorHack::undohack =
         new QmitkExtWorkbenchWindowAdvisorHack();
 
 QString QmitkExtWorkbenchWindowAdvisor::QT_SETTINGS_FILENAME = "QtSettings.ini";
 
 class PartListenerForTitle: public berry::IPartListener
 {
 public:
 
     PartListenerForTitle(QmitkExtWorkbenchWindowAdvisor* wa) :
         windowAdvisor(wa)
     {
     }
 
     Events::Types GetPartEventTypes() const
     {
         return Events::ACTIVATED | Events::BROUGHT_TO_TOP | Events::CLOSED
                 | Events::HIDDEN | Events::VISIBLE;
     }
 
     void PartActivated(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (ref.Cast<berry::IEditorReference> ())
         {
             windowAdvisor->UpdateTitle(false);
         }
     }
 
     void PartBroughtToTop(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (ref.Cast<berry::IEditorReference> ())
         {
             windowAdvisor->UpdateTitle(false);
         }
     }
 
     void PartClosed(berry::IWorkbenchPartReference::Pointer /*ref*/)
     {
         windowAdvisor->UpdateTitle(false);
     }
 
     void PartHidden(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (!windowAdvisor->lastActiveEditor.Expired() &&
                 ref->GetPart(false) == windowAdvisor->lastActiveEditor.Lock())
         {
             windowAdvisor->UpdateTitle(true);
         }
     }
 
     void PartVisible(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (!windowAdvisor->lastActiveEditor.Expired() &&
                 ref->GetPart(false) == windowAdvisor->lastActiveEditor.Lock())
         {
             windowAdvisor->UpdateTitle(false);
         }
     }
 
 private:
     QmitkExtWorkbenchWindowAdvisor* windowAdvisor;
 
 };
 
 class PartListenerForViewNavigator: public berry::IPartListener
 {
 public:
 
     PartListenerForViewNavigator(QAction* act) :
         viewNavigatorAction(act)
     {
     }
 
     Events::Types GetPartEventTypes() const
     {
         return Events::OPENED | Events::CLOSED | Events::HIDDEN |
                 Events::VISIBLE;
     }
 
     void PartOpened(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (ref->GetId()=="org.mitk.views.viewnavigatorview")
         {
             viewNavigatorAction->setChecked(true);
         }
     }
 
     void PartClosed(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (ref->GetId()=="org.mitk.views.viewnavigatorview")
         {
             viewNavigatorAction->setChecked(false);
         }
     }
 
     void PartVisible(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (ref->GetId()=="org.mitk.views.viewnavigatorview")
         {
             viewNavigatorAction->setChecked(true);
         }
     }
 
     void PartHidden(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (ref->GetId()=="org.mitk.views.viewnavigatorview")
         {
             viewNavigatorAction->setChecked(false);
         }
     }
 
 private:
     QAction* viewNavigatorAction;
 
 };
 
 class PartListenerForImageNavigator: public berry::IPartListener
 {
 public:
 
     PartListenerForImageNavigator(QAction* act) :
         imageNavigatorAction(act)
     {
     }
 
     Events::Types GetPartEventTypes() const
     {
         return Events::OPENED | Events::CLOSED | Events::HIDDEN |
                 Events::VISIBLE;
     }
 
     void PartOpened(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (ref->GetId()=="org.mitk.views.imagenavigator")
         {
             imageNavigatorAction->setChecked(true);
         }
     }
 
     void PartClosed(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (ref->GetId()=="org.mitk.views.imagenavigator")
         {
             imageNavigatorAction->setChecked(false);
         }
     }
 
     void PartVisible(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (ref->GetId()=="org.mitk.views.imagenavigator")
         {
             imageNavigatorAction->setChecked(true);
         }
     }
 
     void PartHidden(berry::IWorkbenchPartReference::Pointer ref)
     {
         if (ref->GetId()=="org.mitk.views.imagenavigator")
         {
             imageNavigatorAction->setChecked(false);
         }
     }
 
 private:
     QAction* imageNavigatorAction;
 
 };
 
 class PerspectiveListenerForTitle: public berry::IPerspectiveListener
 {
 public:
 
     PerspectiveListenerForTitle(QmitkExtWorkbenchWindowAdvisor* wa) :
         windowAdvisor(wa), perspectivesClosed(false)
     {
     }
 
     Events::Types GetPerspectiveEventTypes() const
     {
         return Events::ACTIVATED | Events::SAVED_AS | Events::DEACTIVATED
                 // remove the following line when command framework is finished
                 | Events::CLOSED | Events::OPENED;
     }
 
     void PerspectiveActivated(berry::IWorkbenchPage::Pointer /*page*/,
                               berry::IPerspectiveDescriptor::Pointer /*perspective*/)
     {
         windowAdvisor->UpdateTitle(false);
     }
 
     void PerspectiveSavedAs(berry::IWorkbenchPage::Pointer /*page*/,
                             berry::IPerspectiveDescriptor::Pointer /*oldPerspective*/,
                             berry::IPerspectiveDescriptor::Pointer /*newPerspective*/)
     {
         windowAdvisor->UpdateTitle(false);
     }
 
     void PerspectiveDeactivated(berry::IWorkbenchPage::Pointer /*page*/,
                                 berry::IPerspectiveDescriptor::Pointer /*perspective*/)
     {
         windowAdvisor->UpdateTitle(false);
     }
 
     void PerspectiveOpened(berry::IWorkbenchPage::Pointer /*page*/,
                            berry::IPerspectiveDescriptor::Pointer /*perspective*/)
     {
         if (perspectivesClosed)
         {
             QListIterator<QAction*> i(windowAdvisor->viewActions);
             while (i.hasNext())
             {
                 i.next()->setEnabled(true);
             }
 
             //GetViewRegistry()->Find("org.mitk.views.imagenavigator");
             if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor"))
             {
                 windowAdvisor->openDicomEditorAction->setEnabled(true);
             }
             if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser"))
             {
                 windowAdvisor->openXnatEditorAction->setEnabled(true);
             }
             windowAdvisor->fileSaveProjectAction->setEnabled(true);
             windowAdvisor->closeProjectAction->setEnabled(true);
             windowAdvisor->undoAction->setEnabled(true);
             windowAdvisor->redoAction->setEnabled(true);
             windowAdvisor->imageNavigatorAction->setEnabled(true);
             windowAdvisor->viewNavigatorAction->setEnabled(true);
             windowAdvisor->resetPerspAction->setEnabled(true);
             if( windowAdvisor->GetShowClosePerspectiveMenuItem() )
             {
                 windowAdvisor->closePerspAction->setEnabled(true);
             }
         }
 
         perspectivesClosed = false;
     }
 
     void PerspectiveClosed(berry::IWorkbenchPage::Pointer /*page*/,
                            berry::IPerspectiveDescriptor::Pointer /*perspective*/)
     {
         berry::IWorkbenchWindow::Pointer wnd = windowAdvisor->GetWindowConfigurer()->GetWindow();
         bool allClosed = true;
         if (wnd->GetActivePage())
         {
             std::vector<berry::IPerspectiveDescriptor::Pointer> perspectives(wnd->GetActivePage()->GetOpenPerspectives());
             allClosed = perspectives.empty();
         }
 
         if (allClosed)
         {
             perspectivesClosed = true;
 
             QListIterator<QAction*> i(windowAdvisor->viewActions);
             while (i.hasNext())
             {
                 i.next()->setEnabled(false);
             }
 
             if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor"))
             {
                 windowAdvisor->openDicomEditorAction->setEnabled(false);
             }
             if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser"))
             {
                 windowAdvisor->openXnatEditorAction->setEnabled(false);
             }
             windowAdvisor->fileSaveProjectAction->setEnabled(false);
             windowAdvisor->closeProjectAction->setEnabled(false);
             windowAdvisor->undoAction->setEnabled(false);
             windowAdvisor->redoAction->setEnabled(false);
             windowAdvisor->imageNavigatorAction->setEnabled(false);
             windowAdvisor->viewNavigatorAction->setEnabled(false);
             windowAdvisor->resetPerspAction->setEnabled(false);
             if( windowAdvisor->GetShowClosePerspectiveMenuItem() )
             {
                 windowAdvisor->closePerspAction->setEnabled(false);
             }
         }
     }
 
 private:
     QmitkExtWorkbenchWindowAdvisor* windowAdvisor;
     bool perspectivesClosed;
 };
 
 class PerspectiveListenerForMenu: public berry::IPerspectiveListener
 {
 public:
 
     PerspectiveListenerForMenu(QmitkExtWorkbenchWindowAdvisor* wa) :
         windowAdvisor(wa)
     {
     }
 
     Events::Types GetPerspectiveEventTypes() const
     {
         return Events::ACTIVATED | Events::DEACTIVATED;
     }
 
     void PerspectiveActivated(berry::IWorkbenchPage::Pointer /*page*/,
                               berry::IPerspectiveDescriptor::Pointer perspective)
     {
         QAction* action = windowAdvisor->mapPerspIdToAction[perspective->GetId()];
         if (action)
         {
             action->setChecked(true);
         }
     }
 
     void PerspectiveDeactivated(berry::IWorkbenchPage::Pointer /*page*/,
                                 berry::IPerspectiveDescriptor::Pointer perspective)
     {
         QAction* action = windowAdvisor->mapPerspIdToAction[perspective->GetId()];
         if (action)
         {
             action->setChecked(false);
         }
     }
 
 private:
     QmitkExtWorkbenchWindowAdvisor* windowAdvisor;
 };
 
 
 
 QmitkExtWorkbenchWindowAdvisor::QmitkExtWorkbenchWindowAdvisor(berry::WorkbenchAdvisor* wbAdvisor,
                                                                berry::IWorkbenchWindowConfigurer::Pointer configurer) :
     berry::WorkbenchWindowAdvisor(configurer),
     lastInput(0),
     wbAdvisor(wbAdvisor),
     showViewToolbar(true),
     showPerspectiveToolbar(false),
     showVersionInfo(true),
     showMitkVersionInfo(true),
     showViewMenuItem(true),
     showNewWindowMenuItem(false),
     showClosePerspectiveMenuItem(true),
     viewNavigatorFound(false),
     showMemoryIndicator(true),
     dropTargetListener(new QmitkDefaultDropTargetListener)
 {
     productName = QCoreApplication::applicationName().toStdString();
     viewExcludeList.push_back("org.mitk.views.viewnavigatorview");
 }
 
 berry::ActionBarAdvisor::Pointer QmitkExtWorkbenchWindowAdvisor::CreateActionBarAdvisor(
         berry::IActionBarConfigurer::Pointer configurer)
 {
     berry::ActionBarAdvisor::Pointer actionBarAdvisor(
                 new QmitkExtActionBarAdvisor(configurer));
     return actionBarAdvisor;
 }
 
 void* QmitkExtWorkbenchWindowAdvisor::CreateEmptyWindowContents(void* parent)
 {
     QWidget* parentWidget = static_cast<QWidget*>(parent);
     QLabel* label = new QLabel(parentWidget);
     label->setText("<b>No perspectives are open. Open a perspective in the <i>Window->Open Perspective</i> menu.</b>");
     label->setContentsMargins(10,10,10,10);
     label->setAlignment(Qt::AlignTop);
     label->setEnabled(false);
     parentWidget->layout()->addWidget(label);
     return label;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowClosePerspectiveMenuItem(bool show)
 {
     showClosePerspectiveMenuItem = show;
 }
 
 bool QmitkExtWorkbenchWindowAdvisor::GetShowClosePerspectiveMenuItem()
 {
     return showClosePerspectiveMenuItem;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowMemoryIndicator(bool show)
 {
     showMemoryIndicator = show;
 }
 
 bool QmitkExtWorkbenchWindowAdvisor::GetShowMemoryIndicator()
 {
     return showMemoryIndicator;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowNewWindowMenuItem(bool show)
 {
     showNewWindowMenuItem = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowViewToolbar(bool show)
 {
     showViewToolbar = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowViewMenuItem(bool show)
 {
     showViewMenuItem = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowPerspectiveToolbar(bool show)
 {
     showPerspectiveToolbar = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowVersionInfo(bool show)
 {
     showVersionInfo = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowMitkVersionInfo(bool show)
 {
     showMitkVersionInfo = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::SetProductName(const std::string& product)
 {
     productName = product;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::SetWindowIcon(const std::string& wndIcon)
 {
     windowIcon = wndIcon;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::PostWindowCreate()
 {
     // very bad hack...
     berry::IWorkbenchWindow::Pointer window =
             this->GetWindowConfigurer()->GetWindow();
     QMainWindow* mainWindow =
             static_cast<QMainWindow*> (window->GetShell()->GetControl());
 
     window->SetPerspectiveExcludeList(perspectiveExcludeList);
     window->SetViewExcludeList(viewExcludeList);
 
     if (!windowIcon.empty())
     {
         mainWindow->setWindowIcon(QIcon(QString::fromStdString(windowIcon)));
     }
     mainWindow->setContextMenuPolicy(Qt::PreventContextMenu);
 
     /*mainWindow->setStyleSheet("color: white;"
  "background-color: #808080;"
  "selection-color: #659EC7;"
  "selection-background-color: #808080;"
  " QMenuBar {"
  "background-color: #808080; }");*/
 
+    // Load selected icon theme
+
+    QStringList searchPaths = QIcon::themeSearchPaths();
+    searchPaths.push_front( QString(":/org_mitk_icons/icons/") );
+    QIcon::setThemeSearchPaths( searchPaths );
+
+    berry::IPreferencesService::Pointer prefService
+      = berry::Platform::GetServiceRegistry()
+      .GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
+
+    berry::IPreferences::Pointer stylePref = prefService->GetSystemPreferences()->Node(berry::QtPreferences::QT_STYLES_NODE);
+    QString iconTheme = QString::fromStdString(stylePref->Get(berry::QtPreferences::QT_ICON_THEME, "<<default>>"));
+    QIcon::setThemeName( iconTheme );
+
     // ==== Application menu ============================
     QMenuBar* menuBar = mainWindow->menuBar();
     menuBar->setContextMenuPolicy(Qt::PreventContextMenu);
 
     QMenu* fileMenu = menuBar->addMenu("&File");
     fileMenu->setObjectName("FileMenu");
 
-    QAction* fileOpenAction = new QmitkFileOpenAction(QIcon::fromTheme("document-open",QIcon(":/org.mitk.gui.qt.ext/document-open.svg")), window);
+    QAction* fileOpenAction = new QmitkFileOpenAction(QIcon::fromTheme("document-open",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/document-open.svg")), window);
     fileMenu->addAction(fileOpenAction);
     fileSaveProjectAction = new QmitkExtFileSaveProjectAction(window);
-    fileSaveProjectAction->setIcon(QIcon::fromTheme("document-save",QIcon(":/org.mitk.gui.qt.ext/document-save.svg")));
+    fileSaveProjectAction->setIcon(QIcon::fromTheme("document-save",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/document-save.svg")));
     fileMenu->addAction(fileSaveProjectAction);
     closeProjectAction = new QmitkCloseProjectAction(window);
-    closeProjectAction->setIcon(QIcon::fromTheme("edit-delete",QIcon(":/org.mitk.gui.qt.ext/edit-delete.svg")));
+    closeProjectAction->setIcon(QIcon::fromTheme("edit-delete",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/edit-delete.svg")));
     fileMenu->addAction(closeProjectAction);
     fileMenu->addSeparator();
     QAction* fileExitAction = new QmitkFileExitAction(window);
-    fileExitAction->setIcon(QIcon::fromTheme("system-log-out",QIcon(":/org.mitk.gui.qt.ext/system-log-out.svg")));
+    fileExitAction->setIcon(QIcon::fromTheme("system-log-out",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/system-log-out.svg")));
     fileExitAction->setObjectName("QmitkFileExitAction");
     fileMenu->addAction(fileExitAction);
 
     if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor"))
     {
         openDicomEditorAction = new QmitkOpenDicomEditorAction(QIcon(":/org.mitk.gui.qt.ext/dcm-icon.png"),window);
     }
     if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser"))
     {
         openXnatEditorAction = new QmitkOpenXnatEditorAction(QIcon(":/org.mitk.gui.qt.ext/xnat-icon.png"),window);
     }
 
     berry::IViewRegistry* viewRegistry =
             berry::PlatformUI::GetWorkbench()->GetViewRegistry();
     const std::vector<berry::IViewDescriptor::Pointer>& viewDescriptors =
             viewRegistry->GetViews();
 
     // another bad hack to get an edit/undo menu...
     QMenu* editMenu = menuBar->addMenu("&Edit");
-    undoAction = editMenu->addAction(QIcon::fromTheme("edit-undo",QIcon(":/org.mitk.gui.qt.ext/edit-undo.svg")),
+    undoAction = editMenu->addAction(QIcon::fromTheme("edit-undo",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/edit-undo.svg")),
                                      "&Undo",
                                      QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onUndo()),
                                      QKeySequence("CTRL+Z"));
     undoAction->setToolTip("Undo the last action (not supported by all modules)");
-    redoAction = editMenu->addAction(QIcon::fromTheme("edit-redo",QIcon(":/org.mitk.gui.qt.ext/edit-redo.svg"))
+    redoAction = editMenu->addAction(QIcon::fromTheme("edit-redo",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/edit-redo.svg"))
                                      , "&Redo",
                                      QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onRedo()),
                                      QKeySequence("CTRL+Y"));
     redoAction->setToolTip("execute the last action that was undone again (not supported by all modules)");
 
     imageNavigatorAction = new QAction(QIcon(":/org.mitk.gui.qt.ext/Slider.png"), "&Image Navigator", NULL);
     bool imageNavigatorViewFound = window->GetWorkbench()->GetViewRegistry()->Find("org.mitk.views.imagenavigator");
     if (imageNavigatorViewFound)
     {
         QObject::connect(imageNavigatorAction, SIGNAL(triggered(bool)), QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onImageNavigator()));
         imageNavigatorAction->setCheckable(true);
 
         // add part listener for image navigator
         imageNavigatorPartListener = new PartListenerForImageNavigator(imageNavigatorAction);
         window->GetPartService()->AddPartListener(imageNavigatorPartListener);
         berry::IViewPart::Pointer imageNavigatorView =
                 window->GetActivePage()->FindView("org.mitk.views.imagenavigator");
         imageNavigatorAction->setChecked(false);
         if (imageNavigatorView)
         {
             bool isImageNavigatorVisible = window->GetActivePage()->IsPartVisible(imageNavigatorView);
             if (isImageNavigatorVisible)
                 imageNavigatorAction->setChecked(true);
         }
         imageNavigatorAction->setToolTip("Toggle image navigator for navigating through image");
     }
 
     viewNavigatorAction = new QAction(QIcon(":/org.mitk.gui.qt.ext/view-manager_48.png"),"&View Navigator", NULL);
     viewNavigatorFound = window->GetWorkbench()->GetViewRegistry()->Find("org.mitk.views.viewnavigatorview");
     if (viewNavigatorFound)
     {
         QObject::connect(viewNavigatorAction, SIGNAL(triggered(bool)), QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onViewNavigator()));
         viewNavigatorAction->setCheckable(true);
 
         // add part listener for view navigator
         viewNavigatorPartListener = new PartListenerForViewNavigator(viewNavigatorAction);
         window->GetPartService()->AddPartListener(viewNavigatorPartListener);
         berry::IViewPart::Pointer viewnavigatorview =
                 window->GetActivePage()->FindView("org.mitk.views.viewnavigatorview");
         viewNavigatorAction->setChecked(false);
         if (viewnavigatorview)
         {
             bool isViewNavigatorVisible = window->GetActivePage()->IsPartVisible(viewnavigatorview);
             if (isViewNavigatorVisible)
                 viewNavigatorAction->setChecked(true);
         }
         viewNavigatorAction->setToolTip("Toggle View Navigator");
     }
 
     // toolbar for showing file open, undo, redo and other main actions
     QToolBar* mainActionsToolBar = new QToolBar;
     mainActionsToolBar->setObjectName("mainActionsToolBar");
     mainActionsToolBar->setContextMenuPolicy(Qt::PreventContextMenu);
 
 #ifdef __APPLE__
     mainActionsToolBar->setToolButtonStyle ( Qt::ToolButtonTextUnderIcon );
 #else
     mainActionsToolBar->setToolButtonStyle ( Qt::ToolButtonTextBesideIcon );
 #endif
 
     mainActionsToolBar->addAction(fileOpenAction);
     mainActionsToolBar->addAction(fileSaveProjectAction);
     mainActionsToolBar->addAction(closeProjectAction);
     mainActionsToolBar->addAction(undoAction);
     mainActionsToolBar->addAction(redoAction);
     if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor"))
     {
         mainActionsToolBar->addAction(openDicomEditorAction);
     }
     if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser"))
     {
         mainActionsToolBar->addAction(openXnatEditorAction);
     }
     if (imageNavigatorViewFound)
     {
         mainActionsToolBar->addAction(imageNavigatorAction);
     }
     if (viewNavigatorFound)
         mainActionsToolBar->addAction(viewNavigatorAction);
 
     mainWindow->addToolBar(mainActionsToolBar);
 
 #ifdef __APPLE__
     mainWindow->setUnifiedTitleAndToolBarOnMac(true);
 #endif
 
     // ==== Window Menu ==========================
     QMenu* windowMenu = menuBar->addMenu("Window");
     if (showNewWindowMenuItem)
     {
         windowMenu->addAction("&New Window", QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onNewWindow()));
         windowMenu->addSeparator();
     }
 
     QMenu* perspMenu = windowMenu->addMenu("&Open Perspective");
 
     QMenu* viewMenu;
     if (showViewMenuItem)
     {
         viewMenu = windowMenu->addMenu("Show &View");
         viewMenu->setObjectName("Show View");
     }
     windowMenu->addSeparator();
     resetPerspAction = windowMenu->addAction("&Reset Perspective",
                                              QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onResetPerspective()));
 
     if(showClosePerspectiveMenuItem)
         closePerspAction = windowMenu->addAction("&Close Perspective", QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onClosePerspective()));
 
     windowMenu->addSeparator();
     windowMenu->addAction("&Preferences...",
                           QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onEditPreferences()),
                           QKeySequence("CTRL+P"));
 
     // fill perspective menu
     berry::IPerspectiveRegistry* perspRegistry =
             window->GetWorkbench()->GetPerspectiveRegistry();
     QActionGroup* perspGroup = new QActionGroup(menuBar);
 
     std::vector<berry::IPerspectiveDescriptor::Pointer> perspectives(
                 perspRegistry->GetPerspectives());
 
     bool skip = false;
     for (std::vector<berry::IPerspectiveDescriptor::Pointer>::iterator perspIt =
          perspectives.begin(); perspIt != perspectives.end(); ++perspIt)
     {
 
         // if perspectiveExcludeList is set, it contains the id-strings of perspectives, which
         // should not appear as an menu-entry in the perspective menu
         if (perspectiveExcludeList.size() > 0)
         {
             for (unsigned int i=0; i<perspectiveExcludeList.size(); i++)
             {
                 if (perspectiveExcludeList.at(i) == (*perspIt)->GetId())
                 {
                     skip = true;
                     break;
                 }
             }
             if (skip)
             {
                 skip = false;
                 continue;
             }
         }
 
         QAction* perspAction = new berry::QtOpenPerspectiveAction(window,
                                                                   *perspIt, perspGroup);
         mapPerspIdToAction.insert(std::make_pair((*perspIt)->GetId(), perspAction));
     }
     perspMenu->addActions(perspGroup->actions());
 
     // sort elements (converting vector to map...)
     std::vector<berry::IViewDescriptor::Pointer>::const_iterator iter;
     std::map<std::string, berry::IViewDescriptor::Pointer> VDMap;
 
     skip = false;
     for (iter = viewDescriptors.begin(); iter != viewDescriptors.end(); ++iter)
     {
 
         // if viewExcludeList is set, it contains the id-strings of view, which
         // should not appear as an menu-entry in the menu
         if (viewExcludeList.size() > 0)
         {
             for (unsigned int i=0; i<viewExcludeList.size(); i++)
             {
                 if (viewExcludeList.at(i) == (*iter)->GetId())
                 {
                     skip = true;
                     break;
                 }
             }
             if (skip)
             {
                 skip = false;
                 continue;
             }
         }
 
         if ((*iter)->GetId() == "org.blueberry.ui.internal.introview")
             continue;
         if ((*iter)->GetId() == "org.mitk.views.imagenavigator")
             continue;
         if ((*iter)->GetId() == "org.mitk.views.viewnavigatorview")
             continue;
 
         std::pair<std::string, berry::IViewDescriptor::Pointer> p(
                     (*iter)->GetLabel(), (*iter));
         VDMap.insert(p);
     }
 
     // ==== Perspective Toolbar ==================================
     QToolBar* qPerspectiveToolbar = new QToolBar;
     qPerspectiveToolbar->setObjectName("perspectiveToolBar");
 
     if (showPerspectiveToolbar)
     {
         qPerspectiveToolbar->addActions(perspGroup->actions());
         mainWindow->addToolBar(qPerspectiveToolbar);
     }
     else
         delete qPerspectiveToolbar;
 
     // ==== View Toolbar ==================================
     QToolBar* qToolbar = new QToolBar;
     qToolbar->setObjectName("viewToolBar");
 
     std::map<std::string, berry::IViewDescriptor::Pointer>::const_iterator
             MapIter;
     for (MapIter = VDMap.begin(); MapIter != VDMap.end(); ++MapIter)
     {
         berry::QtShowViewAction* viewAction = new berry::QtShowViewAction(window,
                                                                           (*MapIter).second);
         viewActions.push_back(viewAction);
         if(showViewMenuItem)
             viewMenu->addAction(viewAction);
         if (showViewToolbar)
         {
             qToolbar->addAction(viewAction);
         }
     }
 
     if (showViewToolbar)
     {
         mainWindow->addToolBar(qToolbar);
     }
     else
         delete qToolbar;
 
     QSettings settings(GetQSettingsFile(), QSettings::IniFormat);
     mainWindow->restoreState(settings.value("ToolbarPosition").toByteArray());
 
     // ===== Help menu ====================================
     QMenu* helpMenu = menuBar->addMenu("&Help");
     helpMenu->addAction("&Welcome",this, SLOT(onIntro()));
     helpMenu->addAction("&Open Help Perspective", this, SLOT(onHelpOpenHelpPerspective()));
     helpMenu->addAction("&Context Help",this, SLOT(onHelp()),  QKeySequence("F1"));
     helpMenu->addAction("&About",this, SLOT(onAbout()));
     // =====================================================
 
     QStatusBar* qStatusBar = new QStatusBar();
 
     //creating a QmitkStatusBar for Output on the QStatusBar and connecting it with the MainStatusBar
     QmitkStatusBar *statusBar = new QmitkStatusBar(qStatusBar);
     //disabling the SizeGrip in the lower right corner
     statusBar->SetSizeGripEnabled(false);
 
     QmitkProgressBar *progBar = new QmitkProgressBar();
 
     qStatusBar->addPermanentWidget(progBar, 0);
     progBar->hide();
     // progBar->AddStepsToDo(2);
     // progBar->Progress(1);
 
     mainWindow->setStatusBar(qStatusBar);
 
     if (showMemoryIndicator)
     {
         QmitkMemoryUsageIndicatorView* memoryIndicator = new QmitkMemoryUsageIndicatorView();
         qStatusBar->addPermanentWidget(memoryIndicator, 0);
     }
 }
 
 void QmitkExtWorkbenchWindowAdvisor::PreWindowOpen()
 {
     berry::IWorkbenchWindowConfigurer::Pointer configurer = GetWindowConfigurer();
 
     // show the shortcut bar and progress indicator, which are hidden by
     // default
     //configurer->SetShowPerspectiveBar(true);
     //configurer->SetShowFastViewBars(true);
     //configurer->SetShowProgressIndicator(true);
 
     //  // add the drag and drop support for the editor area
     //  configurer.addEditorAreaTransfer(EditorInputTransfer.getInstance());
     //  configurer.addEditorAreaTransfer(ResourceTransfer.getInstance());
     //  configurer.addEditorAreaTransfer(FileTransfer.getInstance());
     //  configurer.addEditorAreaTransfer(MarkerTransfer.getInstance());
     //  configurer.configureEditorAreaDropListener(new EditorAreaDropAdapter(
     //      configurer.getWindow()));
 
     this->HookTitleUpdateListeners(configurer);
 
     menuPerspectiveListener = new PerspectiveListenerForMenu(this);
     configurer->GetWindow()->AddPerspectiveListener(menuPerspectiveListener);
 
     configurer->AddEditorAreaTransfer(QStringList("text/uri-list"));
     configurer->ConfigureEditorAreaDropListener(dropTargetListener);
 
 }
 
 void QmitkExtWorkbenchWindowAdvisor::PostWindowOpen()
 {
     // Force Rendering Window Creation on startup.
     berry::IWorkbenchWindowConfigurer::Pointer configurer = GetWindowConfigurer();
 
     ctkPluginContext* context = QmitkCommonExtPlugin::getContext();
     ctkServiceReference serviceRef = context->getServiceReference<mitk::IDataStorageService>();
     if (serviceRef)
     {
         mitk::IDataStorageService *dsService = context->getService<mitk::IDataStorageService>(serviceRef);
         if (dsService)
         {
             mitk::IDataStorageReference::Pointer dsRef = dsService->GetDataStorage();
             mitk::DataStorageEditorInput::Pointer dsInput(new mitk::DataStorageEditorInput(dsRef));
             mitk::WorkbenchUtil::OpenEditor(configurer->GetWindow()->GetActivePage(),dsInput);
         }
     }
 }
 
 void QmitkExtWorkbenchWindowAdvisor::onIntro()
 {
     QmitkExtWorkbenchWindowAdvisorHack::undohack->onIntro();
 }
 
 void QmitkExtWorkbenchWindowAdvisor::onHelp()
 {
     QmitkExtWorkbenchWindowAdvisorHack::undohack->onHelp();
 }
 
 void QmitkExtWorkbenchWindowAdvisor::onHelpOpenHelpPerspective()
 {
     QmitkExtWorkbenchWindowAdvisorHack::undohack->onHelpOpenHelpPerspective();
 }
 
 void QmitkExtWorkbenchWindowAdvisor::onAbout()
 {
     QmitkExtWorkbenchWindowAdvisorHack::undohack->onAbout();
 }
 
 //--------------------------------------------------------------------------------
 // Ugly hack from here on. Feel free to delete when command framework
 // and undo buttons are done.
 //--------------------------------------------------------------------------------
 
 QmitkExtWorkbenchWindowAdvisorHack::QmitkExtWorkbenchWindowAdvisorHack() : QObject()
 {
 
 }
 
 QmitkExtWorkbenchWindowAdvisorHack::~QmitkExtWorkbenchWindowAdvisorHack()
 {
 
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onUndo()
 {
     mitk::UndoModel* model = mitk::UndoController::GetCurrentUndoModel();
     if (model)
     {
         if (mitk::VerboseLimitedLinearUndo* verboseundo = dynamic_cast<mitk::VerboseLimitedLinearUndo*>( model ))
         {
             mitk::VerboseLimitedLinearUndo::StackDescription descriptions =
                     verboseundo->GetUndoDescriptions();
             if (descriptions.size() >= 1)
             {
                 MITK_INFO << "Undo " << descriptions.front().second;
             }
         }
         model->Undo();
     }
     else
     {
         MITK_ERROR << "No undo model instantiated";
     }
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onRedo()
 {
     mitk::UndoModel* model = mitk::UndoController::GetCurrentUndoModel();
     if (model)
     {
         if (mitk::VerboseLimitedLinearUndo* verboseundo = dynamic_cast<mitk::VerboseLimitedLinearUndo*>( model ))
         {
             mitk::VerboseLimitedLinearUndo::StackDescription descriptions =
                     verboseundo->GetRedoDescriptions();
             if (descriptions.size() >= 1)
             {
                 MITK_INFO << "Redo " << descriptions.front().second;
             }
         }
         model->Redo();
     }
     else
     {
         MITK_ERROR << "No undo model instantiated";
     }
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onImageNavigator()
 {
     // get ImageNavigatorView
     berry::IViewPart::Pointer imageNavigatorView =
             berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->FindView("org.mitk.views.imagenavigator");
     if (imageNavigatorView)
     {
         bool isImageNavigatorVisible = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->IsPartVisible(imageNavigatorView);
         if (isImageNavigatorVisible)
         {
             berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->HideView(imageNavigatorView);
             return;
         }
     }
     berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ShowView("org.mitk.views.imagenavigator");
     //berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ResetPerspective();
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onViewNavigator()
 {
     // get viewnavigatorView
     berry::IViewPart::Pointer viewnavigatorView =
             berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->FindView("org.mitk.views.viewnavigatorview");
     if (viewnavigatorView)
     {
         bool isviewnavigatorVisible = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->IsPartVisible(viewnavigatorView);
         if (isviewnavigatorVisible)
         {
             berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->HideView(viewnavigatorView);
             return;
         }
     }
     berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ShowView("org.mitk.views.viewnavigatorview");
     //berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ResetPerspective();
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onEditPreferences()
 {
     QmitkPreferencesDialog _PreferencesDialog(QApplication::activeWindow());
     _PreferencesDialog.exec();
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onQuit()
 {
     berry::PlatformUI::GetWorkbench()->Close();
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onResetPerspective()
 {
     berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ResetPerspective();
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onClosePerspective()
 {
     berry::IWorkbenchPage::Pointer
             page =
             berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
     page->ClosePerspective(page->GetPerspective(), true, true);
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onNewWindow()
 {
     berry::PlatformUI::GetWorkbench()->OpenWorkbenchWindow(0);
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onIntro()
 {
     bool hasIntro =
             berry::PlatformUI::GetWorkbench()->GetIntroManager()->HasIntro();
     if (!hasIntro)
     {
 
         QRegExp reg("(.*)<title>(\\n)*");
         QRegExp reg2("(\\n)*</title>(.*)");
         QFile file(":/org.mitk.gui.qt.ext/index.html");
         file.open(QIODevice::ReadOnly | QIODevice::Text); //text file only for reading
 
         QString text = QString(file.readAll());
 
         file.close();
 
         QString title = text;
         title.replace(reg, "");
         title.replace(reg2, "");
 
         std::cout << title.toStdString() << std::endl;
 
         QMessageBox::information(NULL, title,
                                  text, "Close");
 
     }
     else
     {
         berry::PlatformUI::GetWorkbench()->GetIntroManager()->ShowIntro(
                     berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow(), false);
     }
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onHelp()
 {
     ctkPluginContext* context = QmitkCommonExtPlugin::getContext();
     if (context == 0)
     {
         MITK_WARN << "Plugin context not set, unable to open context help";
         return;
     }
 
     // Check if the org.blueberry.ui.qt.help plug-in is installed and started
     QList<QSharedPointer<ctkPlugin> > plugins = context->getPlugins();
     foreach(QSharedPointer<ctkPlugin> p, plugins)
     {
         if (p->getSymbolicName() == "org.blueberry.ui.qt.help")
         {
             if (p->getState() != ctkPlugin::ACTIVE)
             {
                 // try to activate the plug-in explicitly
                 try
                 {
                     p->start(ctkPlugin::START_TRANSIENT);
                 }
                 catch (const ctkPluginException& pe)
                 {
                     MITK_ERROR << "Activating org.blueberry.ui.qt.help failed: " << pe.what();
                     return;
                 }
             }
         }
     }
 
     ctkServiceReference eventAdminRef = context->getServiceReference<ctkEventAdmin>();
     ctkEventAdmin* eventAdmin = 0;
     if (eventAdminRef)
     {
         eventAdmin = context->getService<ctkEventAdmin>(eventAdminRef);
     }
     if (eventAdmin == 0)
     {
         MITK_WARN << "ctkEventAdmin service not found. Unable to open context help";
     }
     else
     {
         ctkEvent ev("org/blueberry/ui/help/CONTEXTHELP_REQUESTED");
         eventAdmin->postEvent(ev);
     }
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onHelpOpenHelpPerspective()
 {
     berry::PlatformUI::GetWorkbench()->ShowPerspective("org.blueberry.perspectives.help",
                                                        berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow());
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onAbout()
 {
     QmitkAboutDialog* aboutDialog = new QmitkAboutDialog(QApplication::activeWindow(),NULL);
     aboutDialog->open();
 }
 
 void QmitkExtWorkbenchWindowAdvisor::HookTitleUpdateListeners(
         berry::IWorkbenchWindowConfigurer::Pointer configurer)
 {
     // hook up the listeners to update the window title
     titlePartListener = new PartListenerForTitle(this);
     titlePerspectiveListener = new PerspectiveListenerForTitle(this);
     editorPropertyListener = new berry::PropertyChangeIntAdapter<
             QmitkExtWorkbenchWindowAdvisor>(this,
                                             &QmitkExtWorkbenchWindowAdvisor::PropertyChange);
 
     //    configurer.getWindow().addPageListener(new IPageListener() {
     //      public void pageActivated(IWorkbenchPage page) {
     //        updateTitle(false);
     //      }
     //
     //      public void pageClosed(IWorkbenchPage page) {
     //        updateTitle(false);
     //      }
     //
     //      public void pageOpened(IWorkbenchPage page) {
     //        // do nothing
     //      }
     //    });
 
     configurer->GetWindow()->AddPerspectiveListener(titlePerspectiveListener);
     configurer->GetWindow()->GetPartService()->AddPartListener(titlePartListener);
 }
 
 std::string QmitkExtWorkbenchWindowAdvisor::ComputeTitle()
 {
     berry::IWorkbenchWindowConfigurer::Pointer configurer =
             GetWindowConfigurer();
     berry::IWorkbenchPage::Pointer currentPage =
             configurer->GetWindow()->GetActivePage();
     berry::IEditorPart::Pointer activeEditor;
     if (currentPage)
     {
         activeEditor = lastActiveEditor.Lock();
     }
 
     std::string title;
     //TODO Product
     //    IProduct product = Platform.getProduct();
     //    if (product != null) {
     //      title = product.getName();
     //    }
     // instead of the product name, we use a custom variable for now
     title = productName;
 
     if(showMitkVersionInfo)
     {
         title += std::string(" ") + MITK_VERSION_STRING;
     }
 
     if (showVersionInfo)
     {
         // add version informatioin
         QString versions = QString(" (ITK %1.%2.%3  VTK %4.%5.%6 Qt %7 MITK %8)")
                 .arg(ITK_VERSION_MAJOR).arg(ITK_VERSION_MINOR).arg(ITK_VERSION_PATCH)
                 .arg(VTK_MAJOR_VERSION).arg(VTK_MINOR_VERSION).arg(VTK_BUILD_VERSION)
                 .arg(QT_VERSION_STR)
                 .arg(MITK_VERSION_STRING);
 
         title += versions.toStdString();
     }
 
     if (currentPage)
     {
         if (activeEditor)
         {
             lastEditorTitle = activeEditor->GetTitleToolTip();
             if (!lastEditorTitle.empty())
                 title = lastEditorTitle + " - " + title;
         }
         berry::IPerspectiveDescriptor::Pointer persp =
                 currentPage->GetPerspective();
         std::string label = "";
         if (persp)
         {
             label = persp->GetLabel();
         }
         berry::IAdaptable* input = currentPage->GetInput();
         if (input && input != wbAdvisor->GetDefaultPageInput())
         {
             label = currentPage->GetLabel();
         }
         if (!label.empty())
         {
             title = label + " - " + title;
         }
     }
 
     title += " (Not for use in diagnosis or treatment of patients)";
 
     return title;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::RecomputeTitle()
 {
     berry::IWorkbenchWindowConfigurer::Pointer configurer =
             GetWindowConfigurer();
     std::string oldTitle = configurer->GetTitle();
     std::string newTitle = ComputeTitle();
     if (newTitle != oldTitle)
     {
         configurer->SetTitle(newTitle);
     }
 }
 
 void QmitkExtWorkbenchWindowAdvisor::UpdateTitle(bool editorHidden)
 {
     berry::IWorkbenchWindowConfigurer::Pointer configurer =
             GetWindowConfigurer();
     berry::IWorkbenchWindow::Pointer window = configurer->GetWindow();
     berry::IEditorPart::Pointer activeEditor;
     berry::IWorkbenchPage::Pointer currentPage = window->GetActivePage();
     berry::IPerspectiveDescriptor::Pointer persp;
     berry::IAdaptable* input = 0;
 
     if (currentPage)
     {
         activeEditor = currentPage->GetActiveEditor();
         persp = currentPage->GetPerspective();
         input = currentPage->GetInput();
     }
 
     if (editorHidden)
     {
         activeEditor = 0;
     }
 
     // Nothing to do if the editor hasn't changed
     if (activeEditor == lastActiveEditor.Lock() && currentPage == lastActivePage.Lock()
             && persp == lastPerspective.Lock() && input == lastInput)
     {
         return;
     }
 
     if (!lastActiveEditor.Expired())
     {
         lastActiveEditor.Lock()->RemovePropertyListener(editorPropertyListener);
     }
 
     lastActiveEditor = activeEditor;
     lastActivePage = currentPage;
     lastPerspective = persp;
     lastInput = input;
 
     if (activeEditor)
     {
         activeEditor->AddPropertyListener(editorPropertyListener);
     }
 
     RecomputeTitle();
 }
 
 void QmitkExtWorkbenchWindowAdvisor::PropertyChange(berry::Object::Pointer /*source*/, int propId)
 {
     if (propId == berry::IWorkbenchPartConstants::PROP_TITLE)
     {
         if (!lastActiveEditor.Expired())
         {
             std::string newTitle = lastActiveEditor.Lock()->GetPartName();
             if (lastEditorTitle != newTitle)
             {
                 RecomputeTitle();
             }
         }
     }
 }
 
 
 void QmitkExtWorkbenchWindowAdvisor::SetPerspectiveExcludeList(std::vector<std::string> v)
 {
     this->perspectiveExcludeList = v;
 }
 
 std::vector<std::string> QmitkExtWorkbenchWindowAdvisor::GetPerspectiveExcludeList()
 {
     return this->perspectiveExcludeList;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::SetViewExcludeList(std::vector<std::string> v)
 {
     this->viewExcludeList = v;
 }
 
 std::vector<std::string> QmitkExtWorkbenchWindowAdvisor::GetViewExcludeList()
 {
     return this->viewExcludeList;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::PostWindowClose()
 {
     berry::IWorkbenchWindow::Pointer window = this->GetWindowConfigurer()->GetWindow();
     QMainWindow* mainWindow = static_cast<QMainWindow*> (window->GetShell()->GetControl());
 
     QSettings settings(GetQSettingsFile(), QSettings::IniFormat);
     settings.setValue("ToolbarPosition", mainWindow->saveState());
 }
 
 QString QmitkExtWorkbenchWindowAdvisor::GetQSettingsFile() const
 {
     QFileInfo settingsInfo = QmitkCommonExtPlugin::getContext()->getDataFile(QT_SETTINGS_FILENAME);
     return settingsInfo.canonicalFilePath();
 }