diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 9b5403b0..eec58872 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -244,7 +244,7 @@ namespace SparkleShare {
 		
 		public void UIHasLoaded ()
 		{
-			if (FirstRun)
+			//if (FirstRun)
 	        	ShowSetupWindow (PageType.Setup);
 		}
 
diff --git a/SparkleShare/Windows/SparkleSetup.cs b/SparkleShare/Windows/SparkleSetup.cs
index fa006d49..d51bb8d0 100644
--- a/SparkleShare/Windows/SparkleSetup.cs
+++ b/SparkleShare/Windows/SparkleSetup.cs
@@ -430,6 +430,18 @@ namespace SparkleShare {
                                     "that will keep track of your projects.";
     
 							
+								WPF.Image slide_image = new WPF.Image () {
+									Width  = 350,
+									Height = 200
+								};
+							
+								slide_image.Source = SparkleUIHelpers.GetBitmap ("tutorial-slide-1-windows");
+							
+							
+								ContentCanvas.Children.Add (slide_image);
+								Canvas.SetLeft (slide_image, 215);
+								Canvas.SetTop (slide_image, 130);
+							
                                 Button skip_tutorial_button = new Button () {
                                     Content = "Skip tutorial"
                                 };
@@ -529,6 +541,10 @@ namespace SparkleShare {
 								
                                 Buttons.Add (finish_button);
 								
+								
+								check_box.Click += delegate {
+									Controller.StartupItemChanged (check_box.IsChecked.Value);
+								};
 							
 								finish_button.Click += delegate {
 									Controller.TutorialPageCompleted ();
diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj
index a456f9b9..145b8174 100644
--- a/SparkleShare/Windows/SparkleShare.csproj
+++ b/SparkleShare/Windows/SparkleShare.csproj
@@ -223,6 +223,9 @@
       <Link>plugins\bitbucket.png</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\process-syncing-sparkleshare-mac-i.png">
+      <Link>Pixmaps\process-syncing-sparkleshare-mac-i.png</Link>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Icons.tt">
diff --git a/SparkleShare/Windows/SparkleStatusIcon.cs b/SparkleShare/Windows/SparkleStatusIcon.cs
index bf62a715..3cc268df 100644
--- a/SparkleShare/Windows/SparkleStatusIcon.cs
+++ b/SparkleShare/Windows/SparkleStatusIcon.cs
@@ -78,7 +78,6 @@ namespace SparkleShare {
                 });
 			};
 			
-			
             Program.Controller.FolderListChanged += delegate {
                 Dispatcher.Invoke ((Action) delegate {
                     SetNormalState ();
@@ -177,7 +176,6 @@ namespace SparkleShare {
 			MenuItem folder_item = new MenuItem () {
 				Header = " SparkleShare"//,
 				,Icon   = i
-
 			};
 		
 				folder_item.Click += delegate {