diff --git a/README.md b/README.md
index 421d1d4..bbb763b 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,6 @@ to install the extension in your home directory. A Shell reload is required <cod
 - allow tray items to be reordered
 - reorder "activities" and open apps view" buttons when both visible
 - replace activities (overview) button text with an icon
-- assign middle click behavior
-- assign left click behavior when multiple windows of same app is open
 - allow moving running apps indicator to above icons
 - configure icon spacing
 - allow moving overview hotspot to bottom left
diff --git a/Settings.ui b/Settings.ui
index bc94bf9..b1a2d6b 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -77,6 +77,7 @@
                           <item translatable="yes">Minimize window</item>
                           <item translatable="yes">Launch new instance</item>
                           <item translatable="yes">Cycle through windows</item>
+                          <item translatable="yes">Cycle windows + minimize</item>
                           <item translatable="yes">Quit</item>
                         </items>
                       </object>
@@ -145,7 +146,8 @@
                           <item translatable="yes">Raise window</item>
                           <item translatable="yes">Minimize window</item>
                           <item translatable="yes">Launch new instance</item>
-                          <item translatable="yes">Cycle through windows</item>
+                          <item translatable="yes">Cycle windows</item>
+                          <item translatable="yes">Cycle windows + minimize</item>
                           <item translatable="yes">Quit</item>
                         </items>
                       </object>
@@ -215,6 +217,7 @@
                           <item translatable="yes">Minimize window</item>
                           <item translatable="yes">Launch new instance</item>
                           <item translatable="yes">Cycle through windows</item>
+                          <item translatable="yes">Cycle windows + minimize</item>
                           <item translatable="yes">Quit</item>
                         </items>
                       </object>
@@ -668,6 +671,7 @@
                                   <item translatable="yes">Minimize</item>
                                   <item translatable="yes">Launch new instance</item>
                                   <item translatable="yes">Cycle through windows</item>
+                                  <item translatable="yes">Cycle windows + minimize</item>
                                 </items>
                               </object>
                               <packing>
@@ -805,7 +809,7 @@
                             <property name="adjustment">leftbox_size_adjustment</property>
                             <property name="round_digits">0</property>
                             <property name="digits">0</property>
-                            <property name="value_pos">right</property>                            
+                            <property name="value_pos">right</property>
                             <signal name="format-value" handler="leftbox_size_scale_format_value_cb" swapped="no"/>
                             <signal name="value-changed" handler="leftbox_size_scale_value_changed_cb" swapped="no"/>
                           </object>
diff --git a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
index 55cc7bf..03b1b1f 100644
--- a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
+++ b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
@@ -5,7 +5,8 @@
     <value value='1' nick='minimize'/>
     <value value='2' nick='launch'/>
     <value value='3' nick='cycle-windows'/>
-    <value value='4' nick='quit'/>
+    <value value='4' nick='cycle-windows-min'/>
+    <value value='5' nick='quit'/>
   </enum>
   <!-- this is mean to Match StSide. LEFT and RIGHT actual position in reversed in
        rtl languages -->
diff --git a/taskbar.js b/taskbar.js
index af4c805..4bc0c93 100644
--- a/taskbar.js
+++ b/taskbar.js
@@ -57,6 +57,15 @@ let LABEL_GAP = 5;
 let RUNNING_INDICATOR_SIZE = 3;
 let HFADE_WIDTH = 48;
 
+const clickAction = {
+    SKIP: 0,
+    MINIMIZE: 1,
+    LAUNCH: 2,
+    CYCLE_WINDOWS: 3,
+    CYCLE_WINDOWS_MIN: 4,
+    QUIT: 5
+};
+
 function getPosition() {
     return Main.layoutManager.panelBox.anchor_y == 0 ? St.Side.TOP : St.Side.BOTTOM;
 }
