diff --git a/qml/components/PollPreview.qml b/qml/components/PollPreview.qml
index 11aa8cc..fbb3171 100644
--- a/qml/components/PollPreview.qml
+++ b/qml/components/PollPreview.qml
@@ -46,7 +46,7 @@ Item {
     property Item messageItem
     height: pollColumn.height
     opacity: 0
-    Behavior on opacity { FadeAnimator {} }
+    Behavior on opacity { FadeAnimation {} }
     function handleChoose(index) {
         if(!pollData.type.allow_multiple_answers) {
             chosenIndexes = [index];
@@ -233,7 +233,7 @@ Item {
                 IconButton {
                     visible: !pollData.is_closed && pollMessageComponent.chosenIndexes.length > 0 && pollData.type.allow_multiple_answers  && !pollMessageComponent.hasAnswered
                     opacity: visible ? 1.0 : 0.0
-                    Behavior on opacity { NumberAnimation {}}
+                    Behavior on opacity { FadeAnimation {}}
                     icon.source: "image://theme/icon-m-send"
                     onClicked: {
                         pollMessageComponent.sendResponse()
diff --git a/qml/pages/PollCreationPage.qml b/qml/pages/PollCreationPage.qml
index 4b00a5e..3f630ac 100644
--- a/qml/pages/PollCreationPage.qml
+++ b/qml/pages/PollCreationPage.qml
@@ -144,8 +144,8 @@ Dialog {
                 height: pollCreationPage.validationErrorsVisible ? visibleHeight : 0
                 clip: true;
                 opacity: pollCreationPage.validationErrorsVisible ? 1.0 : 0.0
-                Behavior on opacity { PropertyAnimation {duration: 500; easing.type: Easing.InOutCubic}}
-                Behavior on height { PropertyAnimation {duration: 200; easing.type: Easing.InOutCubic}}
+                Behavior on opacity { FadeAnimation {} }
+                Behavior on height { NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
                 Rectangle {
                     color: Theme.rgba(Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity)
                     anchors.fill: parent
@@ -216,10 +216,9 @@ Dialog {
                 move: Transition {
                     NumberAnimation { properties: "y"; duration: 200; easing.type: Easing.InOutCubic }
                 }
-                Behavior on height { PropertyAnimation {duration: 200; easing.type: Easing.InOutCubic}}
+                Behavior on height { NumberAnimation {duration: 200; easing.type: Easing.InOutCubic}}
                 Repeater {
                     model: pollCreationPage.options
-
                     delegate: Row {
                         width: parent.width
                         BackgroundItem {
@@ -230,8 +229,8 @@ Dialog {
                             property bool checked: pollCreationPage.correctOption === index
                             enabled: pollCreationPage.quiz
                             opacity: enabled ? (checked ? 1.0 : 0.5) : 0.0
-                            Behavior on opacity { PropertyAnimation {duration: 500; easing.type: Easing.InOutCubic}}
-                            Behavior on width { PropertyAnimation {duration: 500; easing.type: Easing.InOutCubic}}
+                            Behavior on opacity { FadeAnimation {} }
+                            Behavior on width { NumberAnimation {duration: 500; easing.type: Easing.InOutQuad}}
                             Icon {
                                 source: "image://theme/icon-m-accept"
                                 anchors.centerIn: parent
@@ -240,14 +239,13 @@ Dialog {
                                 pollCreationPage.correctOption = index
                                 validate();
                             }
-
                         }
 
                         TextField {
                             id: answerTextArea
                             textMargin: Theme.paddingSmall
                             width: answerCorrectBackgroundItem.enabled ? parent.width - Theme.itemSizeSmall * 2 : parent.width - Theme.itemSizeSmall
-                            Behavior on width { PropertyAnimation {duration: 500; easing.type: Easing.InOutCubic}}
+                            Behavior on width { NumberAnimation {duration: 500; easing.type: Easing.InOutCubic}}
                             text: model.text
                             onTextChanged: {
                                 pollCreationPage.options.setProperty(index, "text", text)