diff --git a/Core/openFunctions.cc b/Core/openFunctions.cc
index 7279d36b08d7508c50403a4397972f8c778d8847..3a28abdbe563089a134f8cc7536ff4217220896e 100644
--- a/Core/openFunctions.cc
+++ b/Core/openFunctions.cc
@@ -463,6 +463,12 @@ void Core::slotObjectOpened ( int _id ) {
   QString filename = object->path() + OpenFlipper::Options::dirSeparator() + object->name();
   BaseObject* object2;
   PluginFunctions::getObject(_id,object2);
+  
+  /**
+    * \todo This is wrong here. If a core adds any object, this has already been called! 
+    * If a plugin does that, its also wrong as this adds the name of the object rather than the filename!
+    *
+    */
   if ( OpenFlipper::Options::gui() )
     coreWidget_->addRecent( filename, object2->dataType() );
 
diff --git a/Icons/cursor_light.png b/Icons/cursor_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..48b09149ad028e0966a358a577bc3fa689dd0e1c
Binary files /dev/null and b/Icons/cursor_light.png differ
diff --git a/widgets/coreWidget/picking.cc b/widgets/coreWidget/picking.cc
index 30918ecc67adbecb0a394490e5fd39beca0cb160..3e9632bd5df85d2005fba904570bcec84f2d48dd 100644
--- a/widgets/coreWidget/picking.cc
+++ b/widgets/coreWidget/picking.cc
@@ -107,9 +107,11 @@ void CoreWidget::setActionMode(const Viewer::ActionMode _am){
     switch ( _am )
     {
       case Viewer::ExamineMode:
-      case Viewer::LightMode:
         cursorPainter_->setCursor(Qt::PointingHandCursor);
         break;
+      case Viewer::LightMode:
+        cursorPainter_->setCursor(QCursor( QPixmap( OpenFlipper::Options::iconDirStr() + QDir::separator() + "cursor_light.png"  )));
+        break;
       case Viewer::PickingMode:
         cursorPainter_->setCursor(Qt::ArrowCursor);
         if (pick_mode_idx_ != -1) {