diff --git a/src/components/Exercises/ExerciseOverview.tsx b/src/components/Exercises/ExerciseOverview.tsx
index a68fbcac..0bfb2758 100644
--- a/src/components/Exercises/ExerciseOverview.tsx
+++ b/src/components/Exercises/ExerciseOverview.tsx
@@ -1,26 +1,22 @@
 import AddIcon from '@mui/icons-material/Add';
-import { Box, Button, Container, Grid, Pagination, Stack, Typography, } from "@mui/material";
-import { LoadingPlaceholder } from "components/Core/LoadingWidget/LoadingWidget";
-import { CategoryFilter } from "components/Exercises/Filter/CategoryFilter";
-import { EquipmentFilter } from "components/Exercises/Filter/EquipmentFilter";
-import { MuscleFilter } from "components/Exercises/Filter/MuscleFilter";
+import { Box, Button, Container, Grid, Pagination, Stack, Typography, useMediaQuery } from "@mui/material";
+import { CategoryFilter, CategoryFilterDropdown } from "components/Exercises/Filter/CategoryFilter";
+import { EquipmentFilter, EquipmentFilterDropdown } from "components/Exercises/Filter/EquipmentFilter";
+import { MuscleFilter, MuscleFilterDropdown } from "components/Exercises/Filter/MuscleFilter";
 import { NameAutocompleter } from "components/Exercises/Filter/NameAutcompleter";
 import { Category } from "components/Exercises/models/category";
 import { Equipment } from "components/Exercises/models/equipment";
 import { Muscle } from "components/Exercises/models/muscle";
 import { ExerciseGrid } from "components/Exercises/Overview/ExerciseGrid";
 import { ExerciseGridSkeleton } from "components/Exercises/Overview/ExerciseGridLoadingSkeleton";
-import {
-    useCategoriesQuery,
-    useEquipmentQuery,
-    useExercisesQuery,
-    useMusclesQuery
-} from "components/Exercises/queries";
-import React from "react";
+import { useExercisesQuery } from "components/Exercises/queries";
+import React, { useContext, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useNavigate } from "react-router-dom";
 import { ExerciseSearchResponse } from "services/responseType";
 import { makeLink, WgerLink } from "utils/url";
+import { FilterDrawer } from './Filter/FilterDrawer';
+import { ExerciseFiltersContext } from './Filter/ExerciseFiltersContext';
 
 const ContributeExerciseBanner = () => {
     const [t, i18n] = useTranslation();
@@ -74,17 +70,12 @@ const NoResultsBanner = () => {
     );
 };
 
