diff --git a/TODO.md b/TODO.md
index 7461a543..5a304a0d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -20,6 +20,7 @@
   - Create room tabs brutal size transition
 
 - Refactoring
+  - Use `.pragma library` for utils.js
   - Room header elide detection
   - Use HBox for Profile
   - Banners
diff --git a/src/qml/Base/HListView.qml b/src/qml/Base/HListView.qml
index 610370cf..cce152a8 100644
--- a/src/qml/Base/HListView.qml
+++ b/src/qml/Base/HListView.qml
@@ -29,25 +29,30 @@ ListView {
         visible: listView.interactive || ! listView.enableFlicking
     }
 
+    // FIXME: HOpacityAnimator creates flickering
+
     add: Transition {
         ParallelAnimation {
-            HOpacityAnimator { from: 0; to: 1 }
-            HNumberAnimation { properties: "x,y"; from: 100 }
+            HNumberAnimation { property: "opacity"; from: 0; to: 1 }
+            HXAnimator { from: 100 }
+            HYAnimator { from: 100 }
         }
     }
 
     move: Transition {
         ParallelAnimation {
             // Ensure opacity goes to 1 if add/remove transition is interrupted
-            HOpacityAnimator { to: 1 }
-            HNumberAnimation { properties: "x,y" }
+            HNumberAnimation { property: "opacity"; to: 1 }
+            HXAnimator {}
+            HYAnimator {}
         }
     }
 
     remove: Transition {
         ParallelAnimation {
-            HOpacityAnimator { to: 0 }
-            HNumberAnimation { properties: "x,y"; to: 100 }
+            HNumberAnimation { property: "opacity"; to: 0 }
+            HXAnimator { to: 100 }
+            HYAnimator { to: 100 }
         }
     }