diff --git a/src/sql/base/browser/ui/button/button.ts b/src/sql/base/browser/ui/button/button.ts
index 515c18f21c..109e4c8c1d 100644
--- a/src/sql/base/browser/ui/button/button.ts
+++ b/src/sql/base/browser/ui/button/button.ts
@@ -7,7 +7,6 @@
 import { Button as vsButton, IButtonOptions, IButtonStyles as vsIButtonStyles } from 'vs/base/browser/ui/button/button';
 import * as DOM from 'vs/base/browser/dom';
 import { Color } from 'vs/base/common/color';
-import { Builder } from 'sql/base/browser/builder';
 
 export interface IButtonStyles extends vsIButtonStyles {
 	buttonFocusOutline?: Color;
@@ -15,29 +14,26 @@ export interface IButtonStyles extends vsIButtonStyles {
 
 export class Button extends vsButton {
 	private buttonFocusOutline: Color;
-	private $el: Builder;
 
 	constructor(container: HTMLElement, options?: IButtonOptions) {
 		super(container, options);
 		this.buttonFocusOutline = null;
-		this.$el = new Builder(this.element);
 
-		this.$el.on(DOM.EventType.FOCUS, (e) => {
-			this.$el.style('outline-color', this.buttonFocusOutline ? this.buttonFocusOutline.toString() : null);
-			this.$el.style('outline-width', '1px');
-		});
+		this._register(DOM.addDisposableListener(this.element, DOM.EventType.FOCUS, () => {
+			this.element.style.outlineColor = this.buttonFocusOutline ? this.buttonFocusOutline.toString() : null;
+			this.element.style.outlineWidth = '1px';
+		}));
 
-		this.$el.on(DOM.EventType.MOUSE_DOWN, (e) => {
-			const mouseEvent = e as MouseEvent;
-			if (!this.$el.hasClass('disabled') && mouseEvent.button === 0) {
-				this.$el.addClass('active');
+		this._register(DOM.addDisposableListener(this.element, DOM.EventType.MOUSE_DOWN, e => {
+			if (!DOM.hasClass(this.element, 'disabled') && e.button === 0) {
+				DOM.addClass(this.element, 'active');
 			}
-		});
+		}));
 
-		this.$el.on([DOM.EventType.MOUSE_UP], (e) => {
+		this._register(DOM.addDisposableListener(this.element, DOM.EventType.MOUSE_UP, e => {
 			DOM.EventHelper.stop(e);
-			this.$el.removeClass('active');
-		});
+			DOM.removeClass(this.element, 'active');
+		}));
 	}
 
 	public style(styles: IButtonStyles): void {
@@ -46,14 +42,14 @@ export class Button extends vsButton {
 	}
 
 	public set title(value: string) {
-		this.$el.title(value);
+		this.element.title = value;
 	}
 
 	public setHeight(value: string) {
-		this.$el.style('height', value);
+		this.element.style.height = value;
 	}
 
 	public setWidth(value: string) {
-		this.$el.style('width', value);
+		this.element.style.width = value;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index 0af28adc55..ed74ce74ab 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -32,8 +32,7 @@ const defaultOptions: IButtonStyles = {
 
 export class Button extends Disposable {
 
-	// {{SQL CARBON EDIT}} -- changed access modifier to protected
-	protected _element: HTMLElement;
+	private _element: HTMLElement;
 	private options: IButtonOptions;
 
 	private buttonBackground: Color | undefined;