diff --git a/includes/Linker.php b/includes/Linker.php
index 9a4e6fe0186..880edd36ec2 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1456,10 +1456,10 @@ class Linker {
 	static function tocList( $toc, $lang = false ) {
 		$title = wfMsgExt( 'toc', array( 'language' => $lang, 'escape' ) );
 		return
-		   '<div id="toc" class="toc">'
+		   '<table id="toc" class="toc"><tr><td>'
 		 . '<div id="toctitle"><h2>' . $title . "</h2></div>\n"
 		 . $toc
-		 . "</ul>\n</div>\n";
+		 . "</ul>\n</td></tr></table>\n";
 	}
 
 	/**
diff --git a/skins/common/shared.css b/skins/common/shared.css
index 6b72d09ee58..39f7cd37c94 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -791,14 +791,4 @@ div.floatright, table.floatright, div.floatleft, table.floatleft {
 }
 
 /* bug 12205 */
-#mw-credits a { 
-	unicode-bidi: embed;
-}
-
-/* Standard toc */
-#toc {
-	display: inline-block;
-	/* IE6+7 workaround */
-	zoom: 1;
-	display: inline !ie;
-}
\ No newline at end of file
+#mw-credits a { unicode-bidi: embed; }
\ No newline at end of file
diff --git a/skins/modern/main.css b/skins/modern/main.css
index 001ad8f8e60..d1dc5c07cfc 100644
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -561,6 +561,11 @@ img.thumbborder {
 	border: solid 1px #bbb;
 }
 
+#toc tr, #toc td {
+	margin: 0;
+	padding: 0;
+}
+
 #toctitle {
 	border-bottom: solid 1px #3c78b5;
 	background-color: #ddd;
@@ -587,7 +592,7 @@ img.thumbborder {
 	list-style-type: none;
 	list-style-image: none;
 	margin: 0 1em;
-	padding: 0;
+	padding-left: 0;
 	text-align: left;
 }
 
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 6ab45d9b361..886c47bb555 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -356,7 +356,8 @@ table.small {
 .toc ul {
 	list-style-type: none;
 	list-style-image: none;
-	padding: 0 .4em;
+	margin-left: 0;
+	padding-left: 0;
 	text-align: left;
 }
 #toc ul ul,
diff --git a/skins/vector/screen.css b/skins/vector/screen.css
index d4698f0dc0f..4ecf4260416 100644
--- a/skins/vector/screen.css
+++ b/skins/vector/screen.css
@@ -883,7 +883,8 @@ select {
 .toc ul {
 	list-style-type: none;
 	list-style-image: none;
-	padding: 0 .4em;
+	margin-left: 0;
+	padding-left: 0;
 	text-align: left;
 }
 #toc ul ul,