diff --git a/Settings.ui b/Settings.ui
index e485aef..10e1756 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -85,7 +85,7 @@
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
                         <items>
-                          <item id="RAISE" translatable="yes">Raise all windows</item>
+                          <item id="RAISE" translatable="yes">Raise windows</item>
                           <item id="MINIMIZE" translatable="yes">Minimize window</item>
                           <item id="LAUNCH" translatable="yes">Launch new instance</item>
                           <item id="CYCLE" translatable="yes">Cycle through windows</item>
@@ -156,7 +156,7 @@
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
                         <items>
-                          <item id="RAISE" translatable="yes">Raise all windows</item>
+                          <item id="RAISE" translatable="yes">Raise windows</item>
                           <item id="MINIMIZE" translatable="yes">Minimize window</item>
                           <item id="LAUNCH" translatable="yes">Launch new instance</item>
                           <item id="CYCLE" translatable="yes">Cycle through windows</item>
@@ -227,7 +227,7 @@
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
                         <items>
-                          <item id="RAISE" translatable="yes">Raise all windows</item>
+                          <item id="RAISE" translatable="yes">Raise windows</item>
                           <item id="MINIMIZE" translatable="yes">Minimize window</item>
                           <item id="LAUNCH" translatable="yes">Launch new instance</item>
                           <item id="CYCLE" translatable="yes">Cycle through windows</item>
@@ -5429,8 +5429,8 @@
                                   <item id="CYCLE-MIN" translatable="yes">Cycle windows + minimize</item>
                                   <item id="CYCLE" translatable="yes">Cycle through windows</item>
                                   <item id="TOGGLE-SHOWPREVIEW" translatable="yes">Toggle single / Preview multiple</item>
-                                  <item id="MINIMIZE" translatable="yes">Toggle all windows</item>
-                                  <item id="RAISE" translatable="yes">Raise all windows</item>
+                                  <item id="MINIMIZE" translatable="yes">Toggle windows</item>
+                                  <item id="RAISE" translatable="yes">Raise windows</item>
                                   <item id="LAUNCH" translatable="yes">Launch new instance</item>
                                 </items>
                               </object>
diff --git a/appIcons.js b/appIcons.js
index 5890639..1875352 100644
--- a/appIcons.js
+++ b/appIcons.js
@@ -764,10 +764,10 @@ var taskbarAppIcon = new Lang.Class({
             if (this.window && !handleAsGrouped) {
                 //ungrouped applications behaviors
                 switch (buttonAction) {
-                    case 'RAISE': case 'CYCLE': case 'CYCLE-MIN': case 'MINIMIZE':
+                    case 'RAISE': case 'CYCLE': case 'CYCLE-MIN': case 'MINIMIZE': case 'TOGGLE-SHOWPREVIEW':
                         if (!Main.overview._shown && 
-                            (buttonAction == 'MINIMIZE' || 
-                             (buttonAction == 'CYCLE-MIN' && this._isFocusedWindow()))) {
+                            (buttonAction == 'MINIMIZE' || buttonAction == 'TOGGLE-SHOWPREVIEW' || buttonAction == 'CYCLE-MIN') && 
+                            (this._isFocusedWindow() || (buttonAction == 'MINIMIZE' && (button == 2 || modifiers & Clutter.ModifierType.SHIFT_MASK)))) {
                                 this.window.minimize();
                         } else {
                             Main.activateWindow(this.window);
@@ -846,6 +846,14 @@ var taskbarAppIcon = new Lang.Class({
                                     minimizeWindow(this.app, false, this._dtpSettings);
                                 else
                                     activateFirstWindow(this.app, this._dtpSettings);
+                            } else {
+                                // minimize all windows if double clicked
+                                if (Clutter.EventType.CLUTTER_BUTTON_PRESS) {
+                                    let click_count = event.get_click_count();
+                                    if(click_count > 1) {
+                                        minimizeWindow(this.app, true, this._dtpSettings);
+                                    }
+                                }
                             }
                         }
                         else