diff --git a/frontend/resources/images/cursors/zoom-in.svg b/frontend/resources/images/cursors/zoom-in.svg
new file mode 100644
index 000000000..ecd153448
--- /dev/null
+++ b/frontend/resources/images/cursors/zoom-in.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="#fff" d="m 6.5136402,0.03340278 0.00792,0.0079083 C 4.7130596,0.0317063 2.9543505,0.83305185 1.7549001,2.1705855 0.56511566,3.4348541 -0.04893179,5.1697859 0.04278069,6.8858317 0.10405093,8.7831384 1.0674973,10.58449 2.5536247,11.743424 c 0.00193,0.0015 0.006,-0.0015 0.00791,0 1.2954964,1.025836 2.9850834,1.514881 4.6262796,1.352298 1.1189244,-0.07772 2.1126256,-0.582762 3.0189437,-1.166455 1.300145,1.177809 2.791044,2.709209 3.989671,3.817669 l 0.02965,0.02372 0.03757,0.02173 c 0.702494,0.464779 1.661959,-0.01373 1.70421,-0.859992 0.02846,-0.353107 -0.137557,-0.660691 -0.292602,-0.844197 -0.159146,-0.18836 -0.309477,-0.312068 -0.373663,-0.387501 l -0.0079,-0.0079 -0.01385,-0.0158 C 14.153826,12.508689 13.00386,11.381256 11.871425,10.240873 12.560113,9.1995744 13.13429,8.0303807 13.134755,6.7434844 13.169193,5.6664618 12.942053,4.5724207 12.432906,3.6059182 11.445781,1.6629549 9.4712875,0.26115446 7.2767792,0.06305843 h -0.00792 C 7.1896181,0.05547828 7.1089279,0.05987371 7.0296487,0.05515025 V 0.03340278 H 6.5294565 c -0.00494,6.117e-5 -0.010865,-7.132e-5 -0.015801,0 z m 0.00792,1.00829162 h 0.00792 c 0.2163075,-0.00313 0.4367863,0.00897 0.6504467,0.029654 1.8182364,0.162129 3.5196421,1.3676852 4.3475161,2.997196 h 0.0079 v 0.00792 c 0.424121,0.8025533 0.622545,1.7262283 0.591135,2.6452825 l -0.0079,0.00593 v 0.00792 C 12.119096,7.3111086 11.728675,7.8069815 11.529399,8.3567524 11.991854,7.0700561 11.986375,5.626478 11.408799,4.3828971 10.594276,2.5635657 8.7238959,1.2907073 6.7093679,1.2888247 c -0.016489,-9.3e-6 -0.025901,-1.066e-4 -0.03757,0 C 5.6998624,1.2503125 4.8196765,1.6933974 3.9968656,2.1784938 4.8194294,1.697331 5.5758491,1.0350526 6.5215489,1.0416944 Z m -0.073149,1.2534448 c 0.059097,-5.544e-4 0.1189062,-3.617e-4 0.1779346,0.00198 h 0.015801 0.00593 c 0.026054,0 0.047513,-7.7e-6 0.061289,0 1.5819226,0.00148 3.1344766,1.0557163 3.7801052,2.5029357 v 0.00792 c 0.47651,1.0259791 0.510178,2.271526 0.09687,3.3253853 -0.55564,1.4238196 -1.937027,2.5272358 -3.4519133,2.6966828 -0.6798848,0.07653 -1.3668787,0.02812 -1.9730887,-0.207589 h -0.00593 l -0.015801,-0.0079 C 3.5301969,10.066816 2.3255709,8.4055776 2.308471,6.7059207 v -0.00792 -0.00593 C 2.2504076,5.3620194 2.9080848,4.0086241 3.9672098,3.1946935 v -0.00791 C 4.6753799,2.6337211 5.5619442,2.3034553 6.4483979,2.2951392 Z M 3.2930388,2.4908664 C 2.0285709,3.5111544 1.2380455,5.0881293 1.3061109,6.7276681 1.3317855,8.8017904 2.764766,10.631724 4.6828996,11.391511 4.1840257,11.197267 3.5991581,11.281507 3.1823245,10.95063 1.9280488,9.9757729 1.1081268,8.4265006 1.0589812,6.8482676 v -0.00792 -0.00792 C 0.98039048,5.3929794 1.503183,3.9117756 2.4943132,2.8585964 l 0.00791,-0.00791 C 2.7008498,2.6284705 3.059365,2.6771432 3.2930388,2.4908664 Z M 5.5132569,3.3429717 V 3.8451403 5.4880627 H 3.3681667 V 7.6549011 H 5.5132569 V 9.7999918 H 7.6880041 V 7.6549011 H 9.8330944 V 5.4880627 H 7.6880041 v -2.145091 z m 1.0161996,1.0102684 h 0.1423469 v 2.1431142 h 2.145091 V 6.6387012 H 6.6718038 V 8.7917006 H 6.5294565 V 6.6387012 H 4.3843662 V 6.4963543 H 6.5294565 Z M 11.45427,8.5584095 C 11.245973,9.071326 11.238475,9.6435888 10.900698,10.090617 l -0.26097,0.351914 0.306443,0.314347 c 1.205137,1.218379 2.430647,2.402272 3.608102,3.623919 0.144413,0.164131 0.283439,0.284713 0.351914,0.365751 0.07275,0.0861 0.06197,0.08064 0.05931,0.104785 v 0.01385 0.0158 c -6.6e-4,0.01729 -0.131761,0.07423 -0.142347,0.06722 -1.214125,-1.127584 -2.773211,-2.75407 -4.145859,-3.975824 l -0.306443,-0.268878 -0.330168,0.23922 c -0.8785619,0.633514 -1.889952,1.080481 -2.9279969,1.150641 h -0.00792 -0.00792 C 6.5656395,12.147439 6.1155615,11.758457 5.5883847,11.652481 6.1431774,11.75849 6.7022033,11.901645 7.2471234,11.840302 9.1331639,11.629339 10.736697,10.289929 11.45427,8.5584095 Z" /><path fill="#000" d="M 6.5182981,0.54216277 C 4.8578527,0.53050116 3.2238181,1.2836102 2.1193791,2.5192051 1.0280872,3.6788154 0.45945205,5.2877865 0.54565288,6.8667214 0.59986167,8.6075081 1.4912776,10.287128 2.8647239,11.354608 c 1.193451,0.947342 2.7648782,1.403562 4.2783191,1.249491 1.1593545,-0.07836 2.2535222,-0.571004 3.18897,-1.245537 1.367427,1.217107 2.963132,2.872552 4.203192,4.019327 0.358387,0.237104 0.912553,-0.03458 0.92921,-0.470537 0.04281,-0.389271 -0.334639,-0.614583 -0.553571,-0.871875 C 13.725913,12.806074 12.503377,11.615502 11.302741,10.401673 12.097313,9.3501094 12.624674,8.0672409 12.623405,6.7421676 12.657637,5.7405229 12.445908,4.7293769 11.976912,3.8418466 11.068926,2.0546504 9.2278186,0.75083893 7.220148,0.57181839 6.9869917,0.54924611 6.7524894,0.53878251 6.5182981,0.54216277 Z M 6.4431703,1.7956076 c 0.067181,-5.963e-4 0.1343892,0.00129 0.2016585,0.00396 0.019932,0 0.039264,-1.13e-5 0.059311,0 1.7993449,0.00168 3.5114032,1.1626194 4.2407562,2.797515 0.537366,1.1570035 0.576166,2.53594 0.110715,3.7227711 C 10.430264,9.922275 8.902984,11.150532 7.1845615,11.342745 6.442057,11.426333 5.6752888,11.37215 4.9742278,11.09957 3.1489473,10.478398 1.8165324,8.6478654 1.7971206,6.7184433 1.7313276,5.2113441 2.4597872,3.7118815 3.6515871,2.7959911 4.4436854,2.177381 5.4354392,1.8045513 6.4431703,1.7956076 Z M 6.0161291,3.8517318 v 2.145091 H 3.8710389 v 1.1565697 h 2.1450902 v 2.145091 H 7.1726988 V 7.1533925 H 9.3177902 V 5.9968228 H 7.1726988 v -2.145091 z"/></svg>
diff --git a/frontend/resources/images/cursors/zoom-out.svg b/frontend/resources/images/cursors/zoom-out.svg
new file mode 100644
index 000000000..65a5a300f
--- /dev/null
+++ b/frontend/resources/images/cursors/zoom-out.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="#fff" d="m 6.5035704,0.03340456 0.00791,0.0078957 C 4.7058614,0.03171075 2.9499515,0.83177916 1.7524138,2.1671811 0.56452559,3.4294347 -0.04854221,5.1616013 0.04302411,6.8749121 0.10417748,8.7691949 1.0661065,10.567675 2.5498664,11.724762 c 0.00193,0.0015 0.00637,-0.0015 0.0079,0 1.2934304,1.024202 2.9783467,1.512467 4.6169314,1.350143 1.11714,-0.0776 2.1092616,-0.581833 3.0141332,-1.164596 1.298071,1.175932 2.78857,2.704891 3.985286,3.811584 l 0.0296,0.02368 0.03751,0.0217 c 0.701372,0.464017 1.65734,-0.01375 1.699521,-0.858643 0.02827,-0.352544 -0.135386,-0.659638 -0.290161,-0.842851 -0.1589,-0.18806 -0.308972,-0.31157 -0.373067,-0.386883 l -0.0079,-0.0079 -0.01383,-0.01578 C 14.131282,12.488808 12.983444,11.363172 11.852816,10.224606 12.540407,9.1849672 13.113671,8.017637 13.114133,6.7327917 13.148518,5.6574856 12.92174,4.5651882 12.413402,3.6002261 11.42785,1.6603595 9.456503,0.26079326 7.2654931,0.06301295 h -0.00791 C 7.1784911,0.05544496 7.0979013,0.05983323 7.0187565,0.05511738 V 0.03340456 h -0.499395 c -0.00497,6.108e-5 -0.01081,-7.12e-5 -0.015775,0 z m 0.00791,1.00668464 h 0.00791 c 0.2159666,-0.00312 0.4360909,0.00895 0.6494112,0.029607 1.8153373,0.1618706 3.5140314,1.3655054 4.3405854,2.992419 h 0.0079 v 0.00791 c 0.423446,0.8012742 0.621553,1.7234771 0.590193,2.6410665 l -0.0079,0.00592 v 0.00791 C 12.100092,7.2995099 11.70832,7.7945925 11.509359,8.3434871 11.971079,7.0588416 11.967584,5.6175642 11.390926,4.3759654 10.577706,2.559535 8.7103015,1.2887052 6.6989861,1.2868256 c -0.016425,-9.3e-6 -0.025668,-1.064e-4 -0.037509,0 C 5.6910876,1.2483749 4.8123084,1.6907535 3.990807,2.1750768 4.8120609,1.6946809 5.5672751,1.0334579 6.5114665,1.0400892 Z m -0.073033,1.2514471 c 0.059003,-5.536e-4 0.1187167,-3.612e-4 0.177651,0.00197 h 0.015775 0.00592 c 0.025974,0 0.047403,-7.6e-6 0.061192,0 1.5794013,0.00148 3.1294809,1.0540338 3.7740806,2.4989465 v 0.00791 c 0.475749,1.0243439 0.509363,2.2679057 0.09672,3.3200853 -0.55476,1.421554 -1.9339413,2.5232109 -3.4464132,2.6923879 -0.6788012,0.07641 -1.3647025,0.02807 -1.9699437,-0.207258 h -0.00791 l -0.013827,-0.0079 C 3.5246598,10.050825 2.3202002,8.3922358 2.3031296,6.6952878 v -0.00791 -0.00592 C 2.2451466,5.3535285 2.9017868,4.0022901 3.9592244,3.1896569 v -0.0079 C 4.666264,2.6295786 5.553392,2.2998391 6.4384321,2.2915363 Z M 3.288102,2.4869516 C 2.0254503,3.5056132 1.2363849,5.0800748 1.3043408,6.7170006 1.3299331,8.7878172 2.7606692,10.614834 4.675748,11.37341 4.1776688,11.179476 3.5937334,11.263582 3.1775641,10.933232 1.9252865,9.9599286 1.1066722,8.4131255 1.057604,6.8374079 v -0.00791 -0.00791 C 0.97914764,5.3844391 1.5010998,3.905596 2.4906494,2.8540954 l 0.0079,-0.0079 C 2.6968642,2.6243366 3.0548009,2.6729318 3.288102,2.4869516 Z m 0.075007,2.9904452 v 0.50729 1.656095 H 9.8157604 V 5.4773968 Z M 4.37769,6.4919771 H 8.8011805 V 6.6340972 H 4.37769 Z m 7.056662,2.0528471 h 0.002 c -0.207946,0.512099 -0.215444,1.0834497 -0.55269,1.5297658 l -0.260554,0.351352 0.305955,0.313847 c 1.203214,1.216437 2.426774,2.398443 3.602352,3.618143 0.144194,0.163869 0.28298,0.284259 0.351352,0.365168 0.07265,0.08597 0.06185,0.08051 0.05922,0.104618 v 0.01383 0.01578 c -6.6e-4,0.01727 -0.131539,0.07411 -0.14212,0.06711 -1.212425,-1.125787 -2.770766,-2.749681 -4.141226,-3.969488 l -0.305952,-0.26845 -0.327666,0.238839 c -0.8771635,0.632504 -1.8869428,1.078759 -2.9233345,1.148807 h -0.00791 -0.00791 c -0.5303553,0.05399 -0.9797189,-0.33437 -1.5060563,-0.440178 0.5539084,0.105841 1.1120415,0.248765 1.656095,0.18752 1.8830349,-0.210627 3.4820388,-1.547902 4.1984678,-3.2766598 z" /><path fill="#000" d="M 6.5082282,0.54134847 C 4.8504273,0.52970598 3.217028,1.2816142 2.1143462,2.5152398 1.0247955,3.6730019 0.45903642,5.2794085 0.54510189,6.8558269 0.5992273,8.5938391 1.4892195,10.270782 2.8604768,11.336561 c 1.1915479,0.945832 2.7604687,1.401325 4.2715013,1.247499 1.1575025,-0.07823 2.2499286,-0.570094 3.1838859,-1.243552 1.365246,1.215167 2.95841,2.867974 4.196494,4.012921 0.35783,0.236727 0.909123,-0.03455 0.925755,-0.469786 0.04274,-0.388651 -0.332137,-0.613604 -0.550716,-0.870486 -1.183042,-1.227443 -2.40363,-2.416118 -3.602352,-3.628013 0.793305,-1.0498871 1.319824,-2.330711 1.31856,-3.6536724 0.034,-1.0000482 -0.177201,-2.0095827 -0.645463,-2.8956984 C 11.051602,2.0514255 9.2134303,0.74969204 7.2089591,0.57095682 6.9761858,0.54842051 6.7420439,0.5379736 6.5082282,0.54134847 Z M 6.4332204,1.7927955 c 0.067074,-5.952e-4 0.1341751,0.00129 0.2013371,0.00395 0.019863,0 0.039202,-1.12e-5 0.059217,0 1.796476,0.00168 3.5058075,1.1607665 4.2339965,2.7930562 C 11.464281,5.7449612 11.503015,7.1217 11.03831,8.3066395 10.413957,9.9065106 8.8891145,11.13281 7.1734293,11.324717 6.4321112,11.40817 5.6665624,11.354075 4.9666187,11.081929 3.1442493,10.461747 1.8139569,8.6341321 1.794576,6.7077852 1.7288768,5.2030879 2.4561835,3.7060153 3.6460858,2.7915846 4.4369238,2.1739605 5.4270962,1.801725 6.4332204,1.7927955 Z M 3.8651881,5.9873147 V 7.1420411 H 9.3032584 V 5.9873147 Z"/></svg>
diff --git a/frontend/resources/images/cursors/zoom.svg b/frontend/resources/images/cursors/zoom.svg
new file mode 100644
index 000000000..9650153fe
--- /dev/null
+++ b/frontend/resources/images/cursors/zoom.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="#fff" d="m 6.4964905,0.03321911 0.00744,0.0074534 C 4.6999927,0.031092 2.9450522,0.83074764 1.7486196,2.1649163 0.56182888,3.4260039 -0.04971135,5.156338 0.04177115,6.8680661 0.10288679,8.7605997 1.0637539,10.556814 2.5461426,11.712833 c 0.00192,0.0015 0.00553,-0.0015 0.00745,0 1.2922365,1.023254 2.9766407,1.511254 4.6137085,1.349081 1.1161094,-0.07753 2.1071715,-0.580519 3.0112089,-1.162744 1.296873,1.174846 2.78455,2.703061 3.980162,3.808731 l 0.0298,0.02236 0.03728,0.02236 c 0.700715,0.463588 1.657243,-0.01304 1.699388,-0.857156 0.02838,-0.352217 -0.136032,-0.659199 -0.290686,-0.842243 -0.158745,-0.187888 -0.308651,-0.312341 -0.372674,-0.387582 l -0.0074,-0.0074 -0.01492,-0.01492 C 14.11624,12.47794 12.970225,11.352196 11.84064,10.214682 12.527595,9.1760037 13.099816,8.0101087 13.10028,6.7264501 13.134631,5.6521372 12.907519,4.560056 12.399652,3.5959857 11.415011,1.6579104 9.4457338,0.26063069 7.2567459,0.06303305 h -0.00744 C 7.170251,0.05547197 7.0898604,0.06029116 7.010781,0.05557958 V 0.03321911 H 6.5113973 c -0.00492,6.098e-5 -0.01,-7.114e-5 -0.014921,0 z m 0.00744,1.00622069 h 0.00744 c 0.2157633,-0.00312 0.4353294,0.00918 0.6484535,0.029816 1.8136614,0.1617211 3.512138,1.3634369 4.337929,2.988848 h 0.0074 v 0.00744 c 0.423055,0.8005342 0.620192,1.7218025 0.588861,2.6385444 l -0.0074,0.00744 v 0.00744 C 12.087155,7.2930556 11.696556,7.7880155 11.49778,8.3364032 11.959073,7.0529442 11.954648,5.6116005 11.378524,4.3711484 10.566052,2.5563955 8.6997409,1.2872828 6.690281,1.2854049 c -0.016448,-9.3e-6 -0.025645,-1.064e-4 -0.037284,0 C 5.6835006,1.2469899 4.8054067,1.6884939 3.9846658,2.1723698 4.8051598,1.6924176 5.560624,1.0328147 6.5039441,1.0394398 Z m 0.1043608,1.2521857 h 0.014921 0.00744 c 0.025988,0 0.045886,-7.7e-6 0.059628,0 1.5779426,0.00147 3.1274607,1.05334 3.7714647,2.4969181 v 0.00745 c 0.475311,1.0233978 0.509156,2.2655936 0.09689,3.3168015 C 10.004397,9.5330276 8.6262057,10.634487 7.11513,10.803507 6.4369561,10.879852 5.7520944,10.829918 5.1474095,10.59481 h -0.00744 l -0.014921,-0.0074 C 3.5196969,10.041029 2.3172339,8.3845631 2.3001776,6.6891824 v -0.00744 -0.00744 C 2.2422595,5.3475835 2.8983919,3.9979266 3.9548517,3.1860439 v -0.00745 C 4.7083326,2.59014 5.6662428,2.2542985 6.6082929,2.2916255 Z M 3.2840378,2.4854162 C 2.0227512,3.5031372 1.2335156,5.0761291 1.3014104,6.711543 c 0.02561,2.0689039 1.4556686,3.8931 3.368976,4.650976 C 4.1727677,11.168763 3.588021,11.252807 3.1722355,10.922763 1.921116,9.9503584 1.1044674,8.405061 1.0554453,6.8307988 v -0.00745 -0.00745 C 0.97705516,5.3800416 1.4978773,3.9011665 2.4865147,2.850637 l 0.00745,-0.00745 C 2.692098,2.6215255 3.0509516,2.6712244 3.2840378,2.4854162 Z m 8.1392072,6.0522313 c -0.207774,0.5116264 -0.214629,1.0820609 -0.551558,1.5279645 l -0.26087,0.350314 0.305592,0.313046 c 1.202105,1.215313 2.425542,2.396368 3.600034,3.614941 0.14405,0.163718 0.282012,0.284382 0.350315,0.36522 0.07257,0.08589 0.06228,0.08027 0.05963,0.10435 v 0.01492 0.01492 c -6.59e-4,0.01725 -0.131055,0.07407 -0.141614,0.06708 -1.21107,-1.124754 -2.767494,-2.746602 -4.136689,-3.965283 L 10.34249,10.6768 10.014538,10.915311 C 9.1381844,11.54723 8.128202,11.993164 7.0927694,12.063147 h -0.00744 -0.00744 c -0.5298918,0.05394 -0.9797777,-0.334046 -1.5056281,-0.439756 0.5533968,0.105743 1.111125,0.247527 1.6546738,0.186337 1.8812957,-0.210432 3.4805459,-1.544919 4.1963129,-3.2720805 z"/><path fill="#000" d="M 6.5057886,0.53690631 C 4.8495208,0.52527405 3.2184686,1.2751981 2.1168078,2.5076844 1.0282616,3.6643773 0.4620335,5.2699249 0.54801837,6.8448874 0.60208959,8.5812943 1.4919832,10.255957 2.8619738,11.320751 c 1.1904486,0.944959 2.7570918,1.401161 4.2667258,1.247477 1.1564373,-0.07816 2.2481169,-0.570566 3.1812114,-1.243402 1.363987,1.214045 2.95622,2.865801 4.193161,4.009691 0.357485,0.23651 0.908535,-0.03415 0.92515,-0.468986 0.0427,-0.388292 -0.332082,-0.613376 -0.550464,-0.870022 C 13.695808,12.7692 12.475161,11.581081 11.277545,10.370305 12.070118,9.3213873 12.596425,8.0430886 12.595161,6.721349 12.629307,5.7222245 12.418801,4.7133217 11.950985,3.8280243 11.045283,2.0453248 9.2083701,0.74377285 7.2057503,0.56520271 6.9731801,0.54268863 6.7393907,0.53368305 6.5057886,0.53706014 Z M 6.6915682,1.7899367 C 8.486386,1.791614 10.193952,2.949744 10.921471,4.5805261 11.457485,5.7346187 11.495958,7.110861 11.031677,8.2947057 10.407903,9.8931015 8.8836612,11.117029 7.1695625,11.308758 6.4289257,11.392135 5.6652945,11.338027 4.9659973,11.066132 3.1453092,10.446523 1.8162042,8.6212193 1.7968421,6.6966511 1.7312137,5.1933436 2.4570475,3.6978407 3.6458487,2.7842545 4.4886284,2.1260639 5.5579063,1.7477491 6.6315258,1.7902894 c 0.019882,0 0.040039,-3.602e-4 0.060036,-3.489e-4 z"/></svg>
diff --git a/frontend/resources/styles/main/partials/debug-icons-preview.scss b/frontend/resources/styles/main/partials/debug-icons-preview.scss
index 8ddba1688..afca85123 100644
--- a/frontend/resources/styles/main/partials/debug-icons-preview.scss
+++ b/frontend/resources/styles/main/partials/debug-icons-preview.scss
@@ -2,7 +2,9 @@
   display: flex;
   flex-direction: column;
   overflow: scroll;
