From 490b2afd319c595850df82f6038e13a4fa179102 Mon Sep 17 00:00:00 2001
From: sphrose <82213493+sphrose@users.noreply.github.com>
Date: Fri, 16 Apr 2021 10:59:27 +0100
Subject: [PATCH 1/5] [LY-105687] Jira: LY-105687
 https://jira.agscollab.com/browse/LY-105687

---
 .../Components/FancyDocking.cpp               | 14 +++++++
 .../AzQtComponents/Components/FancyDocking.h  |  2 +
 .../Components/Widgets/TabWidget.cpp          | 24 ++++++++----
 .../Components/Widgets/TabWidget.h            |  3 ++
 .../img/UI20/Cursors/Grab_release.svg         | 37 +++++++++++++++++++
 .../Components/img/UI20/Cursors/Grabbing.svg  | 23 ++++++++++++
 .../AzQtComponents/Components/resources.qrc   |  2 +
 7 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg
 create mode 100644 Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg

diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
index 76df971108..bc8da127a6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
@@ -159,6 +159,8 @@ namespace AzQtComponents
         // Timer for updating our hovered drop zone opacity
         QObject::connect(m_dropZoneHoverFadeInTimer, &QTimer::timeout, this, &FancyDocking::onDropZoneHoverFadeInUpdate);
         m_dropZoneHoverFadeInTimer->setInterval(g_FancyDockingConstants.dropZoneHoverFadeUpdateIntervalMS);
+        QIcon dragIcon = QIcon(QStringLiteral(":/Cursors/Grabbing.svg"));
+        m_dragCursor = QCursor(dragIcon.pixmap(32), 10, 5);
     }
 
     FancyDocking::~FancyDocking()
@@ -1884,6 +1886,8 @@ namespace AzQtComponents
             return;
         }
 
+        QApplication::setOverrideCursor(m_dragCursor);
+
         QPoint relativePressPos = pressPos;
 
         // If we are dragging a floating window, we need to grab a reference to its
@@ -1999,6 +2003,11 @@ namespace AzQtComponents
             clearDraggingState();
         }
 
+        if (QApplication::overrideCursor())
+        {
+            QApplication::restoreOverrideCursor();
+        }
+
         return true;
     }
 
@@ -2376,6 +2385,11 @@ namespace AzQtComponents
      */
     void FancyDocking::dropDockWidget(QDockWidget* dock, QWidget* onto, Qt::DockWidgetArea area)
     {
+        if (QApplication::overrideCursor())
+        {
+            QApplication::restoreOverrideCursor();
+        }                                         
+
         // If the dock widget we are dropping is currently a tab, we need to retrieve it from
         // the tab widget, and remove it as a tab.  We also need to remove its item from our
         // cache of widget <-> tab container since we are moving it somewhere else.
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h
index a466ce7087..20b90ad25c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h
@@ -266,6 +266,8 @@ namespace AzQtComponents
 
         QString m_floatingWindowIdentifierPrefix;
         QString m_tabContainerIdentifierPrefix;
+
+        QCursor m_dragCursor;
     };
 
 } // namespace AzQtComponents
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
index 895785f47b..8f408b01ef 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
@@ -21,6 +21,7 @@
 
 #include <QAction>
 #include <QActionEvent>
+#include <QApplication>
 #include <QHBoxLayout>
 #include <QIcon>
 #include <QLayout>
@@ -419,6 +420,14 @@ namespace AzQtComponents
         // a mouse move. The paint handler updates the close button's visibility
         setAttribute(Qt::WA_Hover);
         AzQtComponents::Style::addClass(this, g_emptyStyleClass);
+
+        QIcon icon = QIcon(QStringLiteral(":/Cursors/Grab release.svg"));
+        m_hoverCursor = QCursor(icon.pixmap(32), 10, 5);
+
+        icon = QIcon(QStringLiteral(":/Cursors/Grabbing.svg"));
+        m_dragCursor = QCursor(icon.pixmap(32), 10, 5);
+
+        this->setCursor(m_hoverCursor);                                  
     }
 
     void TabBar::setHandleOverflow(bool handleOverflow)
