Index: skins/common/shared.css
===================================================================
--- skins/common/shared.css	(revision 45007)
+++ skins/common/shared.css	(working copy)
@@ -305,3 +305,21 @@
 div.mw-warning-with-logexcerpt ul li {
 	font-size: 90%;
 }
+
+/* Sortable tables stuff */
+.sortheader {
+	margin-right: 13px;
+	position: relative;
+	display: inline-block;
+}
+.sortarrow {
+	position: absolute;
+	right: -13px;
+	top: 50%;
+}
+.sortarrow img {
+	width:12px;
+	height:14px;
+	position: relative;
+	top: -6px;
+}
Index: skins/common/wikibits.js
===================================================================
--- skins/common/wikibits.js	(revision 45007)
+++ skins/common/wikibits.js	(working copy)
@@ -566,14 +566,15 @@
 	for (var i = 0; i < firstRow.cells.length; i++) {
 		var cell = firstRow.cells[i];
 		if ((" "+cell.className+" ").indexOf(" unsortable ") == -1) {
-			cell.innerHTML += '&nbsp;&nbsp;'
-				+ '<a href="#" class="sortheader" '
+			cell.innerHTML = '<div class="sortheader">'
+				+ cell.innerHTML
+				+ '<a href="#" '
 				+ 'onclick="ts_resortTable(this);return false;">'
 				+ '<span class="sortarrow">'
 				+ '<img src="'
 				+ ts_image_path
 				+ ts_image_none
-				+ '" alt="&darr;"/></span></a>';
+				+ '" alt="&darr;"/></span></a></div>';
 		}
 	}
 	if (ts_alternate_row_colors) {
@@ -589,7 +590,7 @@
 	// get the span
 	var span = lnk.getElementsByTagName('span')[0];
 
-	var td = lnk.parentNode;
+	var td = lnk.parentNode.parentNode;
 	var tr = td.parentNode;
 	var column = td.cellIndex;