diff --git a/lib/ice-coder.js b/lib/ice-coder.js
index c7d2ad7..5b03551 100644
--- a/lib/ice-coder.js
+++ b/lib/ice-coder.js
@@ -1675,7 +1675,7 @@ var ICEcoder = {
 	// Show the settings screen
 	settingsScreen: function(hide) {
 		if (!hide) {
-			top.get('mediaContainer').innerHTML = '<iframe src="lib/settings-screen.php" class="whiteGlow" style="width: 970px; height: 600px"></iframe>';
+			top.get('mediaContainer').innerHTML = '<iframe src="lib/settings-screen.php" class="whiteGlow" style="width: 970px; height: 610px"></iframe>';
 		}
 		top.ICEcoder.showHide(hide?'hide':'show',top.get('blackMask'));
 	},
@@ -1699,7 +1699,7 @@ var ICEcoder = {
 	},
 
 	// Update the settings used when we make a change to them
-	useNewSettings: function(themeURL,codeAssist,lockedNav,tagWrapperCommand,visibleTabs,fontSize,lineWrapping,indentWithTabs,indentSize,refreshFM) {
+	useNewSettings: function(themeURL,codeAssist,lockedNav,tagWrapperCommand,autoComplete,visibleTabs,fontSize,lineWrapping,indentWithTabs,indentSize,refreshFM) {
 		var styleNode, strCSS, cMCSS, activeLineBG;
 
 		// Add new stylesheet for selected theme
@@ -1730,6 +1730,7 @@ var ICEcoder = {
 		strCSS = cMCSS.rules ? 'rules' : 'cssRules';
 		cMCSS[strCSS][0].style['fontSize'] = fontSize;
 		cMCSS[strCSS][4].style['border-left-width'] = visibleTabs ? '1px' : '0';
+		cMCSS[strCSS][4].style['margin-left'] = visibleTabs ? '-1px' : '0';
 		cMCSS[strCSS][2].style.cssText = "background-color: " + activeLineBG + " !important";
 
 		top.ICEcoder.lineWrapping = lineWrapping;
@@ -1746,6 +1747,10 @@ var ICEcoder = {
 			top.ICEcoder.tagWrapperCommand = tagWrapperCommand;
 		}
 
+		if (autoComplete != top.ICEcoder.autoComplete) {
+			top.ICEcoder.autoComplete = autoComplete;
+		}
+
 		// Finally, refresh the file manager if we need to
 		if (refreshFM) {top.ICEcoder.refreshFileManager()};
 	},