diff --git a/components/mobileshell/qml/components/ExtendedAbstractButton.qml b/components/mobileshell/qml/components/ExtendedAbstractButton.qml
index c184b267..78fdb0eb 100644
--- a/components/mobileshell/qml/components/ExtendedAbstractButton.qml
+++ b/components/mobileshell/qml/components/ExtendedAbstractButton.qml
@@ -45,6 +45,6 @@ QQC2.AbstractButton {
     HoverHandler {
         id: hoverHandler
         acceptedDevices: PointerDevice.Mouse
-        acceptedPointerTypes: PointerDevice.Generic
+        acceptedPointerTypes: PointerDevice.GenericPointer
     }
 }
diff --git a/containments/homescreens/halcyon/package/contents/ui/DrawerListDelegate.qml b/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml
similarity index 100%
rename from containments/homescreens/halcyon/package/contents/ui/DrawerListDelegate.qml
rename to containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml
diff --git a/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml b/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml
index 4e39e956..92f6b3cc 100644
--- a/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml
+++ b/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml
@@ -73,12 +73,12 @@ GridView {
     
     delegate: MobileShell.BaseItem {
         id: baseItem
-        readonly property bool isLeftColumn: !root.twoColumn || (root.count % model.index !== 0)
-        readonly property bool isRightColumn: !root.twoColumn || (root.count % model.index === 0)
+        readonly property bool isLeftColumn: !root.twoColumn || ((model.index % 2) === 0)
+        readonly property bool isRightColumn: !root.twoColumn || ((model.index % 2) !== 0)
         leftPadding: isLeftColumn ? root.leftMargin : 0
         rightPadding: isRightColumn ? root.rightMargin : 0
         
-        contentItem: DrawerListDelegate {
+        contentItem: FavoritesAppDelegate {
             implicitWidth: root.cellWidth - (baseItem.isLeftColumn ? root.leftMargin : 0) - (baseItem.isRightColumn ? root.rightMargin : 0)
             implicitHeight: visible ? root.cellHeight : 0
         }