diff --git a/src/components/Settings/Common/CacheButtons.tsx b/src/components/Settings/Common/CacheButtons.tsx
new file mode 100644
index 000000000..78ed7b355
--- /dev/null
+++ b/src/components/Settings/Common/CacheButtons.tsx
@@ -0,0 +1,62 @@
+import { Button, Group, MultiSelect, Stack, Title } from '@mantine/core';
+import { useState } from 'react';
+import { notifications } from '@mantine/notifications';
+import { IconTrash } from '@tabler/icons';
+import { queryClient } from '../../../tools/server/configurations/tanstack/queryClient.tool';
+
+const data = [
+  { value: 'ping', label: 'Ping queries' },
+  { value: 'repository-icons', label: 'Remote/Local icons' },
+  { value: 'calendar/medias', label: 'Medais from the Calendar' },
+  { value: 'weather', label: 'Weather data' },
+];
+
+export function CacheButtons() {
+  const [value, setValue] = useState<string[]>([]);
+  return (
+    <Stack spacing="xs">
+      <Title order={4}>Cache cleaning</Title>
+      <MultiSelect
+        value={value}
+        searchable
+        onChange={setValue}
+        data={data}
+        label="Select the cache(s) to clear"
+      />
+      <Group>
+        <Button
+          color="red"
+          variant="light"
+          onClick={() =>
+            queryClient.invalidateQueries(value).then(() =>
+              notifications.show({
+                title: 'Cache cleared',
+                message: `Cache for ${value.join(', ')} has been cleared`,
+                color: 'teal',
+                icon: <IconTrash />,
+                autoClose: 5000,
+              })
+            )
+          }
+        >
+          Clear selected queries
+        </Button>
+        <Button
+          onClick={() =>
+            queryClient.invalidateQueries().then(() =>
+              notifications.show({
+                title: 'Cache cleared',
+                message: 'All cache has been cleared',
+                color: 'teal',
+                icon: <IconTrash />,
+                autoClose: 5000,
+              })
+            )
+          }
+        >
+          Clear all cache
+        </Button>
+      </Group>
+    </Stack>
+  );
+}
diff --git a/src/components/Settings/Common/CommonSettings.tsx b/src/components/Settings/Common/CommonSettings.tsx
index 9d99df8a7..13d175bc5 100644
--- a/src/components/Settings/Common/CommonSettings.tsx
+++ b/src/components/Settings/Common/CommonSettings.tsx
@@ -5,6 +5,7 @@ import ConfigChanger from '../../Config/ConfigChanger';
 import ConfigActions from './Config/ConfigActions';
 import LanguageSelect from './Language/LanguageSelect';
 import { SearchEngineSelector } from './SearchEngine/SearchEngineSelector';
+import { CacheButtons } from './CacheButtons';
 
 export default function CommonSettings() {
   const { config } = useConfigContext();
@@ -24,6 +25,7 @@ export default function CommonSettings() {
         <Space />
         <LanguageSelect />
         <ConfigChanger />
+        <CacheButtons />
         <ConfigActions />
       </Stack>
     </ScrollArea>