diff --git a/front/src/components/VideoPlayer.tsx b/front/src/components/VideoPlayer.tsx
index 1b67058..6ff2fe6 100644
--- a/front/src/components/VideoPlayer.tsx
+++ b/front/src/components/VideoPlayer.tsx
@@ -5,6 +5,7 @@ import {
   MdFastForward,
   MdFastRewind,
   MdFullscreen,
+  MdFullscreenExit,
   MdLooksOne,
   MdNavigateBefore,
   MdNavigateNext,
@@ -63,6 +64,8 @@ const formatTime = (time) => {
 };
 
 export const VideoPlayer = ({}: AudioPlayerProps) => {
+  const { playMediaList, MediaOffset, previous, next, first, clear } =
+    useActivePlaylistService();
   const [time, setTime] = useState(10);
   const [isRunning, setIsRunning] = useState(true);
   useEffect(() => {
@@ -82,22 +85,24 @@ export const VideoPlayer = ({}: AudioPlayerProps) => {
   }, [time, isRunning]);
 
   const resetTimer = () => {
-    setTime(10);
-    setIsRunning(true);
-  };
-  useEffect(() => {
-    const resetTimer = () => {
+    if (playMediaList.length !== 0 && !!document.fullscreenElement) {
       setTime(10);
       setIsRunning(true);
+    }
+  };
+  useEffect(() => {
+    const resetTimerLocal = () => {
+      if (playMediaList.length !== 0 && !!document.fullscreenElement) {
+        setTime(10);
+        setIsRunning(true);
+      }
     };
-    window.addEventListener("mousemove", resetTimer);
+    window.addEventListener("mousemove", resetTimerLocal);
     return () => {
-      window.removeEventListener("mousemove", resetTimer);
+      window.removeEventListener("mousemove", resetTimerLocal);
     };
-  }, []);
+  }, [playMediaList, setTime, setIsRunning]);
 
-  const { playMediaList, MediaOffset, previous, next, first, clear } =
-    useActivePlaylistService();
   const containerRef = useRef<HTMLDivElement>(null);
   const videoRef = useRef<HTMLVideoElement>(null);
   const [isPlaying, setIsPlaying] = useState<boolean>(false);
@@ -111,7 +116,7 @@ export const VideoPlayer = ({}: AudioPlayerProps) => {
   const { dataType } = useSpecificType(dataMedia?.typeId);
   const { dataSeries } = useSpecificSeries(dataMedia?.seriesId);
 
-  const isMobile = useBreakpointValue({ base: false, sm: true });
+  const isMobile = useBreakpointValue({ base: true, md: false });
   const [mediaSource, setMediaSource] = useState<string>('');
   useEffect(() => {
     setMediaSource(
@@ -471,7 +476,9 @@ export const VideoPlayer = ({}: AudioPlayerProps) => {
               onClick={onFullScreen}
               variant="ghost"
               >
-                <MdFullscreen style={{ width: '100%', height: '100%' }} />
+                {!!document.fullscreenElement ?
+                <MdFullscreenExit style={{ width: '100%', height: '100%' }} />:
+                <MdFullscreen style={{ width: '100%', height: '100%' }} />}
             </IconButton>
             {isPiPSupported && !isMobile &&
             <IconButton