diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.cpp b/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.cpp
index 6ad9da7011..9abe25d947 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.cpp
+++ b/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.cpp
@@ -1,186 +1,234 @@
 /*===================================================================
 
 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 "QmitkSingleNodeSelectionWidget.h"
 
 #include <QmitkNodeSelectionDialog.h>
 #include <QmitkModelViewSelectionConnector.h>
 
+#include "QPainter"
+#include "QTextDocument"
+
+QmitkSelectionButton::QmitkSelectionButton(QWidget *parent)
+  : QPushButton(parent)
+{ }
+
+void QmitkSelectionButton::SetSelectedNode(mitk::DataNode* node)
+{
+  this->m_SelectedNode = mitk::WeakPointer<mitk::DataNode>(node);
+  this->update();
+};
+
+void QmitkSelectionButton::SetNodeInfo(QString info)
+{
+  this->m_Info = info;
+  this->update();
+};
+
+
+void QmitkSelectionButton::paintEvent(QPaintEvent *p)
+{
+  QPushButton::paintEvent(p);
+
+  QPainter painter(this);
+  QTextDocument td;
+  td.setHtml(m_Info);
+  painter.translate(QPoint(5,5));
+  td.drawContents(&painter);
+
+}
+
+
 QmitkSingleNodeSelectionWidget::QmitkSingleNodeSelectionWidget(QWidget* parent) : QmitkAbstractNodeSelectionWidget(parent)
 {
   m_Controls.setupUi(this);
 
+  QHBoxLayout *horizontalLayout = new QHBoxLayout(this);
+  horizontalLayout->setSpacing(0);
+  horizontalLayout->setObjectName(QStringLiteral("horizontalLayout"));
+  horizontalLayout->setContentsMargins(0, 0, 0, 0);
+  m_Btn = new QmitkSelectionButton(this);
+  m_Btn->setObjectName(QStringLiteral("btn"));
+  QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+  sizePolicy.setHorizontalStretch(0);
+  sizePolicy.setVerticalStretch(0);
+  sizePolicy.setHeightForWidth(m_Btn->sizePolicy().hasHeightForWidth());
+  m_Btn->setSizePolicy(sizePolicy);
+  m_Btn->setMinimumSize(QSize(0, 20));
+
+  horizontalLayout->addWidget(m_Btn);
+
   this->UpdateInfo();
 
-  m_Controls.nodeInfo->installEventFilter(this);
-  m_Controls.nodeInfo->setVisible(true);
+  m_Btn->installEventFilter(this);
+  m_Btn->setVisible(true);
 }
 
 mitk::DataNode::Pointer QmitkSingleNodeSelectionWidget::ExtractCurrentValidSelection(const NodeList& nodes) const
 {
   mitk::DataNode::Pointer result = nullptr;
 
   for (auto node : nodes)
   {
     bool valid = true;
     if (m_NodePredicate.IsNotNull())
     {
       valid = m_NodePredicate->CheckNode(node);
     }
     if (valid)
     {
       result = node;
       break;
     }
   }
 
   return result;
 }
 
 QmitkSingleNodeSelectionWidget::NodeList QmitkSingleNodeSelectionWidget::CompileEmitSelection() const
 {
   NodeList result;
 
   if (!m_SelectOnlyVisibleNodes)
   {
     result = m_ExternalSelection;
   }
 
   if (m_SelectedNode.IsNotNull() && !result.contains(m_SelectedNode))
   {
     result.append(m_SelectedNode);
   }
 
   return result;
 }
 
 void QmitkSingleNodeSelectionWidget::OnNodePredicateChanged(mitk::NodePredicateBase* /*newPredicate*/)
 {
     m_SelectedNode = this->ExtractCurrentValidSelection(m_ExternalSelection);
 };
 
 mitk::DataNode::Pointer QmitkSingleNodeSelectionWidget::GetSelectedNode() const
 {
   return m_SelectedNode;
 };
 
 bool QmitkSingleNodeSelectionWidget::eventFilter(QObject *obj, QEvent *ev)
 {
-  if (obj == m_Controls.nodeInfo)
+  if (obj == m_Btn)
   {
     if (ev->type() == QEvent::MouseButtonRelease)
     {
       this->EditSelection();
       return true;
     }
   }
 
   return false;
 }
 
 void QmitkSingleNodeSelectionWidget::EditSelection()
 {
   QmitkNodeSelectionDialog* dialog = new QmitkNodeSelectionDialog(this, m_PopUpTitel, m_PopUpHint);
 
   dialog->SetDataStorage(m_DataStorage.Lock());
   dialog->SetNodePredicate(m_NodePredicate);
   NodeList list;
   if (m_SelectedNode.IsNotNull())
   {
     list.append(m_SelectedNode);
   }
   dialog->SetCurrentSelection(list);
   dialog->SetSelectOnlyVisibleNodes(m_SelectOnlyVisibleNodes);
   dialog->SetSelectionMode(QAbstractItemView::SingleSelection);
 
   if (dialog->exec())
   {
     auto lastEmission = this->CompileEmitSelection();
 
     auto nodes = dialog->GetSelectedNodes();
     if (nodes.empty())
     {
       m_SelectedNode = nullptr;
     }
     else
     {
       m_SelectedNode = nodes.first();
     }
 
     auto newEmission = this->CompileEmitSelection();
 
     if (!EqualNodeSelections(lastEmission, newEmission))
     {
       emit CurrentSelectionChanged(newEmission);
       this->UpdateInfo();
     }
   }
 
   delete dialog;
 };
 
 void QmitkSingleNodeSelectionWidget::UpdateInfo()
 {
   if (m_SelectedNode.IsNull())
   {
     if (m_IsOptional)
     {
-      m_Controls.nodeInfo->setText(m_EmptyInfo);
+      m_Btn->SetNodeInfo(m_EmptyInfo);
     }
     else
     {
-      m_Controls.nodeInfo->setText(m_InvalidInfo);
+      m_Btn->SetNodeInfo(m_InvalidInfo);
     }
   }
   else
   {
     auto name = m_SelectedNode->GetName();
-    m_Controls.nodeInfo->setText(QString::fromStdString(name));
+    m_Btn->SetNodeInfo(QString::fromStdString(name));
   }
 
 };
 
 void QmitkSingleNodeSelectionWidget::SetSelectOnlyVisibleNodes(bool selectOnlyVisibleNodes)
 {
   auto lastEmission = this->CompileEmitSelection();
 
   m_SelectOnlyVisibleNodes = selectOnlyVisibleNodes;
 
   auto newEmission = this->CompileEmitSelection();
 
   if (!EqualNodeSelections(lastEmission, newEmission))
   {
     emit CurrentSelectionChanged(newEmission);
     this->UpdateInfo();
   }
 };
 
 void QmitkSingleNodeSelectionWidget::SetCurrentSelection(NodeList selectedNodes)
 {
   auto lastEmission = this->CompileEmitSelection();
 
   m_ExternalSelection = selectedNodes;
   m_SelectedNode = this->ExtractCurrentValidSelection(selectedNodes);
 
   auto newEmission = this->CompileEmitSelection();
 
   if (!EqualNodeSelections(lastEmission, newEmission))
   {
     emit CurrentSelectionChanged(newEmission);
     this->UpdateInfo();
   }
 };
diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.h b/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.h
index b2279d5cce..707d5d0fed 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.h
+++ b/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.h
@@ -1,78 +1,99 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 
 #ifndef QMITK_SINGLE_NODE_SELECTION_WIDGET_H
 #define QMITK_SINGLE_NODE_SELECTION_WIDGET_H
 
 #include <QmitkModelViewSelectionConnector.h>
 
 #include <mitkDataStorage.h>
 #include <mitkWeakPointer.h>
 #include <mitkNodePredicateBase.h>
 
 #include "org_mitk_gui_qt_common_Export.h"
 
 #include "ui_QmitkSingleNodeSelectionWidget.h"
 
 #include <QmitkAbstractNodeSelectionWidget.h>
+#include "QPushButton"
 
 class QmitkAbstractDataStorageModel;
-class QAbstractItemVew;
+
+class  QmitkSelectionButton : public QPushButton
+{
+  Q_OBJECT
+
+public:
+  QmitkSelectionButton(QWidget *parent = 0);
+
+  public Q_SLOTS :
+  virtual void SetSelectedNode(mitk::DataNode* node);
+  virtual void SetNodeInfo(QString info);
+
+protected:
+  void paintEvent(QPaintEvent *p) override;
+
+  mitk::WeakPointer<mitk::DataNode> m_SelectedNode;
+  QString m_Info;
+};
 
 /**
 * \class QmitkSingleNodeSelectionWidget
-* \brief Widget that allows to show and edit the content of an mitk::IsoDoseLevel instance.
+* \brief Widget that that represents a node selection. It acts like a button. Clicking on it
+* allows to change the selection.
 */
 class MITK_QT_COMMON QmitkSingleNodeSelectionWidget : public QmitkAbstractNodeSelectionWidget
 {
   Q_OBJECT
 
 public:
   explicit QmitkSingleNodeSelectionWidget(QWidget* parent = nullptr);
 
   mitk::DataNode::Pointer GetSelectedNode() const;
 
   using NodeList = QmitkAbstractNodeSelectionWidget::NodeList;
 
 Q_SIGNALS:
   /*
   * @brief A signal that will be emitted if the selected node has changed.
   *
   * @par	nodes		A list of data nodes that are newly selected.
   */
   void CurrentSelectionChanged(QList<mitk::DataNode::Pointer> nodes);
 
 public Q_SLOTS:
   virtual void SetSelectOnlyVisibleNodes(bool selectOnlyVisibleNodes) override;
   virtual void SetCurrentSelection(NodeList selectedNodes) override;
 
 protected:
   mitk::DataNode::Pointer ExtractCurrentValidSelection(const NodeList& nodes) const;
   NodeList CompileEmitSelection() const;
 
   virtual bool eventFilter(QObject *obj, QEvent *ev) override;
   void EditSelection();
   virtual void UpdateInfo() override;
 
   virtual void OnNodePredicateChanged(mitk::NodePredicateBase* newPredicate);
 
   NodeList m_ExternalSelection;
   mitk::DataNode::Pointer m_SelectedNode;
 
   Ui_QmitkSingleNodeSelectionWidget m_Controls;
+  QmitkSelectionButton *m_Btn;
 };
+
 #endif // QmitkSingleNodeSelectionWidget_H
diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.ui b/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.ui
index 72336df586..75d6bf9e1c 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.ui
+++ b/Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.ui
@@ -1,49 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkSingleNodeSelectionWidget</class>
  <widget class="QWidget" name="QmitkSingleNodeSelectionWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>391</width>
     <height>40</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>20</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>40</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="nodeInfo">
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
-     </property>
-     <property name="text">
-      <string>NodeName</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>