diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 48d20d9..6e239b0 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1625
\ No newline at end of file
+1633
\ No newline at end of file
diff --git a/Common/BBCodes/helpers/UrlProcessor.cs b/Common/BBCodes/helpers/UrlProcessor.cs
index 3c98e0c..c88d74d 100644
--- a/Common/BBCodes/helpers/UrlProcessor.cs
+++ b/Common/BBCodes/helpers/UrlProcessor.cs
@@ -71,7 +71,7 @@ namespace FLocal.Common.BBCodes {
 			}
 			if(isExternal) {
 				if(title == null) {
-					title = url;
+					title = Safe(url);
 				}
 			} else {
 				var linkInfo = URL.UrlManager.Parse(url, new System.Collections.Specialized.NameValueCollection(), true);
@@ -80,13 +80,10 @@ namespace FLocal.Common.BBCodes {
 				}
 				url = linkInfo.canonicalFull;
 				if(title == null) {
-					title = linkInfo.title;
+					title = Safe(linkInfo.title);
 				}
 			}
-			string result = "<a href=\"" + url + "\">" + Safe(title) + "</a>";
-			if(isExternal) {
-				result += "<img src=\"/static/images/external.png\" border=\"0\"/>";
-			}
+			string result = String.Format("<a href=\"{0}\"{1}>{2}</a>", url, (isExternal ? " class=\"external\"" : ""), title);
 			return result;
 		}
 
diff --git a/static/css/modern/global.css b/static/css/modern/global.css
index 7f3b09a..0634e27 100644
--- a/static/css/modern/global.css
+++ b/static/css/modern/global.css
@@ -167,3 +167,9 @@ BLOCKQUOTE BR {FONT-SIZE:1px}
 	font-size:0.8em;
 	width:16.25em;
 }
+a.external {
+	padding-right:13px;
+	background-image:url(/static/images/external.png);
+	background-repeat:no-repeat;
+	background-position:right center;
+}