diff --git a/modules/gui/pymod/scene/inspector_widget.py b/modules/gui/pymod/scene/inspector_widget.py
index b5c76307b95c0f0caa8efd452acfc9a3a4daa042..7116f8d9891fb85bfae615f3db0a1b741bcee890 100644
--- a/modules/gui/pymod/scene/inspector_widget.py
+++ b/modules/gui/pymod/scene/inspector_widget.py
@@ -35,12 +35,12 @@ class InspectorWidget(ToolBarOptionsWidget):
     ToolBarOptionsWidget.__init__(self, parent)
     app=gui.GostyApp.Instance()
     options = [
-                [InspectorWidget.ICONS_PATH+"render_icon.png",RenderOptionsWidget(self)], 
-                [InspectorWidget.ICONS_PATH+"color_icon.png",ColorOptionsWidget(self)],
-                [InspectorWidget.ICONS_PATH+"tool_icon.png",sip.wrapinstance(app.GetToolOptionsWin().GetSipHandle(),QtGui.QWidget)]
+                [InspectorWidget.ICONS_PATH+"render_icon.png",RenderOptionsWidget(self),None], 
+                [InspectorWidget.ICONS_PATH+"color_icon.png",ColorOptionsWidget(self),None],
+                [InspectorWidget.ICONS_PATH+"tool_icon.png",sip.wrapinstance(app.GetToolOptionsWin().GetSipHandle(),QtGui.QWidget),"Tool Options"]
               ]
     for o in options:
-      ToolBarOptionsWidget.AddWidget(self,o[0], o[1])
+      ToolBarOptionsWidget.AddWidget(self,o[0], o[1], o[2])
     
     self.obs = SceneObserverImpl()
     self.obs.AttachObserver(self)
diff --git a/modules/gui/pymod/scene/toolbar_options_widget.py b/modules/gui/pymod/scene/toolbar_options_widget.py
index 37c967e0c335cfe9f30ee8b8b5884069d203a4f4..006c09b160ba710c83d15679706c1ff20aa4cbf2 100644
--- a/modules/gui/pymod/scene/toolbar_options_widget.py
+++ b/modules/gui/pymod/scene/toolbar_options_widget.py
@@ -67,7 +67,7 @@ class ToolBarOptionsWidget(QtGui.QWidget):
       widget.Update()
   
     
-  def AddWidget(self, ident, widget):
+  def AddWidget(self, ident, widget, text=None):
     """Adds a Widget to this Options Widget.
     
      The Widget must have a identifier. If another Widget has the same identifier,
@@ -75,7 +75,9 @@ class ToolBarOptionsWidget(QtGui.QWidget):
      Returns True, if widget is added. Otherwise it returns False
     """
     if isinstance(widget, QtGui.QWidget) and ident is not None:
-      if hasattr(widget, "GetText"):
+      if text is not None:
+        string = QtCore.QString(text)
+      elif hasattr(widget, "GetText"):
         string = QtCore.QString(widget.GetText())
       else:
         string = QtCore.QString(ident)
@@ -83,6 +85,7 @@ class ToolBarOptionsWidget(QtGui.QWidget):
       self.stackedWidget.addWidget(widget)
       action = self.tool_bar_.addAction(ident)
       action.setIcon(QtGui.QIcon(ident))
+      action.setToolTip(string)
       pair = ident, widget
       action.setData(QtCore.QVariant(pair))
       action.setCheckable(True);