-export const ExerciseOverview = () => {
+export const ExerciseOverviewList = () => {
     const basesQuery = useExercisesQuery();
-    const categoryQuery = useCategoriesQuery();
-    const musclesQuery = useMusclesQuery();
-    const equipmentQuery = useEquipmentQuery();
     const [t, i18n] = useTranslation();
     const navigate = useNavigate();
-
-    const [selectedEquipment, setSelectedEquipment] = React.useState<Equipment[]>([]);
-    const [selectedMuscles, setSelectedMuscles] = React.useState<Muscle[]>([]);
-    const [selectedCategories, setSelectedCategories] = React.useState<Category[]>([]);
+    const { selectedCategories, selectedEquipment, selectedMuscles} = useContext(ExerciseFiltersContext);
+    const isMobile = useMediaQuery('(max-width:600px)');
 
     const [page, setPage] = React.useState(1);
     const handlePageChange = (event: any, value: number) => {
@@ -96,40 +87,44 @@ export const ExerciseOverview = () => {
         });
     };
 
+    let filteredExercises = useMemo(() => {
+        let filteredExercises = basesQuery.data || [];
+
+        // Filter exercise bases by categories
+        if (selectedCategories.length > 0) {
+            filteredExercises = filteredExercises!.filter(exercise => {
+                return selectedCategories.some(
+                    category => exercise.category.id === category.id
+                );
+            });
+        }
+
+        // Filter exercises that have one of the selected equipment
+        if (selectedEquipment.length > 0) {
+            filteredExercises = filteredExercises!.filter(exercise => {
+                return exercise.equipment.some(equipment =>
+                    selectedEquipment.some(
+                        selectedEquipment => selectedEquipment.id === equipment.id
+                    )
+                );
+            });
+        }
+
+        // Filter exercises that have one of the selected muscles
+        if (selectedMuscles.length > 0) {
+            filteredExercises = filteredExercises!.filter(exercise => {
+                return exercise.muscles.some(muscle =>
+                    selectedMuscles.some(selectedMuscle => selectedMuscle.id === muscle.id)
+                );
+            });
+        }
+
+        return filteredExercises;
+    }, [basesQuery.data, selectedCategories, selectedEquipment, selectedMuscles]);
+
     // Should be a multiple of three, since there are three columns in the grid
     const ITEMS_PER_PAGE = 21;
 
-    let filteredExercises = basesQuery.data || [];
-
-    // Filter exercise bases by categories
-    if (selectedCategories.length > 0) {
-        filteredExercises = filteredExercises!.filter(exercise => {
-            return selectedCategories.some(
-                category => exercise.category.id === category.id
-            );
-        });
-    }
-
-    // Filter exercises that have one of the selected equipment
-    if (selectedEquipment.length > 0) {
-        filteredExercises = filteredExercises!.filter(exercise => {
-            return exercise.equipment.some(equipment =>
-                selectedEquipment.some(
-                    selectedEquipment => selectedEquipment.id === equipment.id
-                )
-            );
-        });
-    }
-
-    // Filter exercises that have one of the selected muscles
-    if (selectedMuscles.length > 0) {
-        filteredExercises = filteredExercises!.filter(exercise => {
-            return exercise.muscles.some(muscle =>
-                selectedMuscles.some(selectedMuscle => selectedMuscle.id === muscle.id)
-            );
-        });
-    }
-
     // Pagination calculations
     const pageCount = Math.ceil(filteredExercises!.length / ITEMS_PER_PAGE);
     const paginatedExercises = filteredExercises!.slice(
@@ -144,57 +139,67 @@ export const ExerciseOverview = () => {
     return (
         <Container maxWidth="lg">
             <Grid container spacing={2} mt={2}>
-                <Grid item xs={12} sm={6}>
+                <Grid item xs={10} sm={6}>
                     <Typography gutterBottom variant="h3" component="div">
                         {t("exercises.exercises")}
                     </Typography>
                 </Grid>
-                <Grid item xs={12} sm={3}>
-                    <NameAutocompleter callback={exerciseAdded} />
-                </Grid>
-                <Grid item xs={12} sm={3}>
-                    <Button
-                        variant="contained"
-                        startIcon={<AddIcon />}
-                        onClick={() => navigate(makeLink(WgerLink.EXERCISE_CONTRIBUTE, i18n.language))}
-                    >
-                        {t('exercises.contributeExercise')}
-                    </Button>
-                </Grid>
-
-                <Grid item xs={12} sm={3}>
-                    <Grid container spacing={1}>
-                        {categoryQuery.isLoading ? <LoadingPlaceholder /> : (
+                {isMobile ? (
+                    <>
+                        <Grid item xs={2} sm={6}>
+                            <Button
+                                variant="contained"
+                                onClick={() => navigate(makeLink(WgerLink.EXERCISE_CONTRIBUTE, i18n.language))}
+                            >
+                                <AddIcon />
+                            </Button>
+                        </Grid>
+                        <Grid item sm={6} flexGrow={1}>
+                            <NameAutocompleter callback={exerciseAdded} />
+                        </Grid>
+                        <Grid item xs={2} sm={6} display="flex" justifyContent="center" alignItems="center">
+                            <FilterDrawer>
+                                <CategoryFilterDropdown />
+                                <EquipmentFilterDropdown />
+                                <MuscleFilterDropdown />
+                            </FilterDrawer>
+                        </Grid>
+                    </>
+                ) : (
+                    <>
+                        <Grid item xs={12} sm={3}>
+                            <NameAutocompleter callback={exerciseAdded} />
+                        </Grid>
+                        <Grid item xs={12} sm={3}>
+                            <Button
+                                variant="contained"
+                                startIcon={<AddIcon />}
+                                onClick={() => navigate(makeLink(WgerLink.EXERCISE_CONTRIBUTE, i18n.language))}
+                            >
+                                {t('exercises.contributeExercise')}
+                            </Button>
+                        </Grid>
+                    </>
+                )}
+
+                {!isMobile && (
+                    <Grid item xs={12} sm={3}>
+                        <Grid container spacing={1}>
                             <Grid item xs={6} sm={12}>
-                                <CategoryFilter
-                                    categories={categoryQuery.data!}
-                                    selectedCategories={selectedCategories}
-                                    setSelectedCategories={setSelectedCategories}
-                                />
+                                <CategoryFilter />
                             </Grid>
-                        )}
 
-                        {equipmentQuery.isLoading ? <LoadingPlaceholder /> : (
                             <Grid item xs={6} sm={12}>
-                                <EquipmentFilter
-                                    equipment={equipmentQuery.data!}
-                                    selectedEquipment={selectedEquipment}
-                                    setSelectedEquipment={setSelectedEquipment}
-                                />
+                                <EquipmentFilter />
                             </Grid>
-                        )}
 
-                        {musclesQuery.isLoading ? <LoadingPlaceholder /> : (
                             <Grid item xs={12}>
-                                <MuscleFilter
-                                    muscles={musclesQuery.data!}
-                                    selectedMuscles={selectedMuscles}
-                                    setSelectedMuscles={setSelectedMuscles}
-                                />
+                                <MuscleFilter />
                             </Grid>
-                        )}
+                        </Grid>
                     </Grid>
-                </Grid>
+                )}
+
                 <Grid item xs={12} sm={9}>
                     {basesQuery.isLoading
                         ? <ExerciseGridSkeleton />
@@ -217,3 +222,22 @@ export const ExerciseOverview = () => {
         </Container>
     );
 };
+
+export const ExerciseOverview = () => {
+    const [selectedEquipment, setSelectedEquipment] = useState<Equipment[]>([]);
+    const [selectedMuscles, setSelectedMuscles] = useState<Muscle[]>([]);
+    const [selectedCategories, setSelectedCategories] = React.useState<Category[]>([]);
+
+    return (
+        <ExerciseFiltersContext.Provider value={{
+            selectedEquipment,
+            setSelectedEquipment,
+            selectedMuscles,
+            setSelectedMuscles,
+            selectedCategories,
+            setSelectedCategories
+        }}>
+            <ExerciseOverviewList />
+        </ExerciseFiltersContext.Provider>
+    );
+};
diff --git a/src/components/Exercises/Filter/CategoryFilter.tsx b/src/components/Exercises/Filter/CategoryFilter.tsx
index fc4dc6ab..d7d865a1 100644
--- a/src/components/Exercises/Filter/CategoryFilter.tsx
+++ b/src/components/Exercises/Filter/CategoryFilter.tsx
@@ -1,18 +1,29 @@
-import React from 'react';
-import { List, ListItem, ListItemButton, ListItemIcon, ListItemText, Paper, Switch, Typography } from "@mui/material";
+import React, { useContext } from 'react';
+import {
+    Accordion,
+    AccordionDetails,
+    AccordionSummary,
+    List,
+    ListItem,
+    ListItemButton,
+    ListItemIcon,
+    ListItemText,
+    Paper,
+    Switch,
+    Typography
+} from "@mui/material";
 import { useTranslation } from "react-i18next";
 import { Category } from "components/Exercises/models/category";
 import { getTranslationKey } from "utils/strings";
+import { useCategoriesQuery } from '../queries';
+import { ExerciseFiltersContext } from './ExerciseFiltersContext';
+import { LoadingPlaceholder } from '../../Core/LoadingWidget/LoadingWidget';
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 
+const CategoryFilterList = () => {
 
-type CategoryFilterProps = {
-    categories: Category[];
-    selectedCategories: Category[];
-    setSelectedCategories: (categories: Category[]) => void;
-}
-
-export const CategoryFilter = ({ categories, selectedCategories, setSelectedCategories }: CategoryFilterProps) => {
-
+    const { data: categories, isLoading } = useCategoriesQuery();
+    const { selectedCategories, setSelectedCategories } = useContext(ExerciseFiltersContext);
     const [t] = useTranslation();
 
     const handleToggle = (value: Category) => () => {
@@ -28,39 +39,65 @@ export const CategoryFilter = ({ categories, selectedCategories, setSelectedCate
         setSelectedCategories(newChecked);
     };
 
+    if (isLoading) {
+        return <LoadingPlaceholder />;
+    }
+
+    return (
+        <List>
+            {categories!.map((category) => {
+                const labelId = `checkbox-list-label-${category.id}`;
+
+                return (
+                    <ListItem
+                        key={category.id}
+                        disablePadding
+                    >
+                        <ListItemButton role={undefined} onClick={handleToggle(category)} dense>
+                            <ListItemIcon>
+                                <Switch
+                                    key={`category-${category.id}`}
+                                    edge="start"
+                                    checked={selectedCategories.indexOf(category) !== -1}
+                                    tabIndex={-1}
+                                    disableRipple
+                                    inputProps={{ 'aria-labelledby': labelId }}
+                                />
+                            </ListItemIcon>
+                            <ListItemText id={labelId} primary={t(getTranslationKey(category.name))} />
+                        </ListItemButton>
+                    </ListItem>
+                );
+            })}
+        </List>
+    );
+};
+
+export const CategoryFilterDropdown = () => {
+    const [t] = useTranslation();
+
+    return (
+        <Accordion>
+            <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+                {t('category')}
+            </AccordionSummary>
+            <AccordionDetails>
+                <CategoryFilterList />
+            </AccordionDetails>
+        </Accordion>
+    );
+};
+
+export const CategoryFilter = () => {
+    const [t] = useTranslation();
+
     return (
         <div data-testid={"categories"}>
             <Paper>
                 <Typography gutterBottom variant="h6" m={2}>
                     {t('category')}
                 </Typography>
-
-                <List>
-                    {categories.map((category) => {
-                        const labelId = `checkbox-list-label-${category.id}`;
-
-                        return (
-                            <ListItem
-                                key={category.id}
-                                disablePadding
-                            >
-                                <ListItemButton role={undefined} onClick={handleToggle(category)} dense>
-                                    <ListItemIcon>
-                                        <Switch
-                                            key={`category-${category.id}`}
-                                            edge="start"
-                                            checked={selectedCategories.indexOf(category) !== -1}
-                                            tabIndex={-1}
-                                            disableRipple
-                                            inputProps={{ 'aria-labelledby': labelId }}
-                                        />
-                                    </ListItemIcon>
-                                    <ListItemText id={labelId} primary={t(getTranslationKey(category.name))} />
-                                </ListItemButton>
-                            </ListItem>
-                        );
-                    })}
-                </List>
+                <CategoryFilterList />
             </Paper>
         </div>
     );
diff --git a/src/components/Exercises/Filter/EquipmentFilter.tsx b/src/components/Exercises/Filter/EquipmentFilter.tsx
index feff9bbb..073f871f 100644
--- a/src/components/Exercises/Filter/EquipmentFilter.tsx
+++ b/src/components/Exercises/Filter/EquipmentFilter.tsx
@@ -1,18 +1,29 @@
-import React from 'react';
-import { List, ListItem, ListItemButton, ListItemIcon, ListItemText, Paper, Switch, Typography } from "@mui/material";
+import React, { useContext } from 'react';
+import {
+    Accordion,
+    AccordionDetails,
+    AccordionSummary,
+    List,
+    ListItem,
+    ListItemButton,
+    ListItemIcon,
+    ListItemText,
+    Paper,
+    Switch,
+    Typography
+} from "@mui/material";
 import { useTranslation } from "react-i18next";
 import { Equipment } from "components/Exercises/models/equipment";
 import { getTranslationKey } from "utils/strings";
+import { useEquipmentQuery } from '../queries';
+import { ExerciseFiltersContext } from './ExerciseFiltersContext';
+import { LoadingPlaceholder } from '../../Core/LoadingWidget/LoadingWidget';
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 
+const EquipmentFilterList = () => {
 
-type EquipmentFilterProps = {
-    equipment: Equipment[];
-    selectedEquipment: Equipment[];
-    setSelectedEquipment: (equipment: Equipment[]) => void;
-}
-
-export const EquipmentFilter = ({ equipment, selectedEquipment, setSelectedEquipment }: EquipmentFilterProps) => {
-
+    const { data: equipment, isLoading } = useEquipmentQuery();
+    const { selectedEquipment, setSelectedEquipment } = useContext(ExerciseFiltersContext);
     const [t] = useTranslation();
 
     const handleToggle = (value: Equipment) => () => {
@@ -28,38 +39,65 @@ export const EquipmentFilter = ({ equipment, selectedEquipment, setSelectedEquip
         setSelectedEquipment(newChecked);
     };
 
+    if (isLoading) {
+        return <LoadingPlaceholder/>;
+    }
+
+    return (
+        <List sx={{ maxHeight: "500px", overflowY: "auto" }}>
+            {equipment!.map((equipment) => {
+                const labelId = `checkbox-list-label-${equipment.id}`;
+
+                return (
+                    <ListItem
+                        key={equipment.id}
+                        disablePadding
+                    >
+                        <ListItemButton role={undefined} onClick={handleToggle(equipment)} dense>
+                            <ListItemIcon>
+                                <Switch
+                                    key={`muscle-${equipment.id}`}
+                                    edge="start"
+                                    checked={selectedEquipment.indexOf(equipment) !== -1}
+                                    tabIndex={-1}
+                                    disableRipple
+                                    inputProps={{ 'aria-labelledby': labelId }}
+                                />
+                            </ListItemIcon>
+                            <ListItemText id={labelId} primary={t(getTranslationKey(equipment.name))}/>
+                        </ListItemButton>
+                    </ListItem>
+                );
+            })}
+        </List>
+    );
+};
+
+export const EquipmentFilterDropdown = () => {
+    const [t] = useTranslation();
+
+    return (
+        <Accordion>
+            <AccordionSummary expandIcon={<ExpandMoreIcon/>}>
+                {t('exercises.equipment')}
+            </AccordionSummary>
+            <AccordionDetails>
+                <EquipmentFilterList/>
+            </AccordionDetails>
+        </Accordion>
+    );
+};
+
+export const EquipmentFilter = () => {
+    const [t] = useTranslation();
+
     return (
         <div data-testid={"equipment"}>
             <Paper sx={{ mt: 2 }}>
                 <Typography gutterBottom variant="h6" m={2}>
                     {t('exercises.equipment')}
                 </Typography>
-                <List sx={{ maxHeight: "500px", overflowY: "auto" }}>
-                    {equipment.map((equipment) => {
-                        const labelId = `checkbox-list-label-${equipment.id}`;
-
-                        return (
-                            <ListItem
-                                key={equipment.id}
-                                disablePadding
-                            >
-                                <ListItemButton role={undefined} onClick={handleToggle(equipment)} dense>
-                                    <ListItemIcon>
-                                        <Switch
-                                            key={`muscle-${equipment.id}`}
-                                            edge="start"
-                                            checked={selectedEquipment.indexOf(equipment) !== -1}
-                                            tabIndex={-1}
-                                            disableRipple
-                                            inputProps={{ 'aria-labelledby': labelId }}
-                                        />
-                                    </ListItemIcon>
-                                    <ListItemText id={labelId} primary={t(getTranslationKey(equipment.name))} />
-                                </ListItemButton>
-                            </ListItem>
-                        );
-                    })}
-                </List>
+                <EquipmentFilterList/>
             </Paper>
         </div>
     );
diff --git a/src/components/Exercises/Filter/ExerciseFiltersContext.tsx b/src/components/Exercises/Filter/ExerciseFiltersContext.tsx
new file mode 100644
index 00000000..47d8ba51
--- /dev/null
+++ b/src/components/Exercises/Filter/ExerciseFiltersContext.tsx
@@ -0,0 +1,16 @@
+import { createContext } from 'react';
+import { Equipment } from '../models/equipment';
+import { Muscle } from '../models/muscle';
+import { Category } from '../models/category';
+
+
+type ExerciseContext = {
+    selectedEquipment: Equipment[];
+    setSelectedEquipment: (equipment: Equipment[]) => void;
+    selectedMuscles: Muscle[];
+    setSelectedMuscles: (muscles: Muscle[]) => void;
+    selectedCategories: Category[];
+    setSelectedCategories: (exercises: Category[]) => void;
+}
+
+export const ExerciseFiltersContext = createContext<ExerciseContext>({} as unknown as ExerciseContext);
diff --git a/src/components/Exercises/Filter/FilterDrawer.tsx b/src/components/Exercises/Filter/FilterDrawer.tsx
new file mode 100644
index 00000000..6a16326d
--- /dev/null
+++ b/src/components/Exercises/Filter/FilterDrawer.tsx
@@ -0,0 +1,36 @@
+import React, { useState } from 'react';
+import { Button, Divider, Drawer, Stack, Typography } from '@mui/material';
+import FilterAltIcon from '@mui/icons-material/FilterAlt';
+import CloseIcon from '@mui/icons-material/Close';
+
+type FilterDrawerProps = {
+    children: React.ReactNode;
+}
+
+export const FilterDrawer = ({ children }: FilterDrawerProps) => {
+    const [open, setOpen] = useState(false);
+
+    const toggleDrawer = (newOpen: boolean) => () => {
+        setOpen(newOpen);
+    };
+
+    return (
+        <>
+            <Button onClick={toggleDrawer(true)}>
+                <FilterAltIcon />
+            </Button>
+            <Drawer open={open} onClose={toggleDrawer(false)} anchor="right">
+                <Stack direction="row" justifyContent="space-between" alignItems="center">
+                    <Typography gutterBottom variant="h6" m={2}>
+                        Filters
+                    </Typography>
+                    <Button onClick={toggleDrawer(false)}>
+                        <CloseIcon />
+                    </Button>
+                </Stack>
+                <Divider />
+                {children}
+            </Drawer>
+        </>
+    );
+};
diff --git a/src/components/Exercises/Filter/MuscleFilter.tsx b/src/components/Exercises/Filter/MuscleFilter.tsx
index 7c565e8f..75a16d8c 100644
--- a/src/components/Exercises/Filter/MuscleFilter.tsx
+++ b/src/components/Exercises/Filter/MuscleFilter.tsx
@@ -1,5 +1,8 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import {
+    Accordion,
+    AccordionDetails,
+    AccordionSummary,
     IconButton,
     List,
     ListItem,
@@ -16,15 +19,15 @@ import { Muscle } from "components/Exercises/models/muscle";
 import { getTranslationKey } from "utils/strings";
 import { MuscleOverview } from "components/Muscles/MuscleOverview";
 import { LightTooltip } from "components/Core/Tooltips/LightToolTip";
+import { useMusclesQuery } from '../queries';
+import { ExerciseFiltersContext } from './ExerciseFiltersContext';
+import { LoadingPlaceholder } from '../../Core/LoadingWidget/LoadingWidget';
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 
-type MuscleFilterProps = {
-    muscles: Muscle[];
-    selectedMuscles: Muscle[];
-    setSelectedMuscles: (muscles: Muscle[]) => void;
-}
-
-export const MuscleFilter = ({ muscles, selectedMuscles, setSelectedMuscles }: MuscleFilterProps) => {
+const MuscleFilterList = () => {
 
+    const { data: muscles, isLoading } = useMusclesQuery();
+    const { selectedMuscles, setSelectedMuscles } = useContext(ExerciseFiltersContext);
     const [t] = useTranslation();
 
     const handleToggle = (value: Muscle) => () => {
@@ -40,59 +43,88 @@ export const MuscleFilter = ({ muscles, selectedMuscles, setSelectedMuscles }: M
         setSelectedMuscles(newChecked);
     };
 
+    if (isLoading) {
+        return <LoadingPlaceholder />;
+    }
+
+    return (
+        <List sx={{ maxHeight: "500px", overflowY: "auto" }}>
+            {muscles!.map((m) => {
+                const labelId = `checkbox-list-label-${m.id}`;
+
+                return (
+                    <ListItem
+                        key={m.id}
+                        disablePadding
+                        secondaryAction={
+                            <LightTooltip
+                                title={
+                                    <MuscleOverview
+                                        primaryMuscles={[m]}
+                                        secondaryMuscles={[]}
+                                        isFront={m.isFront}
+                                    />
+                                }
+                                placement="right"
+                                arrow>
+                                <IconButton edge="end" aria-label="comments">
+                                    <InfoOutlinedIcon />
+                                </IconButton>
+                            </LightTooltip>
+                        }
+                    >
+                        <ListItemButton role={undefined} onClick={handleToggle(m)} dense>
+                            <ListItemIcon>
+                                <Switch
+                                    key={`muscle-${m.id}`}
+                                    edge="start"
+                                    checked={selectedMuscles.indexOf(m) !== -1}
+                                    tabIndex={-1}
+                                    disableRipple
+                                    inputProps={{ 'aria-labelledby': labelId }}
+                                />
+                            </ListItemIcon>
+
+                            <ListItemText
+                                id={labelId}
+                                primary={m.name}
+                                secondary={m.nameEn !== '' ? t(getTranslationKey(m.nameEn)) : ''} />
+
+                        </ListItemButton>
+                    </ListItem>
+                );
+            })}
+        </List>
+    );
+};
+
+export const MuscleFilterDropdown = () => {
+
+    const [t] = useTranslation();
+
+    return (
+        <Accordion>
+            <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+                {t('exercises.muscles')}
+            </AccordionSummary>
+            <AccordionDetails>
+                <MuscleFilterList />
+            </AccordionDetails>
+        </Accordion>
+    );
+};
+
+export const MuscleFilter = () => {
+
+    const [t] = useTranslation();
+
     return (
         <div data-testid={"muscles"}>
             <Paper sx={{ mt: 2 }}>
                 <Typography gutterBottom variant="h6" m={2}>
                     {t('exercises.muscles')}
                 </Typography>
-                <List sx={{ maxHeight: "500px", overflowY: "auto" }}>
-                    {muscles.map((m) => {
-                        const labelId = `checkbox-list-label-${m.id}`;
-
-                        return (
-                            <ListItem
-                                key={m.id}
-                                disablePadding
-                                secondaryAction={
-                                    <LightTooltip
-                                        title={
-                                            <MuscleOverview
-                                                primaryMuscles={[m]}
-                                                secondaryMuscles={[]}
-                                                isFront={m.isFront}
-                                            />
-                                        }
-                                        placement="right"
-                                        arrow>
-                                        <IconButton edge="end" aria-label="comments">
-                                            <InfoOutlinedIcon />
-                                        </IconButton>
-                                    </LightTooltip>
-                                }
-                            >
-                                <ListItemButton role={undefined} onClick={handleToggle(m)} dense>
-                                    <ListItemIcon>
-                                        <Switch
-                                            key={`muscle-${m.id}`}
-                                            edge="start"
-                                            checked={selectedMuscles.indexOf(m) !== -1}
-                                            tabIndex={-1}
-                                            disableRipple
-                                            inputProps={{ 'aria-labelledby': labelId }}
-                                        />
-                                    </ListItemIcon>
-
-                                    <ListItemText
-                                        id={labelId}
-                                        primary={m.name}
-                                        secondary={m.nameEn !== '' ? t(getTranslationKey(m.nameEn)) : ''} />
-
-                                </ListItemButton>
-                            </ListItem>
-                        );
-                    })}
-                </List>
+                <MuscleFilterList />
             </Paper>
         </div>
     );