diff --git a/SparkleLib/SparkleFetcherBase.cs b/SparkleLib/SparkleFetcherBase.cs
index b906c122..9a9433d9 100755
--- a/SparkleLib/SparkleFetcherBase.cs
+++ b/SparkleLib/SparkleFetcherBase.cs
@@ -134,7 +134,7 @@ namespace SparkleLib {
             
                 bool warn = true;
                 if (RequiredFingerprint != null) {
-                    string host_fingerprint = GetFingerprint (host_key);
+                    string host_fingerprint = DeriveFingerprint (host_key);
 
                     if (host_fingerprint == null || !RequiredFingerprint.Equals (host_fingerprint)) {
                         SparkleLogger.LogInfo ("Auth", "Fingerprint doesn't match");
@@ -292,7 +292,7 @@ namespace SparkleLib {
         }
 
 
-        private string GetFingerprint (string public_key)
+        private string DeriveFingerprint (string public_key)
         {
             try {
                 MD5 md5            = new MD5CryptoServiceProvider ();
@@ -339,7 +339,7 @@ namespace SparkleLib {
             SparkleLogger.LogInfo ("Auth", "Accepted host key for " + host);
 
             if (warn)
-                this.warnings.Add ("The following host key has been accepted:\n" + GetFingerprint (host_key));
+                this.warnings.Add ("The following host key has been accepted:\n" + DeriveFingerprint (host_key));
         }
 
 
diff --git a/SparkleShare/Common/HTML/event-entry.html b/SparkleShare/Common/HTML/event-entry.html
index 255d9ba4..d4f45d9a 100755
--- a/SparkleShare/Common/HTML/event-entry.html
+++ b/SparkleShare/Common/HTML/event-entry.html
@@ -1,5 +1,5 @@
 <div class='event-entry'>
-    <div class='event-avatar' style='background-image: url("<!-- $event-avatar-url -->");'></div>
+    <a href="http://gravatar.com/"><div class='event-avatar' style='background-image: url("<!-- $event-avatar-url -->");'></div></a>
     <div class='event-user-name'><!-- $event-user-name --><span class='event-folder'><!-- $event-folder --></span></div>
     <!-- $event-entry-content -->
     <a class="show">Show all</a>
diff --git a/SparkleShare/Common/HTML/event-log.html b/SparkleShare/Common/HTML/event-log.html
index 9a98cde9..4ddaaa7a 100755
--- a/SparkleShare/Common/HTML/event-log.html
+++ b/SparkleShare/Common/HTML/event-log.html
@@ -116,13 +116,6 @@
                 min-height: 100px;
             }
             
-            .no-buddy-icon {
-                width: 48px;
-                background-image: url('<!-- $no-buddy-icon-background-image -->');
-                background-repeat: no-repeat;
-                background-position: top center; 
-            }
-            
             .event-user-name {
                 font-weight: bold;
             }
diff --git a/SparkleShare/Linux/SparkleAbout.cs b/SparkleShare/Linux/SparkleAbout.cs
index f8f6f31e..64862f68 100755
--- a/SparkleShare/Linux/SparkleAbout.cs
+++ b/SparkleShare/Linux/SparkleAbout.cs
@@ -167,7 +167,7 @@ namespace SparkleShare {
 	
 	public class SparkleLink : EventBox {
 		
-		public SparkleLink (string text, string address)
+		public SparkleLink (string text, string url)
 		{
 			VisibleWindow = false;
 			
@@ -184,10 +184,7 @@ namespace SparkleShare {
 			};
 			
 			ButtonPressEvent += delegate {
-				Process process = new Process ();
-				process.StartInfo.FileName  = "xdg-open";
-				process.StartInfo.Arguments = address;
-				process.Start ();
+				Program.Controller.OpenWebsite (url);
 			};
 			
 			Add (label);
diff --git a/SparkleShare/Linux/SparkleController.cs b/SparkleShare/Linux/SparkleController.cs
index 2a85a4a8..d8c5fa44 100755
--- a/SparkleShare/Linux/SparkleController.cs
+++ b/SparkleShare/Linux/SparkleController.cs
@@ -194,5 +194,11 @@ namespace SparkleShare {
             process.StartInfo.Arguments = "\"" + path + "\"";
             process.Start ();
         }
+
+
+		public override void OpenWebsite (string url)
+		{
+			OpenFile (url);
+		}
     }
 }
diff --git a/SparkleShare/Mac/SparkleAbout.cs b/SparkleShare/Mac/SparkleAbout.cs
index 4f74b58a..dd7cff60 100755
--- a/SparkleShare/Mac/SparkleAbout.cs
+++ b/SparkleShare/Mac/SparkleAbout.cs
@@ -261,7 +261,7 @@ namespace SparkleShare {
             Editable        = false;
             Selectable      = false;
 
-            NSData name_data = NSData.FromString ("<a href='" + url +
+            NSData name_data = NSData.FromString ("<a href='" + this.url +
                 "' style='font-size: 8pt; font-family: \"Lucida Grande\"; color: #739ECF'>" + text + "</a></font>");
 
             NSDictionary name_dictionary       = new NSDictionary();
@@ -278,7 +278,7 @@ namespace SparkleShare {
 
         public override void MouseUp (NSEvent e)
         {
-            NSWorkspace.SharedWorkspace.OpenUrl (url);
+            Program.Controller.OpenWebsite (this.url.ToString ());
         }
 
 
diff --git a/SparkleShare/Mac/SparkleController.cs b/SparkleShare/Mac/SparkleController.cs
index 577b9b2d..7541159b 100755
--- a/SparkleShare/Mac/SparkleController.cs
+++ b/SparkleShare/Mac/SparkleController.cs
@@ -194,13 +194,19 @@ namespace SparkleShare {
 			NSWorkspace.SharedWorkspace.OpenFile (path);
 		}
 		
-
+        
         public override void OpenFile (string path)
         {
             path = Uri.UnescapeDataString (path);
             NSWorkspace.SharedWorkspace.OpenFile (path);
         }
 
+        
+        public override void OpenWebsite (string url)
+        {
+            NSWorkspace.SharedWorkspace.OpenUrl (new NSUrl (url));
+        }
+
 
         private string event_log_html;
 		public override string EventLogHTML
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 656adbd6..d6ddcea2 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -147,9 +147,12 @@ namespace SparkleShare {
 
         // Opens the SparkleShare folder or an (optional) subfolder
         public abstract void OpenFolder (string path);
-
+        
         // Opens a file with the appropriate application
         public abstract void OpenFile (string path);
+        
+        // Opens a file with the appropriate application
+        public abstract void OpenWebsite (string url);
 
 
         private SparkleConfig config;
diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
index 4b7aafe2..2f5a4334 100755
--- a/SparkleShare/SparkleEventLogController.cs
+++ b/SparkleShare/SparkleEventLogController.cs
@@ -217,6 +217,9 @@ namespace SparkleShare {
 			    url.Substring (1, 1).Equals (":")) {
 
                 Program.Controller.OpenFile (url);
+            
+            } else if (url.StartsWith ("http")) {
+                Program.Controller.OpenWebsite (url);
             }
         }
 
diff --git a/SparkleShare/Windows/SparkleAbout.cs b/SparkleShare/Windows/SparkleAbout.cs
index e2fe3298..3a239d4a 100644
--- a/SparkleShare/Windows/SparkleAbout.cs
+++ b/SparkleShare/Windows/SparkleAbout.cs
@@ -171,7 +171,7 @@ namespace SparkleShare {
 
 	public class SparkleLink : Label {
 
-		public SparkleLink (string title, string address)
+		public SparkleLink (string title, string url)
 		{
 			FontSize   = 11;
 			Cursor     = Cursors.Hand;
@@ -193,7 +193,7 @@ namespace SparkleShare {
 			Content = text_block;
 
 			MouseUp += delegate {
-				Process.Start (new ProcessStartInfo (address));
+				Program.Controller.OpenWebsite (url);
 			};            
 		}
 	}
diff --git a/SparkleShare/Windows/SparkleController.cs b/SparkleShare/Windows/SparkleController.cs
index c685fb3f..340b5a5d 100644
--- a/SparkleShare/Windows/SparkleController.cs
+++ b/SparkleShare/Windows/SparkleController.cs
@@ -172,14 +172,20 @@ namespace SparkleShare {
         }
 
 
-        public override void OpenFolder (string path)
-        {
-            Process process             = new Process ();
-            process.StartInfo.FileName  = "explorer";
-            process.StartInfo.Arguments = path;
-            
-            process.Start ();
-        }
+		public override void OpenFolder (string path)
+		{
+			Process process             = new Process ();
+			process.StartInfo.FileName  = "explorer";
+			process.StartInfo.Arguments = path;
+			
+			process.Start ();
+		}
+
+
+		public override void OpenWebsite (string url)
+		{
+			Process.Start (new ProcessStartInfo (url));
+		}
 
 
         public override void Quit ()