@@ -476,7 +485,7 @@ const taskbar = new Lang.Class({
     },
 
     _createAppItem: function(app) {
-        let appIcon = new taskbarAppIcon(app,
+        let appIcon = new taskbarAppIcon(this._dtpSettings, app,
                                              { setSizeManually: true,
                                                showLabel: false });
         if (appIcon._draggable) {
@@ -1151,8 +1160,10 @@ const taskbarAppIcon = new Lang.Class({
     Name: 'taskbar.AppIcon',
     Extends: AppDisplay.AppIcon,
 
-    _init: function(app, iconParams, onActivateOverride) {
-
+    _init: function(settings, app, iconParams, onActivateOverride) {
+        
+        // a prefix is required to avoid conflicting with the parent class variable
+        this._dtpSettings = settings;
         this._nWindows = 0;
 
         this.parent(app, iconParams, onActivateOverride);
@@ -1330,36 +1341,103 @@ const taskbarAppIcon = new Lang.Class({
 
         let event = Clutter.get_current_event();
         let modifiers = event ? event.get_state() : 0;
-        let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK &&
-                            this.app.state == Shell.AppState.RUNNING ||
-                            button && button == 2;
         let focusedApp = tracker.focus_app;
 
-        if (this.app.state == Shell.AppState.STOPPED || openNewWindow)
-            this.animateLaunch();
+        // Only consider SHIFT and CONTROL as modifiers (exclude SUPER, CAPS-LOCK, etc.)
+        modifiers = modifiers & (Clutter.ModifierType.SHIFT_MASK | Clutter.ModifierType.CONTROL_MASK);
 
-        if (button && button == 1 && this.app.state == Shell.AppState.RUNNING) {
-
-            if (modifiers & Clutter.ModifierType.CONTROL_MASK){
+        // We don't change the CTRL-click behaviour: in such case we just chain
+        // up the parent method and return.
+        if (modifiers & Clutter.ModifierType.CONTROL_MASK) {
                 // Keep default behaviour: launch new window
                 // By calling the parent method I make it compatible
                 // with other extensions tweaking ctrl + click
+                this.parent(button);
+                return;
+        }
+
+        // We check what type of click we have and if the modifier SHIFT is
+        // being used. We then define what buttonAction should be for this
+        // event.
+        let buttonAction = 0;
+        if (button && button == 2 ) {
+            if (modifiers & Clutter.ModifierType.SHIFT_MASK)
+                buttonAction = this._dtpSettings.get_enum('shift-middle-click-action');
+            else
+                buttonAction = this._dtpSettings.get_enum('middle-click-action');
+        }
+        else if (button && button == 1) {
+            if (modifiers & Clutter.ModifierType.SHIFT_MASK)
+                buttonAction = this._dtpSettings.get_enum('shift-click-action');
+            else
+                buttonAction = this._dtpSettings.get_enum('click-action');
+        }
+
+        // We customize the action only when the application is already running
+        if (this.app.state == Shell.AppState.RUNNING) {
+            switch (buttonAction) {
+            case clickAction.SKIP:
+                activateAllWindows(this.app);
+                break;
+
+            case clickAction.LAUNCH:
                 this.animateLaunch();
                 this.app.open_new_window(-1);
-                return;
+                break;
 
-            } else if (this.app == focusedApp && !Main.overview._shown){
-                minimizeWindow(this.app, true);
-            } else {
-                // If click minimizes all, then one expects all windows to be reshown
-                activateAllWindows(this.app);
+            case clickAction.MINIMIZE:
+                // In overview just activate the app, unless the acion is explicitely
+                // requested with a keyboard modifier
+                if (!Main.overview._shown || modifiers){
+                    // If we have button=2 or a modifier, allow minimization even if
+                    // the app is not focused
+                    if (this.app == focusedApp || button == 2 || modifiers & Clutter.ModifierType.SHIFT_MASK) {
+                        // minimize all windows on double click and always in the case of primary click without
+                        // additional modifiers
+                        let click_count = 0;
+                        if (Clutter.EventType.CLUTTER_BUTTON_PRESS)
+                            click_count = event.get_click_count();
+                        let all_windows = (button == 1 && ! modifiers) || click_count > 1;
+                        minimizeWindow(this.app, all_windows);
+                    }
+                    else
+                        activateAllWindows(this.app);
+                }
+                else
+                    this.app.activate();
+                break;
+
+            case clickAction.CYCLE_WINDOWS:
+                if (!Main.overview._shown){
+                    if (this.app == focusedApp)
+                        activateNextWindow(this.app, false);
+                    else {
+                        activateFirstWindow(this.app);
+                    }
+                }
+                else
+                    this.app.activate();
+                break;
+            case clickAction.CYCLE_WINDOWS_MIN:
+                if (!Main.overview._shown){
+                    if (this.app == focusedApp)
+                        activateNextWindow(this.app, true);
+                    else {
+                        activateFirstWindow(this.app);
+                    }
+                }
+                else
+                    this.app.activate();
+                break;
+
+            case clickAction.QUIT:
+                closeAllWindows(this.app);
+                break;
             }
-        } else {
-         // Default behaviour
-         if (openNewWindow)
+        }
+        else {
+            this.animateLaunch();
             this.app.open_new_window(-1);
-         else
-            this.app.activate();
         }
 
         Main.overview.hide();
@@ -1453,6 +1531,44 @@ function activateAllWindows(app){
     }
 }
 
+function activateFirstWindow(app){
+
+    let windows = getAppInterestingWindows(app).sort(function(windowA, windowB) {
+        return windowA.get_stable_sequence() > windowB.get_stable_sequence();
+    });
+
+    Main.activateWindow(windows[0]);
+}
+
+/*
+ * Activate the next running window for the current application
+ */
+function activateNextWindow(app, shouldMinimize){
+
+    let windows = getAppInterestingWindows(app).sort(function(windowA, windowB) {
+        return windowA.get_stable_sequence() > windowB.get_stable_sequence();
+    });
+
+    let focused_window = global.display.focus_window;
+
+    for (let i = 0 ; i < windows.length; i++){
+        if(windows[i] == focused_window) {
+            if(i < windows.length - 1)
+                Main.activateWindow(windows[i + 1]);
+            else
+                shouldMinimize ? minimizeWindow(app, true) : Main.activateWindow(windows[0]); 
+
+            break;
+        }
+    }
+}
+
+function closeAllWindows(app) {
+    let windows = getAppInterestingWindows(app);
+    for (let i = 0; i < windows.length; i++)
+        windows[i].delete(global.get_current_time());
+}
+
 function getAppInterestingWindows(app) {
     // Filter out unnecessary windows, for instance
     // nautilus desktop window.