diff --git a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
index 80e2eae62a08332764abad68c3bd461509fabb14..6b334ce36897afa093f2b5edecf1ba2b69565cd6 100644
--- a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
+++ b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
@@ -110,6 +110,11 @@
 	line-height: initial;
 }
 
+.settings-editor > .settings-body > .settings-list-container .monaco-list-row .setting-item-title .setting-item-overrides {
+	opacity: 0.5;
+	margin-left: 10px;
+}
+
 .settings-editor > .settings-body > .settings-list-container .monaco-list-row .setting-item-label {
 	font-size: 15px;
 	font-weight: bold;
@@ -124,7 +129,7 @@
 }
 
 .settings-editor > .settings-body > .settings-list-container .monaco-list-row .setting-item-description {
-	opacity: 0.6;
+	opacity: 0.7;
 	margin-top: 5px;
 	height: 36px;
 	overflow: hidden;
@@ -168,12 +173,6 @@
 	visibility: visible;
 }
 
-.settings-editor > .settings-body > .settings-list-container .monaco-list-row .setting-item-overrides {
-	opacity: 0.6;
-	margin-top: 5px;
-	text-align: center;
-}
-
 .settings-editor > .settings-body > .settings-list-container .monaco-list-row.all-settings {
 	display: flex;
 }
diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
index da0f634da141c72da23d9e8751716fc7f5164062..444904fc12c68302f177063837ef93f83e8a1ea7 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
@@ -192,7 +192,7 @@ export class SettingsEditor2 extends BaseEditor {
 		}));
 		this._register(this.searchWidget.onDidChange(() => this.onInputChanged()));
 
-		const headerControlsContainer = DOM.append(this.headerContainer, $('div.settings-header-controls'));
+		const headerControlsContainer = DOM.append(this.headerContainer, $('.settings-header-controls'));
 		const targetWidgetContainer = DOM.append(headerControlsContainer, $('.settings-target-container'));
 		this.settingsTargetsWidget = this._register(this.instantiationService.createInstance(SettingsTargetsWidget, targetWidgetContainer));
 		this.settingsTargetsWidget.settingsTarget = ConfigurationTarget.USER;
@@ -542,7 +542,7 @@ interface ISettingItemTemplate {
 
 	containerElement: HTMLElement;
 	labelElement: HTMLElement;
-	keyElement: HTMLElement;
+	// keyElement: HTMLElement;
 	descriptionElement: HTMLElement;
 	valueElement: HTMLElement;
 	overridesElement: HTMLElement;
@@ -581,24 +581,24 @@ class SettingItemRenderer implements IRenderer<ISettingItemEntry, ISettingItemTe
 	renderTemplate(parent: HTMLElement): ISettingItemTemplate {
 		DOM.addClass(parent, 'setting-item');
 
-		const itemContainer = DOM.append(parent, $('div.setting-item-container'));
+		const itemContainer = DOM.append(parent, $('.setting-item-container'));
 		const leftElement = DOM.append(itemContainer, $('.setting-item-left'));
 		const rightElement = DOM.append(itemContainer, $('.setting-item-right'));
 
-		const titleElement = DOM.append(leftElement, $('div.setting-item-title'));
+		const titleElement = DOM.append(leftElement, $('.setting-item-title'));
 		const labelElement = DOM.append(titleElement, $('span.setting-item-label'));
-		const keyElement = DOM.append(titleElement, $('span.setting-item-key'));
-		const descriptionElement = DOM.append(leftElement, $('div.setting-item-description'));
+		// const keyElement = DOM.append(titleElement, $('span.setting-item-key'));
+		const overridesElement = DOM.append(titleElement, $('span.setting-item-overrides'));
+		const descriptionElement = DOM.append(leftElement, $('.setting-item-description'));
 
-		const valueElement = DOM.append(rightElement, $('div.setting-item-value'));
-		const overridesElement = DOM.append(rightElement, $('div.setting-item-overrides'));
+		const valueElement = DOM.append(rightElement, $('.setting-item-value'));
 
 		return {
 			parent: parent,
 			toDispose: [],
 
 			containerElement: itemContainer,
-			keyElement,
+			// keyElement,
 			labelElement,
 			descriptionElement,
 			valueElement,
@@ -609,8 +609,9 @@ class SettingItemRenderer implements IRenderer<ISettingItemEntry, ISettingItemTe
 	renderElement(entry: ISettingItemEntry, index: number, template: ISettingItemTemplate): void {
 		DOM.toggleClass(template.parent, 'odd', index % 2 === 1);
 
-		template.keyElement.textContent = entry.key;
+		// template.keyElement.textContent = entry.key;
 		template.labelElement.textContent = settingKeyToLabel(entry.key);
+		template.labelElement.title = entry.key;
 		template.descriptionElement.textContent = entry.description;
 
 		DOM.toggleClass(template.parent, 'is-configured', entry.isConfigured);
@@ -627,7 +628,8 @@ class SettingItemRenderer implements IRenderer<ISettingItemEntry, ISettingItemTe
 		}));
 		template.toDispose.push(resetButton);
 
-		template.overridesElement.textContent = entry.overriddenScopeList.length ? 'Also configured in: ' + entry.overriddenScopeList.join(', ') :
+		const alsoConfiguredInLabel = localize('alsoConfiguredIn', "Also configured in:");
+		template.overridesElement.textContent = entry.overriddenScopeList.length ? `(${alsoConfiguredInLabel} ${entry.overriddenScopeList.join(', ')})` :
 			'';
 	}