diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs
index 37996d96..65f39a88 100755
--- a/SparkleShare/Mac/SparkleSetup.cs
+++ b/SparkleShare/Mac/SparkleSetup.cs
@@ -295,7 +295,7 @@ namespace SparkleShare {
 
                     case PageType.Syncing: {
 
-                        Header      = "Syncing folder ‘" + Controller.SyncingFolder + "’…";
+                        Header      = "Adding project ‘" + Controller.SyncingFolder + "’…";
                         Description = "This may take a while.\n" +
                                       "Are you sure it’s not coffee o'clock?";
 
@@ -357,8 +357,8 @@ namespace SparkleShare {
 
                     case PageType.Finished: {
 
-                        Header      = "Folder synced succesfully!";
-                        Description = "Now you can access the synced files from " +
+                        Header      = "Project succesfully added!";
+                        Description = "Now you can access the files from " +
                                       "‘" + Controller.SyncingFolder + "’ in " +
                                       "your SparkleShare folder.";
 
diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs
index 7b0d9a8d..87b67df1 100755
--- a/SparkleShare/Mac/SparkleStatusIcon.cs
+++ b/SparkleShare/Mac/SparkleStatusIcon.cs
@@ -66,7 +66,11 @@ namespace SparkleShare {
                 StatusItem = NSStatusBar.SystemStatusBar.CreateStatusItem (28);
                 StatusItem.HighlightMode = true;
     
-                StateText = _("Up to date") + " (" + Controller.FolderSize + ")";
+                if (Controller.Folders.Length == 0)
+                    StateText = _("Welcome to SparkleShare!");
+                else
+                    StateText = _("Up to date") + " (" + Controller.FolderSize + ")";
+
                 CreateMenu ();
     
                 Menu.Delegate = new SparkleStatusIconMenuDelegate ();
@@ -79,7 +83,7 @@ namespace SparkleShare {
                         case IconState.Idle:
     
                             Animation.Stop ();
-
+                            Console.WriteLine (Controller.Folders.Length);
                             if (Controller.Folders.Length == 0)
                                 StateText = _("Welcome to SparkleShare!");
                             else
@@ -179,7 +183,7 @@ namespace SparkleShare {
                         FolderMenuItems = new NSMenuItem [1];
     
                         FolderMenuItems [0] = new NSMenuItem () {
-                            Title = "No Remote Folders Yet"
+                            Title = "No projects yet"
                         };
                     }
     
diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs
index 3696cd10..3983733d 100755
--- a/SparkleShare/SparkleSetup.cs
+++ b/SparkleShare/SparkleSetup.cs
@@ -118,7 +118,7 @@ namespace SparkleShare {
 
                     case PageType.Add: {
 
-                        Header = _("Where is your remote folder?");
+                        Header = _("Where is your project?");
 
                         Table = new Table (6, 2, false) {
                             RowSpacing = 0
@@ -255,7 +255,7 @@ namespace SparkleShare {
 
 
                             // Sync button
-                            SyncButton = new Button (_("Sync"));
+                            SyncButton = new Button (_("Add"));
 
                             SyncButton.Clicked += delegate {
                                 string server         = ServerEntry.Text;
@@ -283,7 +283,7 @@ namespace SparkleShare {
 
                     case PageType.Syncing: {
 
-                        Header      = String.Format (_("Syncing folder ‘{0}’…"), Controller.SyncingFolder);
+                        Header      = String.Format (_("Adding project ‘{0}’…"), Controller.SyncingFolder);
                         Description = _("This may take a while." + Environment.NewLine) +
                                       _("Are you sure it’s not coffee o'clock?");
 
@@ -395,8 +395,8 @@ namespace SparkleShare {
                             SparkleUI.Bubbles.Controller.ShowBubble (title, subtext, null);
                         }
 
-                        Header      = _("Folder synced successfully!");
-                        Description = _("Access the synced files from your SparkleShare folder.");
+                        Header      = _("Project successfully added!");
+                        Description = _("Access the files from your SparkleShare folder.");
 
                         // A button that opens the synced folder
                         Button open_folder_button = new Button (_("Open Folder"));
diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index cd0e8afc..b490d66d 100755
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -71,7 +71,10 @@ namespace SparkleShare {
             this.status_icon.Pixbuf = AnimationFrames [0];
             #endif
 
-            StateText = _("Up to date") + " (" + Controller.FolderSize + ")";
+            if (Controller.Folders.Length == 0)
+                StateText = _("Welcome to SparkleShare!");
+            else
+                StateText = _("Up to date") + " (" + Controller.FolderSize + ")";
 
             CreateMenu ();
 
@@ -222,7 +225,7 @@ namespace SparkleShare {
                     }
 
                 } else {
-                    MenuItem no_folders_item = new MenuItem (_("No Remote Folders Yet")) {
+                    MenuItem no_folders_item = new MenuItem (_("No projects yet")) {
                         Sensitive   = false
                     };
 
@@ -232,7 +235,7 @@ namespace SparkleShare {
                 Menu.Add (new SeparatorMenuItem ());
 
                 // Opens the wizard to add a new remote folder
-                MenuItem sync_item = new MenuItem (_("Add Remote Folder…"));
+                MenuItem sync_item = new MenuItem (_("Add Project…"));
             
                 if (Program.Controller.FirstRun)
                     sync_item.Sensitive = false;