diff --git a/livesupport/modules/widgets/src/TestWindow.cxx b/livesupport/modules/widgets/src/TestWindow.cxx
index a575aecfe..802ddc3cc 100644
--- a/livesupport/modules/widgets/src/TestWindow.cxx
+++ b/livesupport/modules/widgets/src/TestWindow.cxx
@@ -21,8 +21,8 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
  
-    Author   : $Author: maroy $
-    Version  : $Revision: 1.16 $
+    Author   : $Author: fgerlits $
+    Version  : $Revision: 1.17 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/TestWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -33,6 +33,7 @@
 #include "configure.h"
 #endif
 
+#include <iostream>
 #include <gtkmm/main.h>
 
 #include "LiveSupport/Widgets/WidgetFactory.h"
diff --git a/livesupport/modules/widgets/src/WidgetFactory.cxx b/livesupport/modules/widgets/src/WidgetFactory.cxx
index 1913a607c..43494b445 100644
--- a/livesupport/modules/widgets/src/WidgetFactory.cxx
+++ b/livesupport/modules/widgets/src/WidgetFactory.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.27 $
+    Version  : $Revision: 1.28 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/WidgetFactory.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -406,8 +406,17 @@ WidgetFactory :: loadImage(const std::string    imageName)
 {
     Glib::RefPtr<Gdk::Pixbuf>   image;
 
-    if (!(image = Gdk::Pixbuf::create_from_file(path + imageName))) {
-        throw std::invalid_argument("Missing " + image);
+    bool    success = true;
+    try {
+        image = Gdk::Pixbuf::create_from_file(path + imageName);
+    } catch (Glib::FileError &e) {
+        success = false;
+    } catch (Gdk::PixbufError &e) {
+        success = false;
+    }
+    
+    if (!success || !image) {
+        throw std::invalid_argument("Missing " + imageName);
     }
 
     return image;
diff --git a/livesupport/modules/widgets/var/icons/audioClipIcon.gif b/livesupport/modules/widgets/var/icons/audioClipIcon.gif
new file mode 100755
index 000000000..ebfb2ba02
Binary files /dev/null and b/livesupport/modules/widgets/var/icons/audioClipIcon.gif differ
diff --git a/livesupport/modules/widgets/var/icons/playlistIcon.gif b/livesupport/modules/widgets/var/icons/playlistIcon.gif
new file mode 100755
index 000000000..c38edfff7
Binary files /dev/null and b/livesupport/modules/widgets/var/icons/playlistIcon.gif differ
diff --git a/livesupport/modules/widgets/var/titleImages/cueWindowTitle.png b/livesupport/modules/widgets/var/titleImages/cueWindowTitle.png
new file mode 100644
index 000000000..ecb093792
Binary files /dev/null and b/livesupport/modules/widgets/var/titleImages/cueWindowTitle.png differ
diff --git a/livesupport/modules/widgets/var/titleImages/historyWindowTitle.png b/livesupport/modules/widgets/var/titleImages/historyWindowTitle.png
new file mode 100644
index 000000000..d3691a069
Binary files /dev/null and b/livesupport/modules/widgets/var/titleImages/historyWindowTitle.png differ
diff --git a/livesupport/modules/widgets/var/titleImages/liveModeWindowTitle.png b/livesupport/modules/widgets/var/titleImages/liveModeWindowTitle.png
new file mode 100644
index 000000000..d121f0292
Binary files /dev/null and b/livesupport/modules/widgets/var/titleImages/liveModeWindowTitle.png differ
diff --git a/livesupport/modules/widgets/var/titleImages/playlistsWindowTitle.png b/livesupport/modules/widgets/var/titleImages/playlistsWindowTitle.png
new file mode 100644
index 000000000..21f36de7e
Binary files /dev/null and b/livesupport/modules/widgets/var/titleImages/playlistsWindowTitle.png differ
diff --git a/livesupport/modules/widgets/var/titleImages/schedulerWindowTitle.png b/livesupport/modules/widgets/var/titleImages/schedulerWindowTitle.png
new file mode 100644
index 000000000..f5200d3d9
Binary files /dev/null and b/livesupport/modules/widgets/var/titleImages/schedulerWindowTitle.png differ
diff --git a/livesupport/modules/widgets/var/titleImages/scratchpadWindowTitle.png b/livesupport/modules/widgets/var/titleImages/scratchpadWindowTitle.png
new file mode 100644
index 000000000..095b95969
Binary files /dev/null and b/livesupport/modules/widgets/var/titleImages/scratchpadWindowTitle.png differ
diff --git a/livesupport/modules/widgets/var/titleImages/searchWindowTitle.png b/livesupport/modules/widgets/var/titleImages/searchWindowTitle.png
new file mode 100644
index 000000000..e2fa1a3c7
Binary files /dev/null and b/livesupport/modules/widgets/var/titleImages/searchWindowTitle.png differ
diff --git a/livesupport/modules/widgets/var/titleImages/xfaderWindowTitle.png b/livesupport/modules/widgets/var/titleImages/xfaderWindowTitle.png
new file mode 100644
index 000000000..87895e271
Binary files /dev/null and b/livesupport/modules/widgets/var/titleImages/xfaderWindowTitle.png differ