diff --git a/lib/ui/page/home/home.dart b/lib/ui/page/home/home.dart
index a096cb4..b8af6df 100644
--- a/lib/ui/page/home/home.dart
+++ b/lib/ui/page/home/home.dart
@@ -1,4 +1,5 @@
 import 'package:annix/providers.dart';
+import 'package:annix/ui/dialogs/loading.dart';
 import 'package:annix/ui/page/favorite.dart';
 import 'package:annix/ui/page/home/home_playlist.dart';
 import 'package:annix/ui/page/playback_history.dart';
@@ -37,6 +38,25 @@ class HomePage extends HookWidget {
                 floating: true,
                 title: const Text('Annix'),
                 actions: [
+                  Consumer(
+                    child: const Icon(Icons.shuffle),
+                    builder: (context, ref, child) {
+                      return IconButton(
+                        icon: child!,
+                        onPressed: () {
+                          showLoadingDialog(context);
+                          ref.read(playbackProvider).fullShuffleMode().then(
+                            (final value) {
+                              if (context.mounted) {
+                                Navigator.of(context, rootNavigator: true)
+                                    .pop();
+                              }
+                            },
+                          );
+                        },
+                      );
+                    },
+                  ),
                   const ThemeButton(),
                   IconButton(
                     icon: const Icon(Icons.settings_outlined),
diff --git a/lib/ui/page/home/home_action_grid.dart b/lib/ui/page/home/home_action_grid.dart
deleted file mode 100644
index 8122569..0000000
--- a/lib/ui/page/home/home_action_grid.dart
+++ /dev/null
@@ -1,93 +0,0 @@
-import 'package:annix/providers.dart';
-import 'package:annix/ui/dialogs/loading.dart';
-import 'package:annix/utils/context_extension.dart';
-import 'package:flutter/material.dart';
-import 'package:annix/i18n/strings.g.dart';
-import 'package:go_router/go_router.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-
-class HomeActionGrid extends ConsumerWidget {
-  const HomeActionGrid({super.key});
-
-  @override
-  Widget build(final BuildContext context, final WidgetRef ref) {
-    return GridView.count(
-      padding: EdgeInsets.zero,
-      crossAxisCount: context.isDesktopOrLandscape
-          ? 4 /* display all buttons in one line on desktop */
-          : 2 /* on mobile */,
-      semanticChildCount: 4,
-      childAspectRatio: context.isDesktopOrLandscape ? 1 : 3.6,
-      shrinkWrap: true,
-      mainAxisSpacing: 12,
-      crossAxisSpacing: 12,
-      physics: const NeverScrollableScrollPhysics(),
-      children: [
-        HomeActionButton(
-          icon: const Icon(Icons.favorite_outline),
-          title: t.my_favorite,
-          onPressed: () {
-            context.push('/favorite');
-          },
-        ),
-        HomeActionButton(
-          icon: const Icon(Icons.shuffle),
-          title: t.playback.shuffle,
-          onPressed: () {
-            showLoadingDialog(context);
-            ref.read(playbackProvider).fullShuffleMode().then(
-              (final value) {
-                if (context.mounted) {
-                  Navigator.of(context, rootNavigator: true).pop();
-                }
-              },
-            );
-          },
-        ),
-        HomeActionButton(
-          icon: const Icon(Icons.history),
-          title: t.recent_played,
-          onPressed: () {
-            context.push('/history');
-          },
-        ),
-        HomeActionButton(
-          icon: const Icon(Icons.download),
-          title: t.download,
-          onPressed: () {
-            context.push('/downloading');
-          },
-        ),
-      ],
-    );
-  }
-}
-
-class HomeActionButton extends StatelessWidget {
-  final Icon icon;
-  final String title;
-  final VoidCallback? onPressed;
-
-  const HomeActionButton({
-    super.key,
-    required this.icon,
-    required this.title,
-    required this.onPressed,
-  });
-
-  @override
-  Widget build(final BuildContext context) {
-    return ElevatedButton.icon(
-      icon: icon,
-      label: Text(title),
-      style: TextButton.styleFrom(
-        alignment: Alignment.centerLeft,
-        minimumSize: Size.infinite,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(12),
-        ),
-      ),
-      onPressed: onPressed,
-    );
-  }
-}