diff --git a/components/TitleBar.qml b/components/TitleBar.qml
index aa793985..bcbc0e64 100644
--- a/components/TitleBar.qml
+++ b/components/TitleBar.qml
@@ -41,6 +41,7 @@ Rectangle {
     y: -height
     property string title
     property alias maximizeButtonVisible: maximizeButton.visible
+    z: 1
 
     Text {
         anchors.centerIn: parent
@@ -52,28 +53,26 @@ Rectangle {
         visible: customDecorations
     }
 
-    Behavior on y {
-        NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-    }
-
     Rectangle {
         id: goToBasicVersionButton
         property bool containsMouse: titleBar.mouseX >= x && titleBar.mouseX <= x + width
         property bool checked: false
         anchors.top: parent.top
         anchors.left: parent.left
-        color:  containsMouse || checked ? "#FFE00A" : "#000000"
+        color:  basicMouseArea.containsMouse || checked ? "#FFE00A" : "#000000"
         height: 30
         width: height
 
         Image {
             anchors.centerIn: parent
             rotation: parent.checked ? 180 : 0
-            source: parent.containsMouse || parent.checked ? "../images/goToBasicVersionHovered.png" :
+            source: parent.customDecorations || parent.checked ? "../images/goToBasicVersionHovered.png" :
                                                              "../images/gotoBasicVersion.png"
         }
 
         MouseArea {
+            id: basicMouseArea
+            hoverEnabled: true
             anchors.fill: parent
             onClicked: {
                 parent.checked = !parent.checked
diff --git a/main.qml b/main.qml
index fe1a8036..e082ca2e 100644
--- a/main.qml
+++ b/main.qml
@@ -1046,19 +1046,15 @@ ApplicationWindow {
                 properties: "visible"
                 value: false
             }
-            NumberAnimation {
+            PropertyAction {
                 target: appWindow
                 properties: "height"
-                to: 30
-                easing.type: Easing.InCubic
-                duration: 200
+                value: 30
             }
-            NumberAnimation {
+            PropertyAction {
                 target: appWindow
                 properties: "width"
-                to: 470
-                easing.type: Easing.InCubic
-                duration: 200
+                value: 470
             }
             PropertyAction {
                 targets: [leftPanel, rightPanel]
@@ -1071,12 +1067,10 @@ ApplicationWindow {
                 value: true
             }
 
-            NumberAnimation {
+            PropertyAction {
                 target: appWindow
                 properties: "height"
-                to: middlePanel.height
-                easing.type: Easing.InCubic
-                duration: 200
+                value: middlePanel.height
             }
 
             onStopped: {
@@ -1088,12 +1082,10 @@ ApplicationWindow {
 
         SequentialAnimation {
             id: goToProAnimation
-            NumberAnimation {
+            PropertyAction {
                 target: appWindow
                 properties: "height"
-                to: 30
-                easing.type: Easing.InCubic
-                duration: 200
+                value: 30
             }
             PropertyAction {
                 target: middlePanel
@@ -1105,19 +1097,15 @@ ApplicationWindow {
                 properties: "visible"
                 value: true
             }
-            NumberAnimation {
+            PropertyAction {
                 target: appWindow
                 properties: "width"
-                to: rightPanelExpanded ? 1269 : 1269 - 300
-                easing.type: Easing.InCubic
-                duration: 200
+                value: rightPanelExpanded ? 1269 : 1269 - 300
             }
-            NumberAnimation {
+            PropertyAction {
                 target: appWindow
                 properties: "height"
-                to: maxWindowHeight
-                easing.type: Easing.InCubic
-                duration: 200
+                value: maxWindowHeight
             }
             PropertyAction {
                 target: frameArea