diff --git a/lib/widgets/list_items/chat_list_item.dart b/lib/widgets/list_items/chat_list_item.dart
index c0a48889..084d5ef3 100644
--- a/lib/widgets/list_items/chat_list_item.dart
+++ b/lib/widgets/list_items/chat_list_item.dart
@@ -17,7 +17,6 @@ import '../avatar.dart';
 import '../../pages/send_file_dialog.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import '../matrix.dart';
-import '../mouse_over_builder.dart';
 
 enum ArchivedRoomAction { delete, rejoin }
 
@@ -152,20 +151,17 @@ class ChatListItem extends StatelessWidget {
         color: FluffyThemes.chatListItemColor(context, activeChat, selected),
         child: ListTile(
           onLongPress: onLongPress,
-          leading: MouseOverBuilder(
-            builder: (context, hover) =>
-                onLongPress != null && (hover || selected)
-                    ? Container(
-                        width: Avatar.defaultSize,
-                        height: Avatar.defaultSize,
-                        alignment: Alignment.center,
-                        child: Checkbox(
-                          value: selected,
-                          onChanged: (_) => onLongPress(),
-                        ),
-                      )
-                    : Avatar(room.avatar, room.displayname),
-          ),
+          leading: selected
+              ? Container(
+                  width: Avatar.defaultSize,
+                  height: Avatar.defaultSize,
+                  child: Material(
+                    color: Theme.of(context).primaryColor,
+                    borderRadius: BorderRadius.circular(Avatar.defaultSize),
+                    child: Icon(Icons.check, color: Colors.white),
+                  ),
+                )
+              : Avatar(room.avatar, room.displayname, onTap: onLongPress),
           title: Row(
             children: <Widget>[
               Expanded(
diff --git a/lib/widgets/mouse_over_builder.dart b/lib/widgets/mouse_over_builder.dart
deleted file mode 100644
index 017eddcd..00000000
--- a/lib/widgets/mouse_over_builder.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:flutter/material.dart';
-
-class MouseOverBuilder extends StatefulWidget {
-  final Function(BuildContext, bool) builder;
-
-  const MouseOverBuilder({Key key, this.builder}) : super(key: key);
-  @override
-  _MouseOverBuilderState createState() => _MouseOverBuilderState();
-}
-
-class _MouseOverBuilderState extends State<MouseOverBuilder> {
-  bool _hover = false;
-
-  void _toggleHover(bool hover) {
-    if (_hover != hover) {
-      setState(() => _hover = hover);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MouseRegion(
-      onEnter: (_) => _toggleHover(true),
-      onExit: (_) => _toggleHover(false),
-      child: widget.builder != null ? widget.builder(context, _hover) : null,
-    );
-  }
-}