diff --git a/.changeset/gentle-clocks-rest.md b/.changeset/gentle-clocks-rest.md
new file mode 100644
index 0000000000..40e5af702d
--- /dev/null
+++ b/.changeset/gentle-clocks-rest.md
@@ -0,0 +1,6 @@
+---
+'@alfalab/core-components-gallery': minor
+---
+
+- Исправлены паддинги у swiper
+- Переработано отображение в full screen режиме
diff --git a/packages/gallery/src/Component.tsx b/packages/gallery/src/Component.tsx
index e17fc77761..c99b65ef7c 100644
--- a/packages/gallery/src/Component.tsx
+++ b/packages/gallery/src/Component.tsx
@@ -133,14 +133,15 @@ export const Gallery: FC<GalleryProps> = ({
         slideTo(nextIndex);
     }, [images.length, loop, currentSlideIndex, slideTo]);
 
-    const setImageMeta = useCallback(
-        (meta: ImageMeta, index: number) => {
-            imagesMeta[index] = meta;
+    const setImageMeta = useCallback((meta: ImageMeta, index: number) => {
+        setImagesMeta((prevImagesMeta) => {
+            const nextImagesMeta = prevImagesMeta.slice();
 
-            setImagesMeta(imagesMeta.slice());
-        },
-        [imagesMeta],
-    );
+            nextImagesMeta[index] = meta;
+
+            return nextImagesMeta;
+        });
+    }, []);
 
     const handleBottomButtonClick = useCallback(
         (e: MouseEvent) => {
diff --git a/packages/gallery/src/components/image-viewer/component.tsx b/packages/gallery/src/components/image-viewer/component.tsx
index d684c66dd1..f7a5ec54a0 100644
--- a/packages/gallery/src/components/image-viewer/component.tsx
+++ b/packages/gallery/src/components/image-viewer/component.tsx
@@ -8,7 +8,7 @@ import { ChevronBackHeavyMIcon } from '@alfalab/icons-glyph/ChevronBackHeavyMIco
 import { ChevronForwardHeavyMIcon } from '@alfalab/icons-glyph/ChevronForwardHeavyMIcon';
 
 import { GalleryContext } from '../../context';
-import { getImageAlt, getImageKey, isVideo, TestIds } from '../../utils';
+import { getImageKey, isVideo, TestIds } from '../../utils';
 
 import { useHandleImageViewer } from './hooks';
 import { Slide } from './slide';
@@ -128,49 +128,70 @@ export const ImageViewer: FC = () => {
                 </div>
             )}
 
-            {fullScreen && !isVideo(currentImage?.src) && (
-                <img
-                    src={currentImage?.src}
-                    alt={currentImage ? getImageAlt(currentImage, currentSlideIndex) : ''}
-                    className={styles.fullScreenImage}
-                />
+            {fullScreen && currentImage && !isVideo(currentImage.src) && (
+                <div className={styles.fullScreenFrame}>
+                    <Slide
+                        isActive={true}
+                        containerAspectRatio={swiperAspectRatio}
+                        image={currentImage}
+                        containerHeight={swiperHeight}
+                        meta={imagesMeta[currentSlideIndex]}
+                        index={currentSlideIndex}
+                        imageAspectRatio={
+                            (imagesMeta[currentSlideIndex]?.width || 1) /
+                            (imagesMeta[currentSlideIndex]?.height || 1)
+                        }
+                        slideVisible={false}
+                        fullScreen={true}
+                    />
+                </div>
             )}
 
-            <Swiper {...swiperProps}>
-                {images.map((image, index) => {
-                    const meta = imagesMeta[index];
-
-                    const imageWidth = meta?.width || 1;
-                    const imageHeight = meta?.height || 1;
-
-                    const imageAspectRatio = imageWidth / imageHeight;
-
-                    const slideVisible = index === currentSlideIndex;
-
-                    return (
-                        <SwiperSlide
-                            key={getImageKey(image, index)}
-                            style={{
-                                pointerEvents: slideVisible ? 'auto' : 'none',
-                                transitionProperty: 'opacity',
-                            }}
-                        >
-                            {({ isActive }) => (
-                                <Slide
-                                    isActive={isActive}
-                                    containerAspectRatio={swiperAspectRatio}
-                                    image={image}
-                                    containerHeight={swiperHeight}
-                                    meta={meta}
-                                    index={index}
-                                    imageAspectRatio={imageAspectRatio}
-                                    slideVisible={slideVisible}
-                                />
-                            )}
-                        </SwiperSlide>
-                    );
+            <div
+                className={cn(styles.swiperFrame, {
+                    [styles.mobile]: isMobile,
+                    [styles.mobileVideo]: isMobile && isVideo(currentImage?.src),
+                    [styles.fullScreenFrame]: fullScreen,
+                    [styles.hiddenFrame]: fullScreen && !isVideo(currentImage?.src),
                 })}
-            </Swiper>
+            >
+                <Swiper {...swiperProps}>
+                    {images.map((image, index) => {
+                        const meta = imagesMeta[index];
+
+                        const imageWidth = meta?.width || 1;
+                        const imageHeight = meta?.height || 1;
+
+                        const imageAspectRatio = imageWidth / imageHeight;
+
+                        const slideVisible = index === currentSlideIndex;
+
+                        return (
+                            <SwiperSlide
+                                key={getImageKey(image, index)}
+                                style={{
+                                    pointerEvents: slideVisible ? 'auto' : 'none',
+                                    transitionProperty: 'opacity',
+                                }}
+                            >
+                                {({ isActive }) => (
+                                    <Slide
+                                        isActive={isActive}
+                                        containerAspectRatio={swiperAspectRatio}
+                                        image={image}
+                                        containerHeight={swiperHeight}
+                                        meta={meta}
+                                        index={index}
+                                        imageAspectRatio={imageAspectRatio}
+                                        slideVisible={slideVisible}
+                                        fullScreen={fullScreen && isVideo(image.src)}
+                                    />
+                                )}
+                            </SwiperSlide>
+                        );
+                    })}
+                </Swiper>
+            </div>
 
             {showControls && (
                 <div
diff --git a/packages/gallery/src/components/image-viewer/index.module.css b/packages/gallery/src/components/image-viewer/index.module.css
index 9a09102616..683022df81 100644
--- a/packages/gallery/src/components/image-viewer/index.module.css
+++ b/packages/gallery/src/components/image-viewer/index.module.css
@@ -4,6 +4,7 @@
     display: flex;
     flex-grow: 1;
     justify-content: center;
+    min-height: 0;
     background-color: var(--color-static-neutral-0-inverted);
 
     /* swiper/swiper.css; */
@@ -69,48 +70,82 @@
         z-index: -1000;
     }
 
-    .swiper {
+    .swiperFrame {
         display: flex;
         width: 100%;
         height: 100%;
+        min-height: 0;
 
         /* 168px - высота хэдера и футера */
         max-height: calc(100vh - 168px);
+        max-height: calc(100dvh - 168px);
         padding: var(--gap-32) var(--gap-16);
         box-sizing: border-box;
 
         &.mobile {
             max-height: calc(100vh - 210px);
+            max-height: calc(100dvh - 210px);
         }
 
         &.mobileVideo {
             max-height: 100vh;
+            max-height: 100dvh;
         }
     }
 
+    .fullScreenFrame {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        max-height: none;
+        min-height: 0;
+        padding: var(--gap-0);
+        box-sizing: border-box;
+        overflow: hidden;
+    }
+
+    .hiddenFrame {
+        flex: 0 0 0;
+        width: 0;
+        height: 0;
+        padding: var(--gap-0);
+        overflow: hidden;
+    }
+
+    .swiper {
+        width: 100%;
+        height: 100%;
+    }
+
+    .hidden {
+        display: none;
+    }
+
     .singleSlideContainer {
         display: flex;
         width: 100%;
         height: 100%;
+        min-height: 0;
 
         max-height: calc(100vh - 80px);
+        max-height: calc(100dvh - 80px);
         padding: var(--gap-32);
         box-sizing: border-box;
 
         &.mobile {
             max-height: calc(100vh - 174px);
+            max-height: calc(100dvh - 174px);
             padding: 0;
         }
 
         &.mobileVideo {
             max-height: 100vh;
+            max-height: 100dvh;
         }
     }
 
-    .hidden {
-        display: none;
-    }
-
     .slide {
         position: relative;
         display: flex;
@@ -131,8 +166,11 @@
     }
 
     .image {
-        width: 0;
-        height: 0;
+        width: auto;
+        height: auto;
+        max-width: 100%;
+        max-height: 100%;
+        object-fit: contain;
         user-select: none;
         border-radius: var(--border-radius-8);
 
@@ -145,6 +183,9 @@
         position: relative;
         width: auto;
         height: auto;
+        max-width: 100%;
+        max-height: 100%;
+        object-fit: contain;
         user-select: none;
     }
 
@@ -158,6 +199,15 @@
         height: auto;
     }
 
+    .fullScreenMedia {
+        width: 100%;
+        height: 100%;
+        max-width: 100%;
+        max-height: 100%;
+        object-fit: contain;
+        border-radius: var(--border-radius-0);
+    }
+
     .arrow {
         display: flex;
         flex-direction: column;
@@ -209,14 +259,9 @@
         margin-bottom: var(--gap-4);
     }
 
-    .fullScreenImage {
-        width: 100%;
-        height: auto;
-        background-color: var(--color-light-base-bg-primary);
-    }
-
     .fullScreenVideo {
-        width: calc(100% - 192px);
-        max-height: calc(100vh - 82px);
+        width: 100%;
+        height: 100%;
+        max-height: none;
     }
 }
diff --git a/packages/gallery/src/components/image-viewer/single.tsx b/packages/gallery/src/components/image-viewer/single.tsx
index b96f14baa6..5480b6eefd 100644
--- a/packages/gallery/src/components/image-viewer/single.tsx
+++ b/packages/gallery/src/components/image-viewer/single.tsx
@@ -2,7 +2,7 @@ import React, { type FC, useContext, useRef } from 'react';
 import cn from 'classnames';
 
 import { GalleryContext } from '../../context';
-import { getImageAlt, isVideo } from '../../utils';
+import { isVideo } from '../../utils';
 
 import { useHandleImageViewer } from './hooks';
 import { Slide } from './slide';
@@ -35,11 +35,19 @@ export const Single: FC = () => {
         /* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */
         <div className={styles.component} onClick={handleWrapperClick}>
             {fullScreen && !isVideo(currentImage?.src) ? (
-                <img
-                    src={currentImage?.src}
-                    alt={currentImage ? getImageAlt(currentImage, currentSlideIndex) : ''}
-                    className={styles.fullScreenImage}
-                />
+                <div className={styles.fullScreenFrame}>
+                    <Slide
+                        isActive={true}
+                        containerAspectRatio={wrapperAspectRatio}
+                        image={currentImage}
+                        containerHeight={wrapperRect?.height || 0}
+                        meta={currentImageMeta}
+                        index={currentSlideIndex}
+                        imageAspectRatio={imageAspectRatio}
+                        slideVisible={false}
+                        fullScreen={true}
+                    />
+                </div>
             ) : (
                 <div
                     className={cn(styles.singleSlideContainer, {
diff --git a/packages/gallery/src/components/image-viewer/slide.tsx b/packages/gallery/src/components/image-viewer/slide.tsx
index f7a36d1ca5..63a8f06e09 100644
--- a/packages/gallery/src/components/image-viewer/slide.tsx
+++ b/packages/gallery/src/components/image-viewer/slide.tsx
@@ -1,4 +1,4 @@
-import React, { type FC, type ReactNode, useContext } from 'react';
+import React, { type FC, type ReactNode, useCallback, useContext } from 'react';
 import cn from 'classnames';
 
 import { Spinner } from '@alfalab/core-components-spinner';
@@ -69,6 +69,7 @@ type SlideProps = {
     index: number;
     containerHeight: number;
     slideVisible: boolean;
+    fullScreen?: boolean;
 };
 
 export const Slide: FC<SlideProps> = ({
@@ -80,6 +81,7 @@ export const Slide: FC<SlideProps> = ({
     index,
     containerHeight,
     slideVisible,
+    fullScreen,
 }) => {
     const { view } = useContext(GalleryContext);
     const { handleLoad, handleLoadError } = useHandleImageViewer();
@@ -89,10 +91,27 @@ export const Slide: FC<SlideProps> = ({
     const verticalImageFit = !small && containerAspectRatio > imageAspectRatio;
     const horizontalImageFit = !small && containerAspectRatio <= imageAspectRatio;
 
+    const handleImageRef = useCallback(
+        (node: HTMLImageElement | null) => {
+            if (node?.complete && node.naturalWidth > 0 && !meta) {
+                handleLoad(
+                    { currentTarget: node } as React.SyntheticEvent<HTMLImageElement>,
+                    index,
+                );
+            }
+        },
+        [handleLoad, index, meta],
+    );
+
     if (isVideo(image.src)) {
         return (
             <SlideInner isVideoView={true} active={isActive} broken={broken} loading={!meta}>
-                <Video url={image.src} index={index} isActive={isActive} />
+                <Video
+                    url={image.src}
+                    index={index}
+                    isActive={isActive}
+                    className={cn({ [styles.fullScreenMedia]: fullScreen })}
+                />
             </SlideInner>
         );
     }
@@ -100,20 +119,20 @@ export const Slide: FC<SlideProps> = ({
     return (
         <SlideInner active={isActive} broken={broken} loading={!meta}>
             <img
+                ref={handleImageRef}
                 src={image.src}
                 alt={getImageAlt(image, index)}
                 className={cn({
                     [styles.smallImage]: small,
                     [styles.image]: !small && meta,
                     [styles.mobile]: view === 'mobile',
+                    [styles.fullScreenMedia]: fullScreen,
                     [styles.verticalImageFit]: verticalImageFit,
                     [styles.horizontalImageFit]: horizontalImageFit,
                 })}
                 onLoad={(event) => handleLoad(event, index)}
                 onError={() => handleLoadError(index)}
-                style={{
-                    maxHeight: `${containerHeight}px`,
-                }}
+                style={fullScreen ? undefined : { maxHeight: `${containerHeight}px` }}
                 data-test-id={slideVisible ? TestIds.ACTIVE_IMAGE : undefined}
             />
         </SlideInner>
diff --git a/packages/gallery/src/components/image-viewer/video/index.module.css b/packages/gallery/src/components/image-viewer/video/index.module.css
index 52872ab664..768110ab2f 100644
--- a/packages/gallery/src/components/image-viewer/video/index.module.css
+++ b/packages/gallery/src/components/image-viewer/video/index.module.css
@@ -2,15 +2,19 @@
 
 .videoWrapper {
     display: flex;
+    align-items: center;
     justify-content: center;
     height: 100%;
-    width: auto;
+    width: 100%;
+    min-width: 0;
+    min-height: 0;
     position: relative;
 }
 
 .video {
     max-width: 100%;
     max-height: 100%;
+    object-fit: contain;
     border-radius: var(--border-radius-24);
 }
 
diff --git a/packages/gallery/src/index.module.css b/packages/gallery/src/index.module.css
index 0678f4fab8..51286b0af6 100644
--- a/packages/gallery/src/index.module.css
+++ b/packages/gallery/src/index.module.css
@@ -9,6 +9,7 @@
     flex-direction: column;
     justify-content: space-between;
     height: 100%;
+    height: 100dvh;
     width: 100%;
     background-color: var(--color-static-neutral-0-inverted);
     padding-top: var(--sat);
@@ -23,6 +24,7 @@
     flex-grow: 1;
     width: 100vw;
     height: 100vh;
+    height: 100dvh;
     background: transparent;
 }