diff --git a/extensions/configuration-editing/src/extension.ts b/extensions/configuration-editing/src/extension.ts
index bfc412dc6148..bb9175fed330 100644
--- a/extensions/configuration-editing/src/extension.ts
+++ b/extensions/configuration-editing/src/extension.ts
@@ -13,8 +13,6 @@ export function activate(context) {
 	//keybindings.json command-suggestions
 	context.subscriptions.push(registerKeybindingsCompletions());
 
-	//settings.json command-suggestions
-	context.subscriptions.push(registerSettingsCompletions());
 }
 
 function registerKeybindingsCompletions() : vscode.Disposable {
@@ -33,31 +31,6 @@ function registerKeybindingsCompletions() : vscode.Disposable {
 	});
 }
 
-function registerSettingsCompletions() : vscode.Disposable {
-	return vscode.languages.registerCompletionItemProvider({ language: 'json', pattern: '**/settings.json' }, {
-
-		provideCompletionItems(document, position, token) {
-			const location = getLocation(document.getText(), document.offsetAt(position));
-			if (!location.isAtPropertyKey && location.path[0] === 'files.iconTheme') {
-				let result: vscode.CompletionItem[] = [];
-				const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
-
-				vscode.extensions.all.forEach(e => {
-					let fileIconsContributions = e.packageJSON.contributes && e.packageJSON.contributes.fileIcons;
-					if (Array.isArray(fileIconsContributions)) {
-						fileIconsContributions.forEach(contribution => {
-							if (contribution.id !== 'vs-standard') {
-								result.push(newCompletionItem(contribution.id, range, contribution.label));
-							}
-						});
-					}
-				});
-				return result;
-			}
-		}
-	});
-}
-
 function newCompletionItem(text: string, range: vscode.Range, documentation?: string) {
 	const item = new vscode.CompletionItem(JSON.stringify(text));
 	item.kind = vscode.CompletionItemKind.Value;
diff --git a/src/vs/workbench/services/themes/electron-browser/themeService.ts b/src/vs/workbench/services/themes/electron-browser/themeService.ts
index 3c42cb1da366..29b67aed51bc 100644
--- a/src/vs/workbench/services/themes/electron-browser/themeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/themeService.ts
@@ -17,7 +17,6 @@ import {IWindowService} from 'vs/workbench/services/window/electron-browser/wind
 import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage';
 import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
 import {Registry} from 'vs/platform/platform';
-import {IConfigurationRegistry, Extensions} from 'vs/platform/configuration/common/configurationRegistry';
 import {Extensions as JSONExtensions, IJSONContributionRegistry} from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import {IJSONSchema} from 'vs/base/common/jsonSchema';
 
@@ -817,19 +816,6 @@ class Color {
 			b: 255 - this.parsed.b,
 			a : this.parsed.a
 		});
-	}
-}
-
-var configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Configuration);
-configurationRegistry.registerConfiguration({
-	'id': 'files',
-	'order': 9.01,
-	'type': 'object',
-	'properties': {
-		'files.iconTheme': {
-			'type': 'string',
-			'default': DEFAULT_FILE_ICONS,
-			'description': nls.localize('settings.icons.dark', 'The active file icons. Use \'explorer.showFileIcons\' to enable file icons in the explorer'),
 		}
 	}
 });