@@ -479,6 +488,13 @@ namespace AzQtComponents
 
     void TabBar::mouseReleaseEvent(QMouseEvent* mouseEvent)
     {
+        // Ensure we don't reset the cursor in the case of a dummy event being sent from DockTabWidget to trigger the animation.
+        Qt::MouseButtons realButtons = QApplication::mouseButtons();
+        if (QApplication::overrideCursor() && !(realButtons & Qt::LeftButton))
+        {
+            QApplication::restoreOverrideCursor();
+        }
+
         if (m_movingTab && !(mouseEvent->buttons() & Qt::LeftButton))
         {
             // When a moving tab is released, there is a short animation to put the moving tab
@@ -632,13 +648,7 @@ namespace AzQtComponents
                 {
                     QPoint p = tabRect(i).topLeft();
 
-                    int rightPadding = g_closeButtonPadding;
-                    if (m_overflowing == Overflowing)
-                    {
-                        rightPadding = 0;
-                    }
-
-                    p.setX(p.x() + tabRect(i).width() - rightPadding - g_closeButtonWidth);
+                    p.setX(p.x() + tabRect(i).width() - g_closeButtonPadding - g_closeButtonWidth);
                     p.setY(p.y() + 1 + (tabRect(i).height() - g_closeButtonWidth) / 2);
                     tabBtn->move(p);
                 }
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h
index 3f12f79907..e86deef7b4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h
@@ -203,6 +203,9 @@ namespace AzQtComponents
         bool m_movingTab = false;
         QPoint m_lastMousePress;
 
+        QCursor m_dragCursor;
+        QCursor m_hoverCursor;
+
         void resetOverflow();
         void overflowIfNeeded();
         void showCloseButtonAt(int index);
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg
new file mode 100644
index 0000000000..c0da9b802f
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g id="Cursor-_x2F_-Grab-release">
+	<g id="Group" transform="translate(3.366335, 2.000000)">
+		<g id="Path">
+			<g>
+				<path id="path-1" d="M3.6,3v5.7H3.5C2.8,8.2,1.8,8.1,1,8.4L0.8,8.5c-0.7,0.3-1,1.1-0.7,1.8l1.2,3c0.2,0.6,0.8,1.4,1.3,1.9
+					L3,15.5c0.3,0.2,0.5,0.5,0.8,0.7l0.1,0.1l0.2,0.2l0.2,0.2C4.4,16.9,4.5,17,4.5,17v0.1l0,0v1.8h5.3l0.4-0.7l0.4,0.7h2.5V17l0,0
+					v-0.1l0.1-0.2l0.1-0.2l0.1-0.2l0.1-0.3l0.2-0.4l0.2-0.4l0.3-0.6l0.1-0.2c0.4-0.4,0.7-1.4,0.7-2V8c0-0.9-0.3-2.9-1.7-2.9
+					c-0.8,0-1,0.4-1.2,0.6c-0.1-0.2-0.3-1.1-1.3-1.2c-0.8,0-1.2,0.4-1.3,0.7C9.4,4.9,9.2,4.1,8.2,4.1c-0.6,0-0.8,0.1-1,0.4
+					C7,4.1,6.4,0.7,5.3,0.7C4.3,0.7,3.6,2.2,3.6,3z"/>
+			</g>
+			<g>
+				<path id="path-1_1_" d="M3.6,3v5.7H3.5C2.8,8.2,1.8,8.1,1,8.4L0.8,8.5c-0.7,0.3-1,1.1-0.7,1.8l1.2,3c0.2,0.6,0.8,1.4,1.3,1.9
+					L3,15.5c0.3,0.2,0.5,0.5,0.8,0.7l0.1,0.1l0.2,0.2l0.2,0.2c0.1,0.1,0.2,0.2,0.2,0.2v0.2l0,0v1.8h5.3l0.4-0.7l0.4,0.7h2.5V17l0,0
+					v-0.1l0.1-0.2l0.1-0.2l0.1-0.2l0.1-0.3l0.2-0.4l0.2-0.4l0.3-0.6l0.1-0.2c0.4-0.4,0.7-1.4,0.7-2V8c0-0.9-0.3-2.9-1.7-2.9
+					c-0.8,0-1,0.4-1.2,0.6c-0.1-0.2-0.3-1.1-1.3-1.2c-0.8,0-1.2,0.4-1.3,0.7C9.4,4.9,9.2,4.1,8.2,4.1c-0.3,0-0.6,0.4-1,0.5
+					c0,0.2,0.2-2.2-0.2-2.9c-0.2-0.3-0.6-1-1.7-1C4.3,0.7,3.6,2.2,3.6,3z"/>
+			</g>
+		</g>
+		<path id="Path_1_" class="st0" d="M7.2,7.1V6.2c0-0.4,0.3-1.1,1-1.1s0.9,0.7,0.9,1.2c0,1.5,0,0.4,0,1h0.6c0-2.1,0-0.3,0-0.7
+			c0-0.6,0.4-1,1-1s1,0.5,1,1.1c0,0.4,0,0.7,0,0.7h0.6V7.1c0-0.5,0.2-0.9,0.8-0.9c0.7,0,0.9,0.5,1,1.3v1v3.8c0,0.5-0.2,1.1-0.4,1.6
+			l-0.1,0.2l-0.3,0.6L13,15.1l-0.2,0.3l-0.2,0.3L12.4,16c-0.2,0.4-0.3,0.7-0.3,1v0.1V18h-0.9l-0.9-1.9l-1,1.9H5.5v-0.9
+			c0-0.3-0.3-0.6-0.6-1.1l-0.3-0.3l-0.3-0.3l-0.1-0.1L4,15.1l-0.2-0.2l-0.5-0.5c-0.3-0.3-0.8-0.7-1-1.1L2.1,13L1,10
+			C0.9,9.8,1,9.5,1.1,9.4c0,0,0,0,0.1-0.1l0.2-0.1C2.2,8.9,3.1,9.3,3.6,10l0.1,0.1l0.8,1.3V3c0-0.5,0.5-1,1-1s0.9,0.5,0.9,0.9
+			c0,2.7,0,4.1,0,4.2H7.2z"/>
+		<polygon id="Path_2_" points="11.2,10.5 12.2,10.5 12.2,14.2 11.2,14.2 		"/>
+		<polygon id="Path_3_" points="9.3,10.5 10.3,10.5 10.3,14.2 9.3,14.2 		"/>
+		<polygon id="Path_4_" points="7.4,10.5 8.4,10.5 8.4,14.2 7.4,14.2 		"/>
+	</g>
+</g>
+</svg>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg
new file mode 100644
index 0000000000..e70be77d51
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;}
+</style>
+<path class="st0" d="M7.6,7.1V5.8c0-0.4,0.1-0.7,0.4-1c0.2-0.3,0.6-0.4,0.9-0.4l0,0c0.6,0,1.1,0.3,1.5,0.7l0.1,0.1l0,0l0.1-0.1
+	c0.3,0,0.5-0.1,0.7-0.1h0.1c0.6,0,1.1,0.3,1.5,0.7L13,5.8l0,0l0.1-0.1c0.2-0.1,0.3-0.2,0.5-0.2h0.1c0.7,0,1.2,0.3,1.6,0.7l0.1,0.1
+	l0,0l0.1-0.1C15.8,6.1,16,6,16.2,6h0.1c0.6,0,1.1,0.3,1.5,0.7c0.4,0.4,0.6,1,0.6,1.6l0,0V13c0,0.6-0.3,1.6-0.6,2.1
+	c0,0-1.4,2.1-1.4,2.8l0,0v1.6h-1.8l-0.4-1.4l-0.7,1.4H8.6V18c0-0.7-3-2.7-3-2.7c-0.6-0.4-1-1.3-1-2l0,0V9.7c0-0.7,0.3-1.3,0.7-1.8
+	C5.9,7.3,6.8,7,7.6,7.1L7.6,7.1z"/>
+<path class="st1" d="M7.6,7.1V5.8c0-0.4,0.1-0.7,0.4-1c0.2-0.3,0.6-0.4,0.9-0.4l0,0c0.6,0,1.1,0.3,1.5,0.7l0.1,0.1l0,0l0.1-0.1
+	c0.3,0,0.5-0.1,0.7-0.1h0.1c0.6,0,1.1,0.3,1.5,0.7L13,5.8l0,0l0.1-0.1c0.2-0.1,0.3-0.2,0.5-0.2h0.1c0.7,0,1.2,0.3,1.6,0.7l0.1,0.1
+	l0,0l0.1-0.1C15.8,6.1,16,6,16.2,6h0.1c0.6,0,1.1,0.3,1.5,0.7c0.4,0.4,0.6,1,0.6,1.6l0,0V13c0,0.6-0.3,1.6-0.6,2.1
+	c0,0-1.4,2.1-1.4,2.8l0,0v1.6h-1.8l-0.4-1.4l-0.7,1.4H8.6V18c0-0.7-3-2.7-3-2.7c-0.6-0.4-1-1.3-1-2l0,0V9.7c0-0.7,0.3-1.3,0.7-1.8
+	C5.9,7.3,6.8,7,7.6,7.1L7.6,7.1z"/>
+<polygon class="st2" points="11.1,11 12.1,11 12.1,15 11.1,15 "/>
+<polygon class="st2" points="13.1,11 14.1,11 14.1,15 13.1,15 "/>
+<polygon class="st2" points="15.1,11 16.1,11 16.1,15 15.1,15 "/>
+</svg>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
index f9e601fb6d..048758c283 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
@@ -636,5 +636,7 @@
 </qresource>
   <qresource prefix="/Cursors">
     <file alias="Pointer.svg">img/UI20/Cursors/Pointer.svg</file>
+    <file alias="Grab_release.svg">img/UI20/Cursors/Grab_release.svg</file>
+    <file alias="Grabbing.svg">img/UI20/Cursors/Grabbing.svg</file>
   </qresource>
 </RCC>

From db4b080544d305052602e0ba7e8260ee90bf0a87 Mon Sep 17 00:00:00 2001
From: sphrose <82213493+sphrose@users.noreply.github.com>
Date: Fri, 16 Apr 2021 14:55:39 +0100
Subject: [PATCH 2/5] Renamed svg

---
 .../AzQtComponents/Components/Widgets/TabWidget.cpp             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
index 8f408b01ef..121f35db61 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
@@ -421,7 +421,7 @@ namespace AzQtComponents
         setAttribute(Qt::WA_Hover);
         AzQtComponents::Style::addClass(this, g_emptyStyleClass);
 
-        QIcon icon = QIcon(QStringLiteral(":/Cursors/Grab release.svg"));
+        QIcon icon = QIcon(QStringLiteral(":/Cursors/Grab_release.svg"));
         m_hoverCursor = QCursor(icon.pixmap(32), 10, 5);
 
         icon = QIcon(QStringLiteral(":/Cursors/Grabbing.svg"));

From 2a339edc4e9ddafedc6dac297abdd1d9c8faf3ca Mon Sep 17 00:00:00 2001
From: sphrose <82213493+sphrose@users.noreply.github.com>
Date: Fri, 16 Apr 2021 10:59:27 +0100
Subject: [PATCH 3/5] [LY-105687] Jira: LY-105687
 https://jira.agscollab.com/browse/LY-105687

Renamed svg
---
 .../Components/FancyDocking.cpp               | 14 +++++++
 .../AzQtComponents/Components/FancyDocking.h  |  2 +
 .../Components/Widgets/TabWidget.cpp          | 24 ++++++++----
 .../Components/Widgets/TabWidget.h            |  3 ++
 .../img/UI20/Cursors/Grab_release.svg         | 37 +++++++++++++++++++
 .../Components/img/UI20/Cursors/Grabbing.svg  | 23 ++++++++++++
 .../AzQtComponents/Components/resources.qrc   |  2 +
 7 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg
 create mode 100644 Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg

diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
index 76df971108..bc8da127a6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
@@ -159,6 +159,8 @@ namespace AzQtComponents
         // Timer for updating our hovered drop zone opacity
         QObject::connect(m_dropZoneHoverFadeInTimer, &QTimer::timeout, this, &FancyDocking::onDropZoneHoverFadeInUpdate);
         m_dropZoneHoverFadeInTimer->setInterval(g_FancyDockingConstants.dropZoneHoverFadeUpdateIntervalMS);
+        QIcon dragIcon = QIcon(QStringLiteral(":/Cursors/Grabbing.svg"));
+        m_dragCursor = QCursor(dragIcon.pixmap(32), 10, 5);
     }
 
     FancyDocking::~FancyDocking()
