diff --git a/Modules/QmitkExt/QmitkLineEdit.cpp b/Modules/QmitkExt/QmitkLineEdit.cpp
new file mode 100644
index 0000000000..c3a667d038
--- /dev/null
+++ b/Modules/QmitkExt/QmitkLineEdit.cpp
@@ -0,0 +1,105 @@
+/*===================================================================
+
+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 "QmitkLineEdit.h"
+#include <QApplication>
+
+QmitkLineEdit::QmitkLineEdit(QWidget* parent)
+  : QLineEdit(parent)
+{
+  this->Initialize();
+}
+
+QmitkLineEdit::QmitkLineEdit(const QString& defaultText, QWidget* parent)
+  : QLineEdit(parent),
+    m_DefaultText(defaultText)
+{
+  this->Initialize();
+}
+
+QmitkLineEdit::~QmitkLineEdit()
+{
+}
+
+void QmitkLineEdit::focusInEvent(QFocusEvent* event)
+{
+  QLineEdit::focusInEvent(event);
+  emit this->FocusChanged(true);
+}
+
+void QmitkLineEdit::focusOutEvent(QFocusEvent* event)
+{
+  QLineEdit::focusOutEvent(event);
+  emit this->FocusChanged(false);
+}
+
+QString QmitkLineEdit::GetDefaultText() const
+{
+  return m_DefaultText;
+}
+
+void QmitkLineEdit::Initialize()
+{
+  m_DefaultPalette.setColor(QPalette::Text, QApplication::palette().color(QPalette::Disabled, QPalette::Text));
+
+  this->ShowDefaultText(true);
+
+  connect(this, SIGNAL(FocusChanged(bool)), this, SLOT(OnFocusChanged(bool)));
+  connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(OnTextChanged(const QString&)));
+}
+
+void QmitkLineEdit::OnFocusChanged(bool hasFocus)
+{
+  if (hasFocus)
+  {
+    if (this->text() == m_DefaultText && this->palette() == m_DefaultPalette)
+      this->ShowDefaultText(false);
+  }
+  else
+  {
+    if (this->text().isEmpty())
+      this->ShowDefaultText(true);
+  }
+}
+
+void QmitkLineEdit::OnTextChanged(const QString& text)
+{
+  if (this->palette() == m_DefaultPalette)
+    this->setPalette(QPalette());
+}
+
+void QmitkLineEdit::SetDefaultText(const QString& defaultText)
+{
+  m_DefaultText = defaultText;
+}
+
+void QmitkLineEdit::ShowDefaultText(bool show)
+{
+  this->blockSignals(true);
+
+  if (show)
+  {
+    this->setPalette(m_DefaultPalette);
+    this->setText(m_DefaultText);
+  }
+  else
+  {
+    this->setPalette(QPalette());
+    this->clear();
+  }
+
+  this->blockSignals(false);
+}
diff --git a/Modules/QmitkExt/QmitkLineEdit.h b/Modules/QmitkExt/QmitkLineEdit.h
new file mode 100644
index 0000000000..b0e1f3756a
--- /dev/null
+++ b/Modules/QmitkExt/QmitkLineEdit.h
@@ -0,0 +1,56 @@
+/*===================================================================
+
+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 QmitkLineEdit_h
+#define QmitkLineEdit_h
+
+#include <QmitkExtExports.h>
+#include <QLineEdit>
+
+class QmitkExt_EXPORT QmitkLineEdit : public QLineEdit
+{
+  Q_OBJECT
+  Q_PROPERTY(QString DefaultText READ GetDefaultText WRITE SetDefaultText FINAL)
+
+public:
+  explicit QmitkLineEdit(QWidget* parent = NULL);
+  explicit QmitkLineEdit(const QString& defaultText, QWidget* parent = NULL);
+  ~QmitkLineEdit();
+
+  QString GetDefaultText() const;
+  void SetDefaultText(const QString& defaultText);
+
+protected:
+  void focusInEvent(QFocusEvent* event);
+  void focusOutEvent(QFocusEvent* event);
+
+private:
+  void Initialize();
+  void ShowDefaultText(bool show);
+
+signals:
+  void FocusChanged(bool hasFocus);
+
+private slots:
+  void OnFocusChanged(bool hasFocus);
+  void OnTextChanged(const QString& text);
+
+private:
+  QString m_DefaultText;
+  QPalette m_DefaultPalette;
+};
+
+#endif
diff --git a/Modules/QmitkExt/files.cmake b/Modules/QmitkExt/files.cmake
index dd754e7401..4d39ec9497 100644
--- a/Modules/QmitkExt/files.cmake
+++ b/Modules/QmitkExt/files.cmake
@@ -1,218 +1,222 @@
 set(CPP_FILES
 
  QmitkApplicationBase/QmitkIOUtil.cpp
 
  #QmitkModels/QmitkDataStorageListModel.cpp
  #QmitkModels/QmitkPropertiesTableModel.cpp
  #QmitkModels/QmitkDataStorageTreeModel.cpp
  #QmitkModels/QmitkDataStorageTableModel.cpp
  #QmitkModels/QmitkPropertyDelegate.cpp
  #QmitkModels/QmitkPointListModel.cpp
 
  #QmitkAlgorithmFunctionalityComponent.cpp
  #QmitkBaseAlgorithmComponent.cpp
  QmitkAboutDialog/QmitkAboutDialog.cpp
         #QmitkFunctionalityComponents/QmitkSurfaceCreatorComponent.cpp
               #QmitkFunctionalityComponents/QmitkPixelGreyValueManipulatorComponent.cpp
                 #QmitkFunctionalityComponents/QmitkConnectivityFilterComponent.cpp
             #QmitkFunctionalityComponents/QmitkImageCropperComponent.cpp
               #QmitkFunctionalityComponents/QmitkSeedPointSetComponent.cpp
     #QmitkFunctionalityComponents/QmitkSurfaceTransformerComponent.cpp
 
  QmitkPropertyObservers/QmitkBasePropertyView.cpp
  QmitkPropertyObservers/QmitkBoolPropertyWidget.cpp
  QmitkPropertyObservers/QmitkColorPropertyEditor.cpp
  QmitkPropertyObservers/QmitkColorPropertyView.cpp
  QmitkPropertyObservers/QmitkEnumerationPropertyWidget.cpp
  QmitkPropertyObservers/QmitkNumberPropertyEditor.cpp
  QmitkPropertyObservers/QmitkNumberPropertyView.cpp
  QmitkPropertyObservers/QmitkPropertyViewFactory.cpp
  QmitkPropertyObservers/QmitkStringPropertyEditor.cpp
  QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.cpp
  QmitkPropertyObservers/QmitkStringPropertyView.cpp
  QmitkPropertyObservers/QmitkNumberPropertySlider.cpp
  QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.cpp
 
  qclickablelabel.cpp
  #QmitkAbortEventFilter.cpp
  # QmitkApplicationCursor.cpp
  QmitkCallbackFromGUIThread.cpp
  QmitkEditPointDialog.cpp
  QmitkExtRegisterClasses.cpp
  QmitkFileChooser.cpp
  # QmitkRenderingManager.cpp
  # QmitkRenderingManagerFactory.cpp
  # QmitkRenderWindow.cpp
 
  # QmitkEventAdapter.cpp
 
  QmitkFloatingPointSpanSlider.cpp
  QmitkColorTransferFunctionCanvas.cpp
  QmitkStandardViews.cpp
  QmitkStepperAdapter.cpp
  # QmitkLineEditLevelWindowWidget.cpp
  # mitkSliderLevelWindowWidget.cpp
  # QmitkLevelWindowWidget.cpp
  # QmitkPointListWidget.cpp
  # QmitkPointListView.cpp
  QmitkPiecewiseFunctionCanvas.cpp
  QmitkSliderNavigatorWidget.cpp
  QmitkTransferFunctionCanvas.cpp
  QmitkCrossWidget.cpp
   #QmitkLevelWindowRangeChangeDialog.cpp
 
  #QmitkLevelWindowPresetDefinitionDialog.cpp
  # QmitkLevelWindowWidgetContextMenu.cpp
  QmitkSliceWidget.cpp
  # QmitkStdMultiWidget.cpp
  QmitkTransferFunctionWidget.cpp
  QmitkTransferFunctionGeneratorWidget.cpp
  QmitkSelectableGLWidget.cpp
  # QmitkPropertyListPopup.cpp
  # QmitkMaterialEditor.cpp
  # QmitkMaterialShowcase.cpp
  # QmitkPropertiesTableEditor.cpp
  QmitkPrimitiveMovieNavigatorWidget.cpp
  # QmitkDataStorageComboBox.cpp
 
  QmitkHistogram.cpp
  QmitkHistogramWidget.cpp
 
  QmitkPlotWidget.cpp
  QmitkPlotDialog.cpp
  QmitkPointListModel.cpp
  QmitkPointListView.cpp
  QmitkPointListWidget.cpp
  QmitkPointListViewWidget.cpp
  QmitkCorrespondingPointSetsView.cpp
  QmitkCorrespondingPointSetsModel.cpp
  QmitkCorrespondingPointSetsWidget.cpp
  QmitkVideoBackground.cpp
  QmitkHotkeyLineEdit.cpp
  QmitkBoundingObjectWidget.cpp
 
  QmitkModuleTableModel.cpp
  QmitkModulesDialog.cpp
 
  QmitkHistogramJSWidget.cpp
+
+ QmitkLineEdit.cpp
 )
 
 if( NOT ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION} VERSION_LESS 5.4.0 )
   set(CPP_FILES
     ${CPP_FILES}
     QmitkVtkHistogramWidget.cpp
     QmitkVtkLineProfileWidget.cpp
   )
 endif()
 
 if(NOT APPLE)
 set(CPP_FILES
   ${CPP_FILES}
  QmitkBaseComponent.cpp
  QmitkBaseFunctionalityComponent.cpp
  QmitkFunctionalityComponentContainer.cpp
  QmitkFunctionalityComponents/QmitkThresholdComponent.cpp
 
  )
 endif()
 
 QT4_ADD_RESOURCES(CPP_FILES resources/QmitkResources.qrc)
 
 
 set(MOC_H_FILES
 
 
  QmitkPropertyObservers/QmitkBasePropertyView.h
  QmitkPropertyObservers/QmitkBoolPropertyWidget.h
  QmitkPropertyObservers/QmitkColorPropertyEditor.h
  QmitkPropertyObservers/QmitkColorPropertyView.h
  QmitkPropertyObservers/QmitkEnumerationPropertyWidget.h
  QmitkPropertyObservers/QmitkNumberPropertyEditor.h
  QmitkPropertyObservers/QmitkNumberPropertyView.h
  QmitkPropertyObservers/QmitkStringPropertyEditor.h
  QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.h
  QmitkPropertyObservers/QmitkStringPropertyView.h
  QmitkPropertyObservers/QmitkNumberPropertySlider.h
  QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.h
 
               # QmitkFunctionalityComponents/QmitkSurfaceCreatorComponent.h
                       #QmitkFunctionalityComponents/QmitkPixelGreyValueManipulatorComponent.h
                   # QmitkFunctionalityComponents/QmitkConnectivityFilterComponent.h
             # QmitkFunctionalityComponents/QmitkImageCropperComponent.h
                                 # QmitkFunctionalityComponents/QmitkSeedPointSetComponent.h
                         # QmitkFunctionalityComponents/QmitkSurfaceTransformerComponent.h
 
  qclickablelabel.h
  QmitkCallbackFromGUIThread.h
  QmitkEditPointDialog.h
  #QmitkAlgorithmFunctionalityComponent.h
  #QmitkBaseAlgorithmComponent.h
  QmitkStandardViews.h
  QmitkStepperAdapter.h
  QmitkSliderNavigatorWidget.h
  QmitkSliceWidget.h
  QmitkColorTransferFunctionCanvas.h
  QmitkPiecewiseFunctionCanvas.h
  QmitkTransferFunctionCanvas.h
  QmitkFloatingPointSpanSlider.h
  QmitkCrossWidget.h
  QmitkTransferFunctionWidget.h
  QmitkTransferFunctionGeneratorWidget.h
  # QmitkPropertyListPopup.h
  #QmitkSelectableGLWidget.h
  QmitkPrimitiveMovieNavigatorWidget.h
  QmitkPlotWidget.h
  QmitkPointListModel.h
  QmitkPointListView.h
  QmitkPointListWidget.h
  QmitkPointListViewWidget.h
  QmitkCorrespondingPointSetsView.h
  QmitkCorrespondingPointSetsModel.h
  QmitkCorrespondingPointSetsWidget.h
  QmitkHistogramWidget.h
  QmitkVideoBackground.h
  QmitkFileChooser.h
  QmitkHotkeyLineEdit.h
  QmitkAboutDialog/QmitkAboutDialog.h
  QmitkBoundingObjectWidget.h
  QmitkPlotWidget.h
 
  QmitkHistogramJSWidget.h
+
+ QmitkLineEdit.h
 )
 
 if( NOT ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION} VERSION_LESS 5.4.0 )
   set(MOC_H_FILES
     ${MOC_H_FILES}
     QmitkVtkHistogramWidget.h
     QmitkVtkLineProfileWidget.h
   )
 endif()
 
 if(NOT APPLE)
 set(MOC_H_FILES
   ${MOC_H_FILES}
  QmitkBaseComponent.h
  QmitkBaseFunctionalityComponent.h
  QmitkFunctionalityComponentContainer.h
  QmitkFunctionalityComponents/QmitkThresholdComponent.h
 )
 endif()
 
 set(UI_FILES
   QmitkSliderNavigator.ui
   # QmitkLevelWindowRangeChange.ui
   # QmitkLevelWindowPresetDefinition.ui
   # QmitkLevelWindowWidget.ui
   QmitkSliceWidget.ui
   QmitkTransferFunctionWidget.ui
   QmitkTransferFunctionGeneratorWidget.ui
   QmitkSelectableGLWidget.ui
   QmitkPrimitiveMovieNavigatorWidget.ui
   QmitkFunctionalityComponentContainerControls.ui
   QmitkFunctionalityComponents/QmitkThresholdComponentControls.ui
   QmitkAboutDialog/QmitkAboutDialogGUI.ui
 )
 
 set(QRC_FILES
   QmitkExt.qrc
 )
diff --git a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp
index fdf1a5998e..007d4da891 100644
--- a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp
+++ b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp
@@ -1,388 +1,390 @@
 /*===================================================================
 
 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 "mitkGetPropertyService.h"
 #include "QmitkAddNewPropertyDialog.h"
 #include "QmitkPropertiesPreferencePage.h"
 #include "QmitkPropertyItemDelegate.h"
 #include "QmitkPropertyItemModel.h"
 #include "QmitkPropertyItemSortFilterProxyModel.h"
 #include "QmitkPropertyTreeView.h"
 #include <berryIBerryPreferences.h>
 #include <mitkIPropertyAliases.h>
 #include <mitkIPropertyDescriptions.h>
 #include <QmitkRenderWindow.h>
 #include <QPainter>
 
 const std::string QmitkPropertyTreeView::VIEW_ID = "org.mitk.views.properties";
 
 QmitkPropertyTreeView::QmitkPropertyTreeView()
   : m_Parent(NULL),
     m_PropertyNameChangedTag(0),
     m_PropertyAliases(NULL),
     m_PropertyDescriptions(NULL),
     m_ShowAliasesInDescription(true),
     m_DeveloperMode(false),
     m_ProxyModel(NULL),
     m_Model(NULL),
     m_Delegate(NULL),
     m_Renderer(NULL)
 {
 }
 
 QmitkPropertyTreeView::~QmitkPropertyTreeView()
 {
 }
 
 void QmitkPropertyTreeView::CreateQtPartControl(QWidget* parent)
 {
   m_Parent = parent;
 
   m_Controls.setupUi(parent);
 
   m_Controls.propertyListComboBox->addItem("independent");
 
   mitk::IRenderWindowPart* renderWindowPart = this->GetRenderWindowPart();
 
   if (renderWindowPart != NULL)
   {
     QHash<QString, QmitkRenderWindow*> renderWindows = renderWindowPart->GetQmitkRenderWindows();
 
     Q_FOREACH(QString renderWindow, renderWindows.keys())
     {
       m_Controls.propertyListComboBox->addItem(renderWindow);
     }
   }
 
   m_Controls.newButton->setEnabled(false);
 
+  m_Controls.filterLineEdit->SetDefaultText("Filter");
+
   m_Controls.description->hide();
   m_Controls.propertyListLabel->hide();
   m_Controls.propertyListComboBox->hide();
   m_Controls.newButton->hide();
 
   m_ProxyModel = new QmitkPropertyItemSortFilterProxyModel(m_Controls.treeView);
   m_Model = new QmitkPropertyItemModel(m_ProxyModel);
 
   m_ProxyModel->setSourceModel(m_Model);
   m_ProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
   m_ProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
   m_ProxyModel->setDynamicSortFilter(true);
 
   m_Delegate = new QmitkPropertyItemDelegate(m_Controls.treeView);
 
   m_Controls.treeView->setItemDelegateForColumn(1, m_Delegate);
   m_Controls.treeView->setModel(m_ProxyModel);
   m_Controls.treeView->setColumnWidth(0, 160);
   m_Controls.treeView->sortByColumn(0, Qt::AscendingOrder);
   m_Controls.treeView->setSelectionBehavior(QAbstractItemView::SelectRows);
   m_Controls.treeView->setSelectionMode(QAbstractItemView::SingleSelection);
   m_Controls.treeView->setEditTriggers(QAbstractItemView::SelectedClicked | QAbstractItemView::DoubleClicked);
 
   connect(m_Controls.filterLineEdit, SIGNAL(textChanged(const QString&)), this, SLOT(OnFilterTextChanged(const QString&)));
   connect(m_Controls.propertyListComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnPropertyListChanged(int)));
   connect(m_Controls.newButton, SIGNAL(clicked()), this, SLOT(OnAddNewProperty()));
   connect(m_Controls.treeView->selectionModel(), SIGNAL(currentRowChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(OnCurrentRowChanged(const QModelIndex&, const QModelIndex&)));
   connect(m_Model, SIGNAL(modelReset()), this, SLOT(OnModelReset()));
 }
 
 QString QmitkPropertyTreeView::GetPropertyNameOrAlias(const QModelIndex& index)
 {
   QString propertyName;
 
   if (index.isValid())
   {
     QModelIndex current = index;
 
     while (current.isValid())
     {
       QString name = m_ProxyModel->data(m_ProxyModel->index(current.row(), 0, current.parent())).toString();
 
       propertyName.prepend(propertyName.isEmpty()
         ? name
         : name.append('.'));
 
       current = current.parent();
     }
   }
 
   return propertyName;
 }
 
 void QmitkPropertyTreeView::OnCurrentRowChanged(const QModelIndex& current, const QModelIndex&)
 {
   if (m_PropertyDescriptions != NULL && current.isValid())
   {
     QString name = this->GetPropertyNameOrAlias(current);
 
     if (!name.isEmpty())
     {
       QString alias;
       bool isTrueName = true;
 
       if (m_PropertyAliases != NULL)
       {
         std::string trueName = m_PropertyAliases->GetPropertyName(name.toStdString());
 
         if (trueName.empty() && !m_SelectionClassName.empty())
           trueName = m_PropertyAliases->GetPropertyName(name.toStdString(), m_SelectionClassName);
 
         if (!trueName.empty())
         {
           alias = name;
           name = QString::fromStdString(trueName);
           isTrueName = false;
         }
       }
 
       QString description = QString::fromStdString(m_PropertyDescriptions->GetDescription(name.toStdString()));
       std::vector<std::string> aliases;
 
       if (!isTrueName && m_PropertyAliases != NULL)
       {
         aliases = m_PropertyAliases->GetAliases(name.toStdString(), m_SelectionClassName);
 
         if (aliases.empty() && !m_SelectionClassName.empty())
           aliases = m_PropertyAliases->GetAliases(name.toStdString());
       }
 
       if (!description.isEmpty() || !aliases.empty())
       {
         QString customizedDescription;
 
         if (m_ShowAliasesInDescription && !aliases.empty())
         {
           customizedDescription = "<h3 style=\"margin-bottom:0\">" + name + "</h3>";
 
           std::size_t numAliases = aliases.size();
           std::size_t lastAlias = numAliases - 1;
 
           for (std::size_t i = 0; i < numAliases; ++i)
           {
             customizedDescription += i != lastAlias
               ? "<h5 style=\"margin-top:0;margin-bottom:0\">"
               : "<h5 style=\"margin-top:0;margin-bottom:10px\">";
 
             customizedDescription += QString::fromStdString(aliases[i]) + "</h5>";
           }
         }
         else
         {
           customizedDescription = "<h3 style=\"margin-bottom:10px\">" + name + "</h3>";
         }
 
         if (!description.isEmpty())
           customizedDescription += description;
 
         m_Controls.description->setText(customizedDescription);
         m_Controls.description->show();
 
         return;
       }
     }
   }
 
   m_Controls.description->hide();
 }
 
 void QmitkPropertyTreeView::OnFilterTextChanged(const QString& filter)
 {
   m_ProxyModel->setFilterWildcard(filter);
 
   if (filter.isEmpty())
     m_Controls.treeView->collapseAll();
   else
     m_Controls.treeView->expandAll();
 }
 
 void QmitkPropertyTreeView::OnModelReset()
 {
   m_Controls.description->hide();
 }
 
 void QmitkPropertyTreeView::OnPreferencesChanged(const berry::IBerryPreferences* preferences)
 {
   bool showAliases = preferences->GetBool(QmitkPropertiesPreferencePage::SHOW_ALIASES, true);
   bool showDescriptions = preferences->GetBool(QmitkPropertiesPreferencePage::SHOW_DESCRIPTIONS, true);
   bool showAliasesInDescription = preferences->GetBool(QmitkPropertiesPreferencePage::SHOW_ALIASES_IN_DESCRIPTION, true);
   bool developerMode = preferences->GetBool(QmitkPropertiesPreferencePage::DEVELOPER_MODE, false);
 
   bool updateAliases = showAliases != (m_PropertyAliases != NULL);
   bool updateDescriptions = showDescriptions != (m_PropertyDescriptions != NULL);
   bool updateAliasesInDescription = showAliasesInDescription != m_ShowAliasesInDescription;
   bool updateDeveloperMode = developerMode != m_DeveloperMode;
 
   if (updateAliases)
     m_PropertyAliases = showAliases
       ? mitk::GetPropertyService<mitk::IPropertyAliases>()
       : NULL;
 
   if (updateDescriptions)
     m_PropertyDescriptions = showDescriptions
       ? mitk::GetPropertyService<mitk::IPropertyDescriptions>()
       : NULL;
 
   if (updateAliasesInDescription)
     m_ShowAliasesInDescription = showAliasesInDescription;
 
   if (updateDescriptions || updateAliasesInDescription)
   {
     QModelIndexList selection = m_Controls.treeView->selectionModel()->selectedRows();
 
     if (!selection.isEmpty())
       this->OnCurrentRowChanged(selection[0], selection[0]);
   }
 
   if (updateDeveloperMode)
   {
     m_DeveloperMode = developerMode;
 
     if (!developerMode)
       m_Controls.propertyListComboBox->setCurrentIndex(0);
 
     m_Controls.propertyListLabel->setVisible(developerMode);
     m_Controls.propertyListComboBox->setVisible(developerMode);
     m_Controls.newButton->setVisible(developerMode);
   }
 
   m_Model->OnPreferencesChanged(preferences);
 }
 
 void QmitkPropertyTreeView::OnPropertyNameChanged(const itk::EventObject&)
 {
   mitk::PropertyList* propertyList = m_Model->GetPropertyList();
 
   if (propertyList != NULL)
   {
     mitk::BaseProperty* nameProperty = propertyList->GetProperty("name");
 
     if (nameProperty != NULL)
     {
       std::ostringstream partName;
       partName << "Properties (" << nameProperty->GetValueAsString() << ')';
       this->SetPartName(partName.str());
     }
   }
 }
 
 void QmitkPropertyTreeView::OnSelectionChanged(berry::IWorkbenchPart::Pointer, const QList<mitk::DataNode::Pointer>& nodes)
 {
   mitk::PropertyList* propertyList = m_Model->GetPropertyList();
 
   if (propertyList != NULL)
   {
     mitk::BaseProperty* nameProperty = propertyList->GetProperty("name");
 
     if (nameProperty != NULL)
       nameProperty->RemoveObserver(m_PropertyNameChangedTag);
 
     m_PropertyNameChangedTag = 0;
   }
 
   if (nodes.empty() || nodes.front().IsNull())
   {
     m_SelectedNode = NULL;
 
     this->SetPartName("Properties");
     m_Model->SetPropertyList(NULL);
     m_Delegate->SetPropertyList(NULL);
 
     m_Controls.newButton->setEnabled(false);
   }
   else
   {
     m_SelectedNode = nodes.front();
 
     QString selectionClassName = m_SelectedNode->GetData() != NULL
       ? m_SelectedNode->GetData()->GetNameOfClass()
       : "";
 
     m_SelectionClassName = selectionClassName.toStdString();
     m_Model->SetPropertyList(m_SelectedNode->GetPropertyList(m_Renderer), selectionClassName);
     m_Delegate->SetPropertyList(m_SelectedNode->GetPropertyList(m_Renderer));
     OnPropertyNameChanged(itk::ModifiedEvent());
 
     mitk::BaseProperty* nameProperty = m_SelectedNode->GetProperty("name");
 
     if (nameProperty != NULL)
     {
       itk::ReceptorMemberCommand<QmitkPropertyTreeView>::Pointer command = itk::ReceptorMemberCommand<QmitkPropertyTreeView>::New();
       command->SetCallbackFunction(this, &QmitkPropertyTreeView::OnPropertyNameChanged);
       m_PropertyNameChangedTag = nameProperty->AddObserver(itk::ModifiedEvent(), command);
     }
 
     m_Controls.newButton->setEnabled(true);
   }
 
   if (!m_ProxyModel->filterRegExp().isEmpty())
     m_Controls.treeView->expandAll();
 }
 
 void QmitkPropertyTreeView::SetFocus()
 {
   m_Controls.filterLineEdit->setFocus();
 }
 
 void QmitkPropertyTreeView::RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart)
 {
   if (m_Controls.propertyListComboBox->count() == 1)
   {
     QHash<QString, QmitkRenderWindow*> renderWindows = this->GetRenderWindowPart()->GetQmitkRenderWindows();
 
     Q_FOREACH(QString renderWindow, renderWindows.keys())
     {
       m_Controls.propertyListComboBox->addItem(renderWindow);
     }
   }
 }
 
 void QmitkPropertyTreeView::RenderWindowPartDeactivated(mitk::IRenderWindowPart*)
 {
   if (m_Controls.propertyListComboBox->count() > 1)
   {
     m_Controls.propertyListComboBox->clear();
     m_Controls.propertyListComboBox->addItem("independent");
   }
 }
 
 void QmitkPropertyTreeView::OnPropertyListChanged(int index)
 {
   if (index == -1)
     return;
 
   QString renderer = m_Controls.propertyListComboBox->itemText(index);
 
   m_Renderer = renderer != "independent"
     ? this->GetRenderWindowPart()->GetQmitkRenderWindow(renderer)->GetRenderer()
     : NULL;
 
   QList<mitk::DataNode::Pointer> nodes;
 
   if (m_SelectedNode.IsNotNull())
     nodes << m_SelectedNode;
 
   berry::IWorkbenchPart::Pointer workbenchPart;
 
   this->OnSelectionChanged(workbenchPart, nodes);
 }
 
 void QmitkPropertyTreeView::OnAddNewProperty()
 {
   QmitkAddNewPropertyDialog dialog(m_SelectedNode, m_Renderer, m_Parent);
 
   if (dialog.exec() == QDialog::Accepted)
     this->m_Model->Update();
 }
diff --git a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.ui b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.ui
index d19de2b57a..94bfeceb32 100644
--- a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.ui
+++ b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.ui
@@ -1,134 +1,137 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkPropertyTreeView</class>
  <widget class="QWidget" name="QmitkPropertyTreeView">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>300</width>
     <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="propertyListLabel">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Property List</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QComboBox" name="propertyListComboBox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="newButton">
        <property name="toolTip">
         <string>Add new property</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset resource="../../resources/Properties.qrc">
          <normaloff>:/Properties/new.png</normaloff>:/Properties/new.png</iconset>
        </property>
        <property name="iconSize">
         <size>
          <width>16</width>
          <height>16</height>
         </size>
        </property>
        <property name="flat">
         <bool>false</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QLineEdit" name="filterLineEdit">
-     <property name="placeholderText">
-      <string>Filter</string>
-     </property>
-    </widget>
+    <widget class="QmitkLineEdit" name="filterLineEdit" />
    </item>
    <item>
     <widget class="QTreeView" name="treeView">
      <property name="focusPolicy">
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="styleSheet">
       <string notr="true">::item {
   border-right: 1px solid palette(midlight);
   padding-bottom: 1px;
   padding-top: 1px;
 }
 
 ::item:last {
   border-right: 0;
 }
 
 ::item:selected {
   background: palette(highlight);
   color: palette(highlighted-text);
 }</string>
      </property>
      <property name="horizontalScrollBarPolicy">
       <enum>Qt::ScrollBarAsNeeded</enum>
      </property>
      <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
      <property name="sortingEnabled">
       <bool>true</bool>
      </property>
      <attribute name="headerDefaultSectionSize">
       <number>54</number>
      </attribute>
     </widget>
    </item>
    <item>
     <widget class="QLabel" name="description">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string/>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QmitkLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>QmitkLineEdit.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../../resources/Properties.qrc"/>
  </resources>
  <connections/>
 </ui>