diff --git a/Icons/material_picker.png b/Icons/material_picker.png
new file mode 100644
index 0000000000000000000000000000000000000000..f46c320befdc04cc0ed6958513f8e8429057b12a
Binary files /dev/null and b/Icons/material_picker.png differ
diff --git a/Icons/ruler.png b/Icons/ruler.png
deleted file mode 100644
index e0064d4ce50576ab07fda31b4b5f5d62cfff3ece..0000000000000000000000000000000000000000
Binary files a/Icons/ruler.png and /dev/null differ
diff --git a/MaterialPicker.cc b/MaterialPicker.cc
index 93ca810fb3263ccc692b02ef53647e8a64b0b25c..d93ceb45452128438e92fefd79c495837b4dce68 100644
--- a/MaterialPicker.cc
+++ b/MaterialPicker.cc
@@ -1,7 +1,7 @@
 /*===========================================================================*\
 *                                                                            *
 *                              OpenFlipper                                   *
-*      Copyright (C) 2001-2011 by Computer Graphics Group, RWTH Aachen       *
+*      Copyright (C) 2001-2012 by Computer Graphics Group, RWTH Aachen       *
 *                           www.openflipper.org                              *
 *                                                                            *
 *--------------------------------------------------------------------------- *
@@ -34,9 +34,9 @@
 
 /*===========================================================================*\
 *                                                                            *
-*   $Revision: 14395 $                                                       *
-*   $LastChangedBy: moeller $                                                *
-*   $Date: 2012-04-16 14:46:02 +0200 (Mon, 16 Apr 2012) $                     *
+*   $Revision$                                                       *
+*   $LastChangedBy$                                                *
+*   $Date$                     *
 *                                                                            *
 \*===========================================================================*/
 
@@ -139,7 +139,8 @@ void MaterialPicker::initializePlugin() {
    connect(materialListWidget_, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(editMode(QListWidgetItem*)));
    connect(materialListWidget_,SIGNAL(itemChanged ( QListWidgetItem*)), this, SLOT(assignNewName(QListWidgetItem*)));
 
-   emit addToolbox( tr("Material Picker"), toolBox);
+   QIcon* toolIcon = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"material_picker.png");
+   emit addToolbox( tr("Material Picker"), toolBox, toolIcon);
 }
 
 //------------------------------------------------------------------------------
diff --git a/MaterialPicker.hh b/MaterialPicker.hh
index dcc852053a3852745d7d95408bd809b57dd71e81..25def9b610051be89fc8ec1fb5d5935f6f6f2a07 100644
--- a/MaterialPicker.hh
+++ b/MaterialPicker.hh
@@ -1,7 +1,7 @@
 /*===========================================================================*\
 *                                                                            *
 *                              OpenFlipper                                   *
-*      Copyright (C) 2001-2011 by Computer Graphics Group, RWTH Aachen       *
+*      Copyright (C) 2001-2012 by Computer Graphics Group, RWTH Aachen       *
 *                           www.openflipper.org                              *
 *                                                                            *
 *--------------------------------------------------------------------------- *
@@ -34,9 +34,9 @@
 
 /*===========================================================================*\
 *                                                                            *
-*   $Revision: 14388 $                                                       *
-*   $LastChangedBy: moeller $                                                *
-*   $Date: 2012-04-16 12:55:37 +0200 (Mon, 16 Apr 2012) $                     *
+*   $Revision$                                                       *
+*   $LastChangedBy$                                                *
+*   $Date$                     *
 *                                                                            *
 \*===========================================================================*/
 
@@ -77,7 +77,7 @@ signals:
 
   void updateView();
 
-  void addToolbox(QString _name, QWidget* _widget);
+  void addToolbox( QString  _name  , QWidget* _widget, QIcon* _icon);
 
 public slots: