Index: pitivi/ui/sourcefactories.py
===================================================================
--- pitivi/ui/sourcefactories.py	(révision 896)
+++ pitivi/ui/sourcefactories.py	(copie de travail)
@@ -102,10 +102,18 @@
 
         # Popup Menu
         self.popup = gtk.Menu()
-        additem = gtk.MenuItem(_("Add Sources..."))
-        folderitem = gtk.MenuItem(_("Add Folder of Sources..."))
-        remitem = gtk.MenuItem(_("Remove Sources..."))
-        playmenuitem = gtk.MenuItem(_("Play"))
+        additem = gtk.ImageMenuItem(_("Add Sources..."))
+        image = gtk.Image()
+        image.set_from_stock(gtk.STOCK_ADD, gtk.ICON_SIZE_MENU)
+        additem.set_image(image)
+        
+        folderitem = gtk.ImageMenuItem(_("Add Folder of Sources..."))
+        image = gtk.Image()
+        image.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_MENU)
+        folderitem.set_image(image)
+        
+        remitem = gtk.ImageMenuItem(gtk.STOCK_REMOVE)
+        playmenuitem = gtk.ImageMenuItem(gtk.STOCK_MEDIA_PLAY)
         playmenuitem.connect("activate", self._playButtonClickedCb)
         additem.connect("activate", self._addButtonClickedCb)
         folderitem.connect("activate", self._addFolderButtonClickedCb)
@@ -163,7 +171,7 @@
         button.connect("clicked", self._addButtonClickedCb)
         
         folderbutton = gtk.Button(_("Add Folder"))
-        folderbutton.set_image(gtk.image_new_from_stock(gtk.STOCK_ADD, gtk.ICON_SIZE_BUTTON))
+        folderbutton.set_image(gtk.image_new_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON))
         folderbutton.connect("clicked", self._addFolderButtonClickedCb)
         
         self.errorDialogButton = gtk.ToolButton(gtk.STOCK_DIALOG_WARNING)
@@ -173,7 +181,7 @@
         self.rbut.connect("clicked", self._removeButtonClickedCb)
         self.rbut.set_sensitive(False)
         
-        self.bothbox = gtk.HBox()
+        self.bothbox = gtk.HBox(spacing=6)
         self.bothbox.pack_start(button, expand=False)
         self.bothbox.pack_start(folderbutton, expand=False)
         self.bothbox.pack_start(self.rbut, expand=False)
Index: pitivi/ui/actions.xml
===================================================================
--- pitivi/ui/actions.xml	(révision 896)
+++ pitivi/ui/actions.xml	(copie de travail)
@@ -24,10 +24,12 @@
     <toolitem action="NewProject" />
     <toolitem action="OpenProject" />
     <toolitem action="SaveProject" />
-    <toolitem action="SaveProjectAs" />
+<!--The regular SaveProject button would fulfill the same purpose in most cases
+    <toolitem action="SaveProjectAs" />!-->
     <separator />
-    <toolitem action="ImportSources" />
-    <separator />
+<!-- redundant, already present in the sourcefactories
+     <toolitem action="ImportSources" />
+    <separator /> !-->
     <toolitem action="FullScreen" />
     <toolitem action="AdvancedView" />
   </toolbar>
Index: pitivi/ui/mainwindow.py
===================================================================
--- pitivi/ui/mainwindow.py	(révision 896)
+++ pitivi/ui/mainwindow.py	(copie de travail)
@@ -84,9 +84,8 @@
             ("SaveProjectAs", gtk.STOCK_SAVE_AS, None, None, _("Save the current project"), self._saveProjectAsCb),
             ("ProjectSettings", gtk.STOCK_PROPERTIES, _("Project Settings"), None, _("Edit the project settings"), self._projectSettingsCb),
             ("ImportSources", gtk.STOCK_ADD, _("_Import Sources..."), None, _("Import sources to use"), self._importSourcesCb),
-            ("ImportSourcesFolder", gtk.STOCK_ADD, _("_Import Folder of sources..."), None, _("Import folder of sources to use"), self._importSourcesFolderCb),
+            ("ImportSourcesFolder", gtk.STOCK_OPEN, _("_Import Folder of sources..."), None, _("Import folder of sources to use"), self._importSourcesFolderCb),
             ("Quit", gtk.STOCK_QUIT, None, None, None, self._quitCb),
-            ("FullScreen", gtk.STOCK_FULLSCREEN, None, None, _("View the main window on the whole screen"), self._fullScreenCb),
             ("About", gtk.STOCK_ABOUT, None, None, _("Information about %s") % APPNAME, self._aboutCb),
             ("File", None, _("_File")),
             ("View", None, _("_View")),
@@ -94,7 +93,8 @@
             ]
 	
 	self.toggleactions = [
-            ("AdvancedView", None, _("Advanced Vie_w"), None, _("Switch to advanced view"), self._advancedViewCb)
+            ("FullScreen", gtk.STOCK_FULLSCREEN, None, None, _("View the main window on the whole screen"), self._fullScreenCb),
+            ("AdvancedView", gtk.STOCK_DIALOG_WARNING, _("Advanced Vie_w"), None, _("Switch to advanced view"), self._advancedViewCb)
             ]
 
         self.actiongroup = gtk.ActionGroup("mainwindow")
@@ -125,7 +125,7 @@
 
         self.connect("destroy", self._destroyCb)
 
-        vbox = gtk.VBox(False, 5)
+        vbox = gtk.VBox(False)
         self.add(vbox)
 
         self.menu = self.uimanager.get_widget("/MainMenuBar")
