diff --git a/lib/components/Playlist/PlaylistCreateDialog.dart b/lib/components/Playlist/PlaylistCreateDialog.dart
index 30b52c68b..15503f17f 100644
--- a/lib/components/Playlist/PlaylistCreateDialog.dart
+++ b/lib/components/Playlist/PlaylistCreateDialog.dart
@@ -75,15 +75,15 @@ class PlaylistCreateDialog extends HookConsumerWidget {
                         maxLines: 5,
                       ),
                       const SizedBox(height: 10),
-                      CheckboxListTile(
+                      PlatformCheckbox(
                         value: public.value,
-                        title: const PlatformText("Public"),
+                        label: const PlatformText("Public"),
                         onChanged: (val) => public.value = val ?? false,
                       ),
                       const SizedBox(height: 10),
-                      CheckboxListTile(
+                      PlatformCheckbox(
                         value: collaborative.value,
-                        title: const PlatformText("Collaborative"),
+                        label: const PlatformText("Collaborative"),
                         onChanged: (val) => collaborative.value = val ?? false,
                       ),
                     ],
diff --git a/lib/components/Shared/TrackTile.dart b/lib/components/Shared/TrackTile.dart
index e9ab605a8..8ecdadd90 100644
--- a/lib/components/Shared/TrackTile.dart
+++ b/lib/components/Shared/TrackTile.dart
@@ -137,10 +137,8 @@ class TrackTile extends HookConsumerWidget {
                             itemCount: snapshot.data!.length,
                             itemBuilder: (context, index) {
                               final playlist = snapshot.data!.elementAt(index);
-                              return CheckboxListTile(
-                                title: PlatformText(playlist.name!),
-                                controlAffinity:
-                                    ListTileControlAffinity.leading,
+                              return PlatformCheckbox(
+                                label: PlatformText(playlist.name!),
                                 value:
                                     playlistsCheck.value[playlist.id] ?? false,
                                 onChanged: (val) {
@@ -181,7 +179,7 @@ class TrackTile extends HookConsumerWidget {
         child: Row(
           children: [
             if (showCheck)
-              Checkbox(
+              PlatformCheckbox(
                 value: isChecked,
                 onChanged: (s) => onCheckChange?.call(s),
               )
diff --git a/lib/components/Shared/TracksTableView.dart b/lib/components/Shared/TracksTableView.dart
index 1dca965fb..4dea4e047 100644
--- a/lib/components/Shared/TracksTableView.dart
+++ b/lib/components/Shared/TracksTableView.dart
@@ -68,7 +68,7 @@ class TracksTableView extends HookConsumerWidget {
             if (heading != null) heading!,
             Row(
               children: [
-                Checkbox(
+                PlatformCheckbox(
                   value: selected.value.length == sortedTracks.length,
                   onChanged: (checked) {
                     if (!showCheck.value) showCheck.value = true;
diff --git a/lib/main.dart b/lib/main.dart
index 73df95998..c64ced901 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -199,7 +199,7 @@ class SpotubeState extends ConsumerState<Spotube> with WidgetsBindingObserver {
       };
     }, []);
 
-    platform = TargetPlatform.macOS;
+    platform = TargetPlatform.android;
 
     return PlatformApp.router(
       routeInformationParser: router.routeInformationParser,