diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
index 2fe51473..032dfb9e 100644
--- a/extensions/dock/extension.js
+++ b/extensions/dock/extension.js
@@ -662,16 +662,18 @@ function DockIcon(app, dock) {
 DockIcon.prototype = {
     _init : function(app, dock) {
         this.app = app;
-        this.actor = new St.Button({ style_class: 'dock-app',
+        this.actor = new St.Button({ style_class: 'app-well-app',
                                      button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO,
                                      reactive: true,
                                      x_fill: true,
                                      y_fill: true });
         this.actor._delegate = this;
-        this.actor.set_size(dockicon_size, dockicon_size);
+        //this.actor.set_size(dockicon_size, dockicon_size);
 
-        this._icon = this.app.create_icon_texture(dockicon_size);
-        this.actor.set_child(this._icon);
+        this._icon = new AppDisplay.AppIcon(app, { setSizeManually: true,
+                                                   showLabel: false });
+        this.actor.set_child(this._icon.actor);
+        this._icon.setIconSize(dockicon_size);
 
         this.actor.connect('clicked', Lang.bind(this, this._onClicked));
 
diff --git a/extensions/dock/stylesheet.css b/extensions/dock/stylesheet.css
index abdb3de1..0d7e1015 100644
--- a/extensions/dock/stylesheet.css
+++ b/extensions/dock/stylesheet.css
@@ -4,50 +4,6 @@
     border-width: 2px;
     border-color: #5f5f5f;
 }
- /* Panel */
-.dock-app {
-    padding: 4px;
-    width: 70px;
-    height: 70px;        
-    border-radius: 4px;
-    transition-duration: 100;
-}
-
-.dock-app.running {
-    padding: 3px;
-    border: 1px solid #181818;
-    background-gradient-direction: vertical;
-    background-gradient-start: #3d3d3d;
-    background-gradient-end: #181818;
-}
-
-.dock-app.selected {
-    padding: 3px;
-    border: 1px solid #666666;
-}
-
-.dock-app.focused {
-    padding: 3px;
-    border: 1px solid #5f5f5f;
-    background-gradient-direction: vertical;
-    background-gradient-start: rgba(61,61,61,0.8);
-    background-gradient-end: rgba(24,24,24,0.2);
-}
-
-.dock-app:hover {
-    padding: 3px;
-    border: 1px solid #666666;
-    background-gradient-direction: vertical;
-    background-gradient-start: rgba(61,61,61,0.8);
-    background-gradient-end: rgba(24,24,24,0.2);
-    transition-duration: 100;
-}
-
-.dock-app:active {
-    padding: 3px;
-    background-color: #1e1e1e;
-    border: 1px solid #5f5f5f;
-}
 
 .dock-menu {
     font-size: 12px