@@ -1884,6 +1886,8 @@ namespace AzQtComponents
             return;
         }
 
+        QApplication::setOverrideCursor(m_dragCursor);
+
         QPoint relativePressPos = pressPos;
 
         // If we are dragging a floating window, we need to grab a reference to its
@@ -1999,6 +2003,11 @@ namespace AzQtComponents
             clearDraggingState();
         }
 
+        if (QApplication::overrideCursor())
+        {
+            QApplication::restoreOverrideCursor();
+        }
+
         return true;
     }
 
@@ -2376,6 +2385,11 @@ namespace AzQtComponents
      */
     void FancyDocking::dropDockWidget(QDockWidget* dock, QWidget* onto, Qt::DockWidgetArea area)
     {
+        if (QApplication::overrideCursor())
+        {
+            QApplication::restoreOverrideCursor();
+        }                                         
+
         // If the dock widget we are dropping is currently a tab, we need to retrieve it from
         // the tab widget, and remove it as a tab.  We also need to remove its item from our
         // cache of widget <-> tab container since we are moving it somewhere else.
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h
index a466ce7087..20b90ad25c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h
@@ -266,6 +266,8 @@ namespace AzQtComponents
 
         QString m_floatingWindowIdentifierPrefix;
         QString m_tabContainerIdentifierPrefix;
+
+        QCursor m_dragCursor;
     };
 
 } // namespace AzQtComponents
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
index 895785f47b..121f35db61 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
@@ -21,6 +21,7 @@
 
 #include <QAction>
 #include <QActionEvent>
+#include <QApplication>
 #include <QHBoxLayout>
 #include <QIcon>
 #include <QLayout>
@@ -419,6 +420,14 @@ namespace AzQtComponents
         // a mouse move. The paint handler updates the close button's visibility
         setAttribute(Qt::WA_Hover);
         AzQtComponents::Style::addClass(this, g_emptyStyleClass);
+
+        QIcon icon = QIcon(QStringLiteral(":/Cursors/Grab_release.svg"));
+        m_hoverCursor = QCursor(icon.pixmap(32), 10, 5);
+
+        icon = QIcon(QStringLiteral(":/Cursors/Grabbing.svg"));
+        m_dragCursor = QCursor(icon.pixmap(32), 10, 5);
+
+        this->setCursor(m_hoverCursor);                                  
     }
 
     void TabBar::setHandleOverflow(bool handleOverflow)
@@ -479,6 +488,13 @@ namespace AzQtComponents
 
     void TabBar::mouseReleaseEvent(QMouseEvent* mouseEvent)
     {
+        // Ensure we don't reset the cursor in the case of a dummy event being sent from DockTabWidget to trigger the animation.
+        Qt::MouseButtons realButtons = QApplication::mouseButtons();
+        if (QApplication::overrideCursor() && !(realButtons & Qt::LeftButton))
+        {
+            QApplication::restoreOverrideCursor();
+        }
+
         if (m_movingTab && !(mouseEvent->buttons() & Qt::LeftButton))
         {
             // When a moving tab is released, there is a short animation to put the moving tab
@@ -632,13 +648,7 @@ namespace AzQtComponents
                 {
                     QPoint p = tabRect(i).topLeft();
 
-                    int rightPadding = g_closeButtonPadding;
-                    if (m_overflowing == Overflowing)
-                    {
-                        rightPadding = 0;
-                    }
-
-                    p.setX(p.x() + tabRect(i).width() - rightPadding - g_closeButtonWidth);
+                    p.setX(p.x() + tabRect(i).width() - g_closeButtonPadding - g_closeButtonWidth);
                     p.setY(p.y() + 1 + (tabRect(i).height() - g_closeButtonWidth) / 2);
                     tabBtn->move(p);
                 }
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h
index 3f12f79907..e86deef7b4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h
@@ -203,6 +203,9 @@ namespace AzQtComponents
         bool m_movingTab = false;
         QPoint m_lastMousePress;
 
+        QCursor m_dragCursor;
+        QCursor m_hoverCursor;
+
         void resetOverflow();
         void overflowIfNeeded();
         void showCloseButtonAt(int index);
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg
new file mode 100644
index 0000000000..c0da9b802f
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g id="Cursor-_x2F_-Grab-release">
+	<g id="Group" transform="translate(3.366335, 2.000000)">
+		<g id="Path">
+			<g>
+				<path id="path-1" d="M3.6,3v5.7H3.5C2.8,8.2,1.8,8.1,1,8.4L0.8,8.5c-0.7,0.3-1,1.1-0.7,1.8l1.2,3c0.2,0.6,0.8,1.4,1.3,1.9
+					L3,15.5c0.3,0.2,0.5,0.5,0.8,0.7l0.1,0.1l0.2,0.2l0.2,0.2C4.4,16.9,4.5,17,4.5,17v0.1l0,0v1.8h5.3l0.4-0.7l0.4,0.7h2.5V17l0,0
+					v-0.1l0.1-0.2l0.1-0.2l0.1-0.2l0.1-0.3l0.2-0.4l0.2-0.4l0.3-0.6l0.1-0.2c0.4-0.4,0.7-1.4,0.7-2V8c0-0.9-0.3-2.9-1.7-2.9
+					c-0.8,0-1,0.4-1.2,0.6c-0.1-0.2-0.3-1.1-1.3-1.2c-0.8,0-1.2,0.4-1.3,0.7C9.4,4.9,9.2,4.1,8.2,4.1c-0.6,0-0.8,0.1-1,0.4
+					C7,4.1,6.4,0.7,5.3,0.7C4.3,0.7,3.6,2.2,3.6,3z"/>
+			</g>
+			<g>
+				<path id="path-1_1_" d="M3.6,3v5.7H3.5C2.8,8.2,1.8,8.1,1,8.4L0.8,8.5c-0.7,0.3-1,1.1-0.7,1.8l1.2,3c0.2,0.6,0.8,1.4,1.3,1.9
+					L3,15.5c0.3,0.2,0.5,0.5,0.8,0.7l0.1,0.1l0.2,0.2l0.2,0.2c0.1,0.1,0.2,0.2,0.2,0.2v0.2l0,0v1.8h5.3l0.4-0.7l0.4,0.7h2.5V17l0,0
+					v-0.1l0.1-0.2l0.1-0.2l0.1-0.2l0.1-0.3l0.2-0.4l0.2-0.4l0.3-0.6l0.1-0.2c0.4-0.4,0.7-1.4,0.7-2V8c0-0.9-0.3-2.9-1.7-2.9
+					c-0.8,0-1,0.4-1.2,0.6c-0.1-0.2-0.3-1.1-1.3-1.2c-0.8,0-1.2,0.4-1.3,0.7C9.4,4.9,9.2,4.1,8.2,4.1c-0.3,0-0.6,0.4-1,0.5
+					c0,0.2,0.2-2.2-0.2-2.9c-0.2-0.3-0.6-1-1.7-1C4.3,0.7,3.6,2.2,3.6,3z"/>
+			</g>
+		</g>
+		<path id="Path_1_" class="st0" d="M7.2,7.1V6.2c0-0.4,0.3-1.1,1-1.1s0.9,0.7,0.9,1.2c0,1.5,0,0.4,0,1h0.6c0-2.1,0-0.3,0-0.7
+			c0-0.6,0.4-1,1-1s1,0.5,1,1.1c0,0.4,0,0.7,0,0.7h0.6V7.1c0-0.5,0.2-0.9,0.8-0.9c0.7,0,0.9,0.5,1,1.3v1v3.8c0,0.5-0.2,1.1-0.4,1.6
+			l-0.1,0.2l-0.3,0.6L13,15.1l-0.2,0.3l-0.2,0.3L12.4,16c-0.2,0.4-0.3,0.7-0.3,1v0.1V18h-0.9l-0.9-1.9l-1,1.9H5.5v-0.9
+			c0-0.3-0.3-0.6-0.6-1.1l-0.3-0.3l-0.3-0.3l-0.1-0.1L4,15.1l-0.2-0.2l-0.5-0.5c-0.3-0.3-0.8-0.7-1-1.1L2.1,13L1,10
+			C0.9,9.8,1,9.5,1.1,9.4c0,0,0,0,0.1-0.1l0.2-0.1C2.2,8.9,3.1,9.3,3.6,10l0.1,0.1l0.8,1.3V3c0-0.5,0.5-1,1-1s0.9,0.5,0.9,0.9
+			c0,2.7,0,4.1,0,4.2H7.2z"/>
+		<polygon id="Path_2_" points="11.2,10.5 12.2,10.5 12.2,14.2 11.2,14.2 		"/>
+		<polygon id="Path_3_" points="9.3,10.5 10.3,10.5 10.3,14.2 9.3,14.2 		"/>
+		<polygon id="Path_4_" points="7.4,10.5 8.4,10.5 8.4,14.2 7.4,14.2 		"/>
+	</g>
+</g>
+</svg>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg
new file mode 100644
index 0000000000..e70be77d51
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;}
+</style>
+<path class="st0" d="M7.6,7.1V5.8c0-0.4,0.1-0.7,0.4-1c0.2-0.3,0.6-0.4,0.9-0.4l0,0c0.6,0,1.1,0.3,1.5,0.7l0.1,0.1l0,0l0.1-0.1
+	c0.3,0,0.5-0.1,0.7-0.1h0.1c0.6,0,1.1,0.3,1.5,0.7L13,5.8l0,0l0.1-0.1c0.2-0.1,0.3-0.2,0.5-0.2h0.1c0.7,0,1.2,0.3,1.6,0.7l0.1,0.1
+	l0,0l0.1-0.1C15.8,6.1,16,6,16.2,6h0.1c0.6,0,1.1,0.3,1.5,0.7c0.4,0.4,0.6,1,0.6,1.6l0,0V13c0,0.6-0.3,1.6-0.6,2.1
+	c0,0-1.4,2.1-1.4,2.8l0,0v1.6h-1.8l-0.4-1.4l-0.7,1.4H8.6V18c0-0.7-3-2.7-3-2.7c-0.6-0.4-1-1.3-1-2l0,0V9.7c0-0.7,0.3-1.3,0.7-1.8
+	C5.9,7.3,6.8,7,7.6,7.1L7.6,7.1z"/>
+<path class="st1" d="M7.6,7.1V5.8c0-0.4,0.1-0.7,0.4-1c0.2-0.3,0.6-0.4,0.9-0.4l0,0c0.6,0,1.1,0.3,1.5,0.7l0.1,0.1l0,0l0.1-0.1
+	c0.3,0,0.5-0.1,0.7-0.1h0.1c0.6,0,1.1,0.3,1.5,0.7L13,5.8l0,0l0.1-0.1c0.2-0.1,0.3-0.2,0.5-0.2h0.1c0.7,0,1.2,0.3,1.6,0.7l0.1,0.1
+	l0,0l0.1-0.1C15.8,6.1,16,6,16.2,6h0.1c0.6,0,1.1,0.3,1.5,0.7c0.4,0.4,0.6,1,0.6,1.6l0,0V13c0,0.6-0.3,1.6-0.6,2.1
+	c0,0-1.4,2.1-1.4,2.8l0,0v1.6h-1.8l-0.4-1.4l-0.7,1.4H8.6V18c0-0.7-3-2.7-3-2.7c-0.6-0.4-1-1.3-1-2l0,0V9.7c0-0.7,0.3-1.3,0.7-1.8
+	C5.9,7.3,6.8,7,7.6,7.1L7.6,7.1z"/>
+<polygon class="st2" points="11.1,11 12.1,11 12.1,15 11.1,15 "/>
+<polygon class="st2" points="13.1,11 14.1,11 14.1,15 13.1,15 "/>
+<polygon class="st2" points="15.1,11 16.1,11 16.1,15 15.1,15 "/>
+</svg>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
index f9e601fb6d..048758c283 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
@@ -636,5 +636,7 @@
 </qresource>
   <qresource prefix="/Cursors">
     <file alias="Pointer.svg">img/UI20/Cursors/Pointer.svg</file>
+    <file alias="Grab_release.svg">img/UI20/Cursors/Grab_release.svg</file>
+    <file alias="Grabbing.svg">img/UI20/Cursors/Grabbing.svg</file>
   </qresource>
 </RCC>

From bfa964a23edd6bce5f6ae0da11506aa0895f0961 Mon Sep 17 00:00:00 2001
From: sphrose <82213493+sphrose@users.noreply.github.com>
Date: Wed, 21 Apr 2021 10:19:12 +0100
Subject: [PATCH 4/5] Moved TabWidget  grab animation to mouse press to match
 fancy docking behavior, fixed missed mouse up cursor restore

---
 .../AzQtComponents/Components/FancyDocking.cpp    | 15 +++++----------
 .../Components/Widgets/TabWidget.cpp              |  6 ++++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
index bc8da127a6..2fb06a8367 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
@@ -2003,11 +2003,6 @@ namespace AzQtComponents
             clearDraggingState();
         }
 