+  height: 100%;
 }
+
 .debug-icons-preview {
   display: flex;
   flex-wrap: wrap;
diff --git a/frontend/src/app/main/data/workspace/selection.cljs b/frontend/src/app/main/data/workspace/selection.cljs
index 46b554a22..264874a94 100644
--- a/frontend/src/app/main/data/workspace/selection.cljs
+++ b/frontend/src/app/main/data/workspace/selection.cljs
@@ -47,7 +47,7 @@
       (assoc-in state [:workspace-local :selrect] selrect))))
 
 (defn handle-area-selection
-  [preserve?]
+  [preserve? ignore-groups?]
   (letfn [(data->selrect [data]
             (let [start (:start data)
                   stop (:stop data)
@@ -91,7 +91,7 @@
                  (rx/buffer-time 100)
                  (rx/map #(last %))
                  (rx/dedupe)
-                 (rx/map #(select-shapes-by-current-selrect preserve?))))
+                 (rx/map #(select-shapes-by-current-selrect preserve? ignore-groups?))))
 
            (rx/of (update-selrect nil))))))))
 
@@ -218,7 +218,7 @@
 ;; --- Select Shapes (By selrect)
 
 (defn select-shapes-by-current-selrect
-  [preserve?]
+  [preserve? ignore-groups?]
   (ptk/reify ::select-shapes-by-current-selrect
     ptk/WatchEvent
     (watch [_ state _]
@@ -237,6 +237,7 @@
                  :page-id page-id
                  :rect selrect
                  :include-frames? true
+                 :ignore-groups? ignore-groups?
                  :full-frame? true})
                (rx/map #(cp/clean-loops objects %))
                (rx/map #(into initial-set (filter (comp not blocked?)) %))
diff --git a/frontend/src/app/main/ui/cursors.cljs b/frontend/src/app/main/ui/cursors.cljs
index a57575099..2d571ed06 100644
--- a/frontend/src/app/main/ui/cursors.cljs
+++ b/frontend/src/app/main/ui/cursors.cljs
@@ -30,6 +30,9 @@
 (def pointer-node (cursor-ref :pointer-node 0 0 10 32))
 (def resize-alt (cursor-ref :resize-alt))
 (def text (cursor-ref :text))
+(def zoom (cursor-ref :zoom))
+(def zoom-in (cursor-ref :zoom-in))
+(def zoom-out (cursor-ref :zoom-out))
 
 ;; Dynamic cursors
 (def resize-ew (cursor-fn :resize-h 0))
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index f88972c48..def9a0852 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -115,21 +115,21 @@
         node-editing?     (and edition (not= :text (get-in base-objects [edition :type])))
         text-editing?     (and edition (= :text (get-in base-objects [edition :type])))
 
-        on-click          (actions/on-click hover selected edition drawing-path? drawing-tool)
+        on-click          (actions/on-click hover selected edition drawing-path? drawing-tool space?)
         on-context-menu   (actions/on-context-menu hover hover-ids)
         on-double-click   (actions/on-double-click hover hover-ids drawing-path? base-objects edition)
         on-drag-enter     (actions/on-drag-enter)
         on-drag-over      (actions/on-drag-over)
         on-drop           (actions/on-drop file viewport-ref zoom)
         on-mouse-down     (actions/on-mouse-down @hover selected edition drawing-tool text-editing? node-editing?
-                                                 drawing-path? create-comment? space? viewport-ref zoom)
+                                                 drawing-path? create-comment? space? viewport-ref zoom panning)
         on-mouse-up       (actions/on-mouse-up disable-paste)
         on-pointer-down   (actions/on-pointer-down)
         on-pointer-enter  (actions/on-pointer-enter in-viewport?)
         on-pointer-leave  (actions/on-pointer-leave in-viewport?)
         on-pointer-move   (actions/on-pointer-move viewport-ref zoom move-stream)
         on-pointer-up     (actions/on-pointer-up)
-        on-move-selected  (actions/on-move-selected hover hover-ids selected)
+        on-move-selected  (actions/on-move-selected hover hover-ids selected space?)
         on-menu-selected  (actions/on-menu-selected hover hover-ids selected)
 
         on-frame-enter    (actions/on-frame-enter frame-hover)
@@ -162,15 +162,13 @@
 
     (hooks/setup-dom-events viewport-ref zoom disable-paste in-viewport?)
     (hooks/setup-viewport-size viewport-ref)
-    (hooks/setup-cursor cursor alt? panning drawing-tool drawing-path? node-editing?)
+    (hooks/setup-cursor cursor alt? ctrl? space? panning drawing-tool drawing-path? node-editing?)
     (hooks/setup-keyboard alt? ctrl? space?)
     (hooks/setup-hover-shapes page-id move-stream base-objects transform selected ctrl? hover hover-ids @hover-disabled? zoom)
     (hooks/setup-viewport-modifiers modifiers base-objects)
     (hooks/setup-shortcuts node-editing? drawing-path?)
     (hooks/setup-active-frames base-objects vbox hover active-frames)
 
-    
-    
     [:div.viewport
      [:div.viewport-overlays
 
@@ -245,7 +243,7 @@
          [:& outline/shape-outlines
           {:objects base-objects
            :selected selected
-           :hover (when (not= :frame (:type @hover))
+           :hover (when (or @ctrl? (not= :frame (:type @hover)))
                     #{(or @frame-hover (:id @hover))})
            :edition edition
            :zoom zoom}])
@@ -262,7 +260,7 @@
            :shapes selected-shapes
            :zoom zoom
            :edition edition
-           :disable-handlers (or drawing-tool edition)
+           :disable-handlers (or drawing-tool edition @space?)
            :on-move-selected on-move-selected
            :on-context-menu on-menu-selected}])
 
diff --git a/frontend/src/app/main/ui/workspace/viewport/actions.cljs b/frontend/src/app/main/ui/workspace/viewport/actions.cljs
index 486288374..084f9ec8f 100644
--- a/frontend/src/app/main/ui/workspace/viewport/actions.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/actions.cljs
@@ -28,10 +28,11 @@
 
 (defn on-mouse-down
   [{:keys [id blocked hidden type]} selected edition drawing-tool text-editing?
-   node-editing? drawing-path? create-comment? space? viewport-ref zoom]
+   node-editing? drawing-path? create-comment? space? viewport-ref zoom panning]
   (mf/use-callback
    (mf/deps id blocked hidden type selected edition drawing-tool text-editing?
-            node-editing? drawing-path? create-comment? space? viewport-ref zoom)
+            node-editing? drawing-path? create-comment? @space? viewport-ref zoom
+            panning)
    (fn [bevent]
      (when (or (dom/class? (dom/get-target bevent) "viewport-controls")
                (dom/class? (dom/get-target bevent) "viewport-selrect"))
@@ -42,62 +43,75 @@
              shift? (kbd/shift? event)
              alt?   (kbd/alt? event)
 
-             left-click?   (= 1 (.-which event))
-             middle-click? (= 2 (.-which event))
+             left-click?   (and (not panning) (= 1 (.-which event)))
+             middle-click? (and (not panning) (= 2 (.-which event)))
 
              frame? (= :frame type)
              selected? (contains? selected id)]
 
-         (when middle-click?
-           (dom/prevent-default bevent)
-           (if ctrl?
-             (let [raw-pt   (dom/get-client-position event)
-                   viewport (mf/ref-val viewport-ref)
-                   pt       (utils/translate-point-to-viewport viewport zoom raw-pt)]
-               (st/emit! (dw/start-zooming pt)))
-             (st/emit! (dw/start-panning))))
+         (cond
+           middle-click?
+           (do
+             (dom/prevent-default bevent)
+             (if ctrl?
+               (let [raw-pt   (dom/get-client-position event)
+                     viewport (mf/ref-val viewport-ref)
+                     pt       (utils/translate-point-to-viewport viewport zoom raw-pt)]
+                 (st/emit! (dw/start-zooming pt)))
+               (st/emit! (dw/start-panning))))
 
-         (when left-click?
-           (st/emit! (ms/->MouseEvent :down ctrl? shift? alt?))
 
-           (when (and (not= edition id) text-editing?)
-             (st/emit! dw/clear-edition-mode))
+           left-click?
+           (do
+             (st/emit! (ms/->MouseEvent :down ctrl? shift? alt?))
 
-           (when (and (not text-editing?)
-                      (not blocked)
-                      (not hidden)
-                      (not create-comment?)
-                      (not drawing-path?))
-             (cond
-               drawing-tool
-               (st/emit! (dd/start-drawing drawing-tool))
+             (when (and (not= edition id) text-editing?)
+               (st/emit! dw/clear-edition-mode))
 
-               node-editing?
-               ;; Handle path node area selection
-               (st/emit! (dwdp/handle-area-selection shift?))
+             (when (and (not text-editing?)
+                        (not blocked)
+                        (not hidden)
+                        (not create-comment?)
+                        (not drawing-path?))
+               (cond
+                 node-editing?
+                 ;; Handle path node area selection
+                 (st/emit! (dwdp/handle-area-selection shift?))
 
-               @space?
-               (st/emit! (dw/start-panning))
+                 (and @space? ctrl?)
+                 (let [raw-pt   (dom/get-client-position event)
+                       viewport (mf/ref-val viewport-ref)
+                       pt       (utils/translate-point-to-viewport viewport zoom raw-pt)]
+                   (st/emit! (dw/start-zooming pt)))
 
-               (or (not id) (and frame? (not selected?)))
-               (st/emit! (dw/handle-area-selection shift?))
+                 @space?
+                 (st/emit! (dw/start-panning))
 
-               (not drawing-tool)
-               (st/emit! (when (or shift? (not selected?))
-                           (dw/select-shape id shift?))
-                         (dw/start-move-selected))))))))))
+                 drawing-tool
+                 (st/emit! (dd/start-drawing drawing-tool))
+
+                 (or (not id) (and frame? (not selected?)) ctrl?)
+                 (st/emit! (dw/handle-area-selection shift? ctrl?))
+
+                 (not drawing-tool)
+                 (st/emit! (when (or shift? (not selected?))
+                             (dw/select-shape id shift?))
+                           (dw/start-move-selected)))))))))))
 
 (defn on-move-selected
-  [hover hover-ids selected]
+  [hover hover-ids selected space?]
   (mf/use-callback
-   (mf/deps @hover @hover-ids selected)
+   (mf/deps @hover @hover-ids selected @space?)
    (fn [bevent]
      (let [event (.-nativeEvent bevent)
            shift? (kbd/shift? event)
+           ctrl?  (kbd/ctrl? event)
            left-click?   (= 1 (.-which event))]
 
        (when (and left-click?
+                  (not ctrl?)
                   (not shift?)
+                  (not @space?)
                   (or (not @hover)
                       (= :frame (:type @hover))
                       (some #(contains? selected %) @hover-ids)))
@@ -130,9 +144,9 @@
      (reset! frame-hover nil))))
 
 (defn on-click
-  [hover selected edition drawing-path? drawing-tool]
+  [hover selected edition drawing-path? drawing-tool space?]
   (mf/use-callback
-   (mf/deps @hover selected edition drawing-path? drawing-tool)
+   (mf/deps @hover selected edition drawing-path? drawing-tool @space?)
    (fn [event]
      (when (or (dom/class? (dom/get-target event) "viewport-controls")
                (dom/class? (dom/get-target event) "viewport-selrect"))
@@ -147,7 +161,8 @@
 
          (when (and hovering?
                     (not shift?)
-                    (not frame?)
+                    (or ctrl? (not frame?))
+                    (not @space?)
                     (not selected?)
                     (not edition)
                     (not drawing-path?)
@@ -229,17 +244,17 @@
            middle-click? (= 2 (.-which event))]
 
        (when left-click?
-         (st/emit! (dw/finish-panning)
-                   (ms/->MouseEvent :up ctrl? shift? alt?)))
+         (st/emit! (ms/->MouseEvent :up ctrl? shift? alt?)))
 
        (when middle-click?
          (dom/prevent-default event)
 
          ;; We store this so in Firefox the middle button won't do a paste of the content
          (reset! disable-paste true)
-         (timers/schedule #(reset! disable-paste false))
-         (st/emit! (dw/finish-panning)
-                   (dw/finish-zooming)))))))
+         (timers/schedule #(reset! disable-paste false)))
+       
+       (st/emit! (dw/finish-panning)
+                 (dw/finish-zooming))))))
 
 (defn on-pointer-enter [in-viewport?]
   (mf/use-callback
diff --git a/frontend/src/app/main/ui/workspace/viewport/hooks.cljs b/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
index 21ea3e700..49c1d9315 100644
--- a/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
@@ -57,13 +57,14 @@
        ;; We schedule the event so it fires after `initialize-page` event
        (timers/schedule #(st/emit! (dw/initialize-viewport size)))))))
 
-(defn setup-cursor [cursor alt? panning drawing-tool drawing-path? path-editing?]
+(defn setup-cursor [cursor alt? ctrl? space? panning drawing-tool drawing-path? path-editing?]
   (mf/use-effect
-   (mf/deps @cursor @alt? panning drawing-tool drawing-path? path-editing?)
+   (mf/deps @cursor @alt? @ctrl? @space? panning drawing-tool drawing-path? path-editing?)
    (fn []
      (let [new-cursor
            (cond
-             panning                         (utils/get-cursor :hand)
+             (and @ctrl? @space?)            (utils/get-cursor :zoom)
+             (or panning @space?)            (utils/get-cursor :hand)
              (= drawing-tool :comments)      (utils/get-cursor :comments)
              (= drawing-tool :frame)         (utils/get-cursor :create-artboard)
              (= drawing-tool :rect)          (utils/get-cursor :create-rectangle)
diff --git a/frontend/src/app/main/ui/workspace/viewport/utils.cljs b/frontend/src/app/main/ui/workspace/viewport/utils.cljs
index 9c0734afa..873061070 100644
--- a/frontend/src/app/main/ui/workspace/viewport/utils.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/utils.cljs
@@ -179,4 +179,7 @@
     :pencil cur/pencil
     :create-shape cur/create-shape
     :duplicate cur/duplicate
+    :zoom cur/zoom
+    :zoom-in cur/zoom-in
+    :zooom-out cur/zoom-out
     cur/pointer-inner))
diff --git a/frontend/src/app/worker/selection.cljs b/frontend/src/app/worker/selection.cljs
index d0b229034..ed0412f86 100644
--- a/frontend/src/app/worker/selection.cljs
+++ b/frontend/src/app/worker/selection.cljs
@@ -105,7 +105,7 @@
     (assoc data :index index :z-index z-index)))
 
 (defn- query-index
-  [{index :index z-index :z-index} rect frame-id full-frame? include-frames? clip-children? reverse?]
+  [{index :index z-index :z-index} rect frame-id full-frame? include-frames? ignore-groups? clip-children? reverse?]
   (let [result (-> (qdt/search index (clj->js rect))
                    (es6-iterator-seq))
 
@@ -117,6 +117,7 @@
                (or (not frame-id) (= frame-id (:frame-id shape)))
                (case (:type shape)
                  :frame   include-frames?
+                 (:bool :group) (not ignore-groups?)
                  true)
 
                (or (not full-frame?)
@@ -189,10 +190,10 @@
   nil)
 
 (defmethod impl/handler :selection/query
-  [{:keys [page-id rect frame-id reverse? full-frame? include-frames? clip-children?]
+  [{:keys [page-id rect frame-id reverse? full-frame? include-frames? ignore-groups? clip-children?]
     :or {reverse? false full-frame? false include-frames? false clip-children? true} :as message}]
   (when-let [index (get @state page-id)]
-    (query-index index rect frame-id full-frame? include-frames? clip-children? reverse?)))
+    (query-index index rect frame-id full-frame? include-frames? ignore-groups? clip-children? reverse?)))
 
 (defmethod impl/handler :selection/query-z-index
   [{:keys [page-id objects ids]}]