diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts
index f81ecfa145f9532081ab2b4c99ab55b36bf964a1..f387c1308e820d881c021f34f29af568a20e8d0b 100644
--- a/src/vs/editor/browser/widget/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditorWidget.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/editor';
-import 'vs/css!./media/tokens';
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
diff --git a/src/vs/editor/browser/widget/media/tokens.css b/src/vs/editor/browser/widget/media/tokens.css
deleted file mode 100644
index 3b0784d077acf6755c433b459147d2e0abec1426..0000000000000000000000000000000000000000
--- a/src/vs/editor/browser/widget/media/tokens.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.monaco-editor .vs-whitespace {
-	display:inline-block;
-}
-
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index bbb9b39cb8ccee810d89847dfba8e9db2a33a62e..5298d234529bc80d18db5ab1ef05527bf849ed67 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -783,7 +783,7 @@ function _renderLine(input: ResolvedRenderLineInput, sb: IStringBuilder): Render
 			if (!fontIsMonospace) {
 				const partIsOnlyWhitespace = (partType === 'vs-whitespace');
 				if (partIsOnlyWhitespace || !containsForeignElements) {
-					sb.appendASCIIString(' style="width:');
+					sb.appendASCIIString(' style="display:inline-block;width:');
 					sb.appendASCIIString(String(spaceWidth * partContentCnt));
 					sb.appendASCIIString('px"');
 				}