-        if (QApplication::overrideCursor())
-        {
-            QApplication::restoreOverrideCursor();
-        }
-
         return true;
     }
 
@@ -2385,11 +2380,6 @@ namespace AzQtComponents
      */
     void FancyDocking::dropDockWidget(QDockWidget* dock, QWidget* onto, Qt::DockWidgetArea area)
     {
-        if (QApplication::overrideCursor())
-        {
-            QApplication::restoreOverrideCursor();
-        }                                         
-
         // If the dock widget we are dropping is currently a tab, we need to retrieve it from
         // the tab widget, and remove it as a tab.  We also need to remove its item from our
         // cache of widget <-> tab container since we are moving it somewhere else.
@@ -3573,6 +3563,11 @@ namespace AzQtComponents
      */
     void FancyDocking::clearDraggingState()
     {
+        if (QApplication::overrideCursor())
+        {
+            QApplication::restoreOverrideCursor();
+        }
+
         m_ghostWidget->hide();
 
         // Release the mouse and keyboard from our main window since we grab them when we start dragging
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
index 121f35db61..a0006d7979 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
@@ -464,6 +464,11 @@ namespace AzQtComponents
     {
         if (mouseEvent->buttons() & Qt::LeftButton)
         {
+            if (!QApplication::overrideCursor() || *QApplication::overrideCursor() != m_dragCursor)
+            {
+                QApplication::setOverrideCursor(m_dragCursor);
+            }
+
             m_lastMousePress = mouseEvent->pos();
         }
 
@@ -478,6 +483,7 @@ namespace AzQtComponents
             // selected tab is moved around. The close button is not explicitly rendered for the
             // moved tab during this operation. We need to make sure not to set it visible again
             // while the tab is moving. This flag makes sure it happens.
+
             m_movingTab = true;
         }
 

From d1eae23347c095333ed5c83a934a407de192d9c2 Mon Sep 17 00:00:00 2001
From: sphrose <82213493+sphrose@users.noreply.github.com>
Date: Mon, 10 May 2021 17:26:46 +0100
Subject: [PATCH 5/5] reduced cursor size.

---
 .../Components/FancyDocking.cpp               |  2 +-
 .../Components/Widgets/TabWidget.cpp          |  4 +-
 .../img/UI20/Cursors/Grab_release.svg         | 40 +++++++++----------
 .../Components/img/UI20/Cursors/Grabbing.svg  | 40 +++++++++++--------
 4 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
index b89a220b1a..1a7512a4fc 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
@@ -160,7 +160,7 @@ namespace AzQtComponents
         QObject::connect(m_dropZoneHoverFadeInTimer, &QTimer::timeout, this, &FancyDocking::onDropZoneHoverFadeInUpdate);
         m_dropZoneHoverFadeInTimer->setInterval(g_FancyDockingConstants.dropZoneHoverFadeUpdateIntervalMS);
         QIcon dragIcon = QIcon(QStringLiteral(":/Cursors/Grabbing.svg"));
-        m_dragCursor = QCursor(dragIcon.pixmap(32), 10, 5);
+        m_dragCursor = QCursor(dragIcon.pixmap(16), 5, 2);
     }
 
     FancyDocking::~FancyDocking()
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
index a0006d7979..48fb47d7e6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
@@ -422,10 +422,10 @@ namespace AzQtComponents
         AzQtComponents::Style::addClass(this, g_emptyStyleClass);
 
         QIcon icon = QIcon(QStringLiteral(":/Cursors/Grab_release.svg"));
-        m_hoverCursor = QCursor(icon.pixmap(32), 10, 5);
+        m_hoverCursor = QCursor(icon.pixmap(16), 5, 2);
 
         icon = QIcon(QStringLiteral(":/Cursors/Grabbing.svg"));
-        m_dragCursor = QCursor(icon.pixmap(32), 10, 5);
+        m_dragCursor = QCursor(icon.pixmap(16), 5, 2);
 
         this->setCursor(m_hoverCursor);                                  
     }
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg
index c0da9b802f..ad89e7d1b1 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grab_release.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
 <style type="text/css">
@@ -9,29 +9,29 @@
 	<g id="Group" transform="translate(3.366335, 2.000000)">
 		<g id="Path">
 			<g>
-				<path id="path-1" d="M3.6,3v5.7H3.5C2.8,8.2,1.8,8.1,1,8.4L0.8,8.5c-0.7,0.3-1,1.1-0.7,1.8l1.2,3c0.2,0.6,0.8,1.4,1.3,1.9
-					L3,15.5c0.3,0.2,0.5,0.5,0.8,0.7l0.1,0.1l0.2,0.2l0.2,0.2C4.4,16.9,4.5,17,4.5,17v0.1l0,0v1.8h5.3l0.4-0.7l0.4,0.7h2.5V17l0,0
-					v-0.1l0.1-0.2l0.1-0.2l0.1-0.2l0.1-0.3l0.2-0.4l0.2-0.4l0.3-0.6l0.1-0.2c0.4-0.4,0.7-1.4,0.7-2V8c0-0.9-0.3-2.9-1.7-2.9
-					c-0.8,0-1,0.4-1.2,0.6c-0.1-0.2-0.3-1.1-1.3-1.2c-0.8,0-1.2,0.4-1.3,0.7C9.4,4.9,9.2,4.1,8.2,4.1c-0.6,0-0.8,0.1-1,0.4
-					C7,4.1,6.4,0.7,5.3,0.7C4.3,0.7,3.6,2.2,3.6,3z"/>
+				<path id="path-1" d="M2.4,1v7.5H2.2C1.3,7.9,0,7.8-1.1,8.2l-0.3,0.1c-0.9,0.4-1.3,1.5-0.9,2.4l1.6,4c0.3,0.8,1.1,1.8,1.7,2.5
+					l0.5,0.4c0.4,0.3,0.7,0.7,1.1,0.9l0.1,0.1L3,18.8l0.3,0.3c0.1,0.3,0.3,0.4,0.3,0.4v0.1l0,0V22h7l0.5-0.9l0.5,0.9h3.3v-2.5l0,0
+					v-0.1l0.1-0.3l0.1-0.3l0.1-0.3l0.1-0.4l0.3-0.5l0.3-0.5l0.4-0.8l0.1-0.3c0.5-0.5,0.9-1.8,0.9-2.6V7.6c0-1.2-0.4-3.8-2.2-3.8
+					c-1.1,0-1.3,0.5-1.6,0.8c-0.1-0.3-0.4-1.5-1.7-1.6c-1.1,0-1.6,0.5-1.7,0.9C10,3.5,9.7,2.5,8.4,2.5C7.6,2.5,7.4,2.6,7.1,3
+					C6.8,2.5,6.1-2,4.6-2C3.3-2,2.4,0,2.4,1z"/>
 			</g>
 			<g>
-				<path id="path-1_1_" d="M3.6,3v5.7H3.5C2.8,8.2,1.8,8.1,1,8.4L0.8,8.5c-0.7,0.3-1,1.1-0.7,1.8l1.2,3c0.2,0.6,0.8,1.4,1.3,1.9
-					L3,15.5c0.3,0.2,0.5,0.5,0.8,0.7l0.1,0.1l0.2,0.2l0.2,0.2c0.1,0.1,0.2,0.2,0.2,0.2v0.2l0,0v1.8h5.3l0.4-0.7l0.4,0.7h2.5V17l0,0
-					v-0.1l0.1-0.2l0.1-0.2l0.1-0.2l0.1-0.3l0.2-0.4l0.2-0.4l0.3-0.6l0.1-0.2c0.4-0.4,0.7-1.4,0.7-2V8c0-0.9-0.3-2.9-1.7-2.9
-					c-0.8,0-1,0.4-1.2,0.6c-0.1-0.2-0.3-1.1-1.3-1.2c-0.8,0-1.2,0.4-1.3,0.7C9.4,4.9,9.2,4.1,8.2,4.1c-0.3,0-0.6,0.4-1,0.5
-					c0,0.2,0.2-2.2-0.2-2.9c-0.2-0.3-0.6-1-1.7-1C4.3,0.7,3.6,2.2,3.6,3z"/>
+				<path id="path-1_1_" d="M2.4,1v7.5H2.2C1.3,7.9,0,7.8-1.1,8.2l-0.3,0.1c-0.9,0.4-1.3,1.5-0.9,2.4l1.6,4c0.3,0.8,1.1,1.8,1.7,2.5
+					l0.5,0.4c0.4,0.3,0.7,0.7,1.1,0.9l0.1,0.1L3,18.8l0.3,0.3c0.1,0.1,0.3,0.3,0.3,0.3v0.3l0,0V22h7l0.5-0.9l0.5,0.9h3.3v-2.5l0,0
+					v-0.1l0.1-0.3l0.1-0.3l0.1-0.3l0.1-0.4l0.3-0.5l0.3-0.5l0.4-0.8l0.1-0.3c0.5-0.5,0.9-1.8,0.9-2.6V7.6c0-1.2-0.4-3.8-2.2-3.8
+					c-1.1,0-1.3,0.5-1.6,0.8c-0.1-0.3-0.4-1.5-1.7-1.6c-1.1,0-1.6,0.5-1.7,0.9C10,3.5,9.7,2.5,8.4,2.5C8,2.5,7.6,3,7.1,3.1
+					c0,0.3,0.3-2.9-0.3-3.8C6.6-1.1,6.1-2,4.6-2C3.3-2,2.4,0,2.4,1z"/>
 			</g>
 		</g>
-		<path id="Path_1_" class="st0" d="M7.2,7.1V6.2c0-0.4,0.3-1.1,1-1.1s0.9,0.7,0.9,1.2c0,1.5,0,0.4,0,1h0.6c0-2.1,0-0.3,0-0.7
-			c0-0.6,0.4-1,1-1s1,0.5,1,1.1c0,0.4,0,0.7,0,0.7h0.6V7.1c0-0.5,0.2-0.9,0.8-0.9c0.7,0,0.9,0.5,1,1.3v1v3.8c0,0.5-0.2,1.1-0.4,1.6
-			l-0.1,0.2l-0.3,0.6L13,15.1l-0.2,0.3l-0.2,0.3L12.4,16c-0.2,0.4-0.3,0.7-0.3,1v0.1V18h-0.9l-0.9-1.9l-1,1.9H5.5v-0.9
-			c0-0.3-0.3-0.6-0.6-1.1l-0.3-0.3l-0.3-0.3l-0.1-0.1L4,15.1l-0.2-0.2l-0.5-0.5c-0.3-0.3-0.8-0.7-1-1.1L2.1,13L1,10
-			C0.9,9.8,1,9.5,1.1,9.4c0,0,0,0,0.1-0.1l0.2-0.1C2.2,8.9,3.1,9.3,3.6,10l0.1,0.1l0.8,1.3V3c0-0.5,0.5-1,1-1s0.9,0.5,0.9,0.9
-			c0,2.7,0,4.1,0,4.2H7.2z"/>
-		<polygon id="Path_2_" points="11.2,10.5 12.2,10.5 12.2,14.2 11.2,14.2 		"/>
-		<polygon id="Path_3_" points="9.3,10.5 10.3,10.5 10.3,14.2 9.3,14.2 		"/>
-		<polygon id="Path_4_" points="7.4,10.5 8.4,10.5 8.4,14.2 7.4,14.2 		"/>
+		<path id="Path_1_" class="st0" d="M7.1,6.4V5.3c0-0.5,0.4-1.5,1.3-1.5s1.2,0.9,1.2,1.6c0,2,0,0.5,0,1.3h0.8c0-2.8,0-0.4,0-0.9
+			c0-0.8,0.5-1.3,1.3-1.3S13,5.1,13,5.9c0,0.5,0,0.9,0,0.9h0.8V6.4c0-0.7,0.3-1.2,1.1-1.2c0.9,0,1.2,0.7,1.3,1.7v1.3v5
+			c0,0.7-0.3,1.5-0.5,2.1l-0.1,0.3l-0.4,0.8L14.8,17l-0.3,0.4l-0.3,0.4L14,18.2c-0.3,0.5-0.4,0.9-0.4,1.3v0.1v1.2h-1.2l-1.2-2.5
+			l-1.3,2.5h-5v-1.2c0-0.4-0.4-0.8-0.8-1.5l-0.4-0.4l-0.4-0.4l-0.1-0.1L2.9,17l-0.3-0.3L2,16.1c-0.4-0.4-1.1-0.9-1.3-1.5l-0.3-0.4
+			l-1.5-4c-0.1-0.3,0-0.7,0.1-0.8c0,0,0,0,0.1-0.1l0.3-0.1c1.1-0.4,2.2,0.1,2.9,1.1l0.1,0.1l1.1,1.7V1c0-0.7,0.7-1.3,1.3-1.3
+			s1.2,0.7,1.2,1.2c0,3.6,0,5.4,0,5.5H7.1z"/>
+		<polygon id="Path_2_" points="12.4,10.9 13.7,10.9 13.7,15.8 12.4,15.8 		"/>
+		<polygon id="Path_3_" points="9.9,10.9 11.2,10.9 11.2,15.8 9.9,15.8 		"/>
+		<polygon id="Path_4_" points="7.4,10.9 8.7,10.9 8.7,15.8 7.4,15.8 		"/>
 	</g>
 </g>
 </svg>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg
index e70be77d51..96de4e997b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cursors/Grabbing.svg
@@ -1,23 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:none;stroke:#000000;stroke-miterlimit:10;}
-	.st2{fill-rule:evenodd;clip-rule:evenodd;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;}
 </style>
-<path class="st0" d="M7.6,7.1V5.8c0-0.4,0.1-0.7,0.4-1c0.2-0.3,0.6-0.4,0.9-0.4l0,0c0.6,0,1.1,0.3,1.5,0.7l0.1,0.1l0,0l0.1-0.1
-	c0.3,0,0.5-0.1,0.7-0.1h0.1c0.6,0,1.1,0.3,1.5,0.7L13,5.8l0,0l0.1-0.1c0.2-0.1,0.3-0.2,0.5-0.2h0.1c0.7,0,1.2,0.3,1.6,0.7l0.1,0.1
-	l0,0l0.1-0.1C15.8,6.1,16,6,16.2,6h0.1c0.6,0,1.1,0.3,1.5,0.7c0.4,0.4,0.6,1,0.6,1.6l0,0V13c0,0.6-0.3,1.6-0.6,2.1
-	c0,0-1.4,2.1-1.4,2.8l0,0v1.6h-1.8l-0.4-1.4l-0.7,1.4H8.6V18c0-0.7-3-2.7-3-2.7c-0.6-0.4-1-1.3-1-2l0,0V9.7c0-0.7,0.3-1.3,0.7-1.8
-	C5.9,7.3,6.8,7,7.6,7.1L7.6,7.1z"/>
-<path class="st1" d="M7.6,7.1V5.8c0-0.4,0.1-0.7,0.4-1c0.2-0.3,0.6-0.4,0.9-0.4l0,0c0.6,0,1.1,0.3,1.5,0.7l0.1,0.1l0,0l0.1-0.1
-	c0.3,0,0.5-0.1,0.7-0.1h0.1c0.6,0,1.1,0.3,1.5,0.7L13,5.8l0,0l0.1-0.1c0.2-0.1,0.3-0.2,0.5-0.2h0.1c0.7,0,1.2,0.3,1.6,0.7l0.1,0.1
-	l0,0l0.1-0.1C15.8,6.1,16,6,16.2,6h0.1c0.6,0,1.1,0.3,1.5,0.7c0.4,0.4,0.6,1,0.6,1.6l0,0V13c0,0.6-0.3,1.6-0.6,2.1
-	c0,0-1.4,2.1-1.4,2.8l0,0v1.6h-1.8l-0.4-1.4l-0.7,1.4H8.6V18c0-0.7-3-2.7-3-2.7c-0.6-0.4-1-1.3-1-2l0,0V9.7c0-0.7,0.3-1.3,0.7-1.8
-	C5.9,7.3,6.8,7,7.6,7.1L7.6,7.1z"/>
-<polygon class="st2" points="11.1,11 12.1,11 12.1,15 11.1,15 "/>
-<polygon class="st2" points="13.1,11 14.1,11 14.1,15 13.1,15 "/>
-<polygon class="st2" points="15.1,11 16.1,11 16.1,15 15.1,15 "/>
+<g>
+	<path class="st0" d="M5.3,4.2V2.2c0-0.6,0.2-1.1,0.6-1.6C6.3,0.1,6.9,0,7.4,0l0,0c1,0,1.7,0.5,2.4,1.1l0.2,0.2l0,0l0.2-0.2
+		c0.5,0,0.8-0.2,1.1-0.2h0.2c1,0,1.7,0.5,2.4,1.1l0.2,0.2l0,0L14,2c0.3-0.2,0.5-0.3,0.8-0.3H15c1.1,0,1.9,0.5,2.5,1.1L17.7,3l0,0
+		l0.2-0.2c0.5-0.2,0.8-0.3,1.1-0.3h0.2c1,0,1.7,0.5,2.4,1.1c0.6,0.6,1,1.6,1,2.5l0,0v7.5c0,1-0.5,2.5-1,3.3c0,0-2.2,3.3-2.2,4.5l0,0
+		V24h-2.9l-0.6-2.2L14.7,24H6.9v-2.4c0-1.1-4.8-4.3-4.8-4.3c-1-0.6-1.6-2.1-1.6-3.2l0,0V8.4c0-1.1,0.5-2.1,1.1-2.9
+		C2.6,4.6,4,4.1,5.3,4.2L5.3,4.2z"/>
+	<g>
+		<path d="M7.4,1C7.9,1,8.5,1.2,9,1.8l0.2,0.2l0.7,0.7L10.5,2C10.7,2,10.8,2,11,1.9c0.1,0,0.2,0,0.2,0h0.2c0.6,0,1.1,0.3,1.7,0.8
+			l0.2,0.2l0.7,0.7l0.7-0.7l0.1-0.1c0,0,0.1,0,0.1-0.1c0,0,0.1,0,0.1-0.1H15c0.7,0,1.3,0.3,1.8,0.8L17,3.7l0.7,0.7l0.7-0.7
+			c0.1,0,0.1,0,0.2-0.1c0.1-0.1,0.4-0.1,0.4-0.1h0.2c0.6,0,1.1,0.3,1.7,0.8c0.4,0.4,0.7,1.1,0.7,1.8v7.5c0,0.7-0.4,2.2-0.8,2.8
+			c-0.7,1.1-2.4,3.7-2.4,5V23h-1.1l-0.4-1.5L16,19l-1.1,2.3L14.1,23H7.9v-1.4c0-0.4,0-1.6-5.2-5.1C2.1,16,1.5,15,1.5,14.1V8.4
+			c0-0.7,0.3-1.5,0.9-2.2c0.6-0.6,1.5-1,2.4-1c0.1,0,0.2,0,0.4,0l1.1,0.1V4.2V2.2c0-0.4,0.1-0.6,0.3-0.9l0.1-0.1l0.1-0.1
+			C6.8,1,7.1,1,7.4,1 M14.9,2.7L14.9,2.7L14.9,2.7 M7.4,0C6.9,0,6.3,0.1,5.9,0.6c-0.5,0.5-0.6,1-0.6,1.6v2.1c-0.2,0-0.3,0-0.5,0
+			c-1.1,0-2.3,0.5-3.2,1.3C1,6.3,0.5,7.3,0.5,8.4v5.7c0,1.1,0.6,2.5,1.6,3.2c0,0,4.8,3.2,4.8,4.3V24h7.8l1.1-2.2l0.6,2.2h2.9v-2.5
+			c0-1.1,2.2-4.5,2.2-4.5c0.5-0.8,1-2.4,1-3.3V6.1c0-1-0.3-1.9-1-2.5c-0.6-0.6-1.4-1.1-2.4-1.1H19c-0.3,0-0.6,0.2-1.1,0.3L17.7,3
+			l-0.2-0.2c-0.6-0.6-1.4-1.1-2.5-1.1h-0.2c-0.3,0-0.5,0.2-0.8,0.3l-0.2,0.2L13.7,2c-0.6-0.6-1.4-1.1-2.4-1.1h-0.2
+			c-0.3,0-0.6,0.2-1.1,0.2L9.9,1.2L9.8,1.1C9.1,0.4,8.3,0,7.4,0L7.4,0z"/>
+	</g>
+	<polygon class="st1" points="10.9,10.4 12.5,10.4 12.5,16.8 10.9,16.8 	"/>
+	<polygon class="st1" points="14,10.4 15.6,10.4 15.6,16.8 14,16.8 	"/>
+	<polygon class="st1" points="17.2,10.4 18.8,10.4 18.8,16.8 17.2,16.8 	"/>
+</g>
 </svg>