diff --git a/epicyon-profile.css b/epicyon-profile.css
index 6ef938ec7..aa4dfc68c 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -184,6 +184,41 @@ body, html {
     image-rendering: var(--rendering);
 }
 
+video {
+    width: 100%;
+}
+
+figure[data-fullscreen=true] {
+    max-width: 100%;
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    max-height: 100%;
+}
+
+figure[data-fullscreen=true] video {
+    height: auto;
+}
+
+figure[data-fullscreen=true] .controls {
+    position: absolute;
+    bottom: 2%;
+    width: 100%;
+    z-index: 2147483647;
+}
+figure[data-fullscreen=true] .controls li {
+    width: 5%;
+}
+figure[data-fullscreen=true] .controls .progress {
+    width: 68%;
+}
+
+figure {
+    padding-left: 0;
+    padding-right: 0;
+    height: auto;
+}
+
 .cw {
     font-style: var(--cw-style);
     font-weight: var(--cw-weight);
diff --git a/webapp_utils.py b/webapp_utils.py
index 4ad922a5f..626fb6389 100644
--- a/webapp_utils.py
+++ b/webapp_utils.py
@@ -930,7 +930,10 @@ def getPostAttachmentsAsHtml(postJsonObject: {}, boxName: str, translate: {},
                     if not isMuted:
                         galleryStr += '  <a href="' + attach['url'] + '">\n'
                         galleryStr += \
-                            '    <video width="600" height="400" controls>\n'
+                            '    <figure id="videoContainer" ' + \
+                            'data-fullscreen="false">\n' + \
+                            '    <video id="video" controls ' + \
+                            'preload="metadata">\n'
                         galleryStr += \
                             '      <source src="' + attach['url'] + \
                             '" alt="' + imageDescription + \
@@ -940,6 +943,7 @@ def getPostAttachmentsAsHtml(postJsonObject: {}, boxName: str, translate: {},
                         idx = 'Your browser does not support the video tag.'
                         galleryStr += translate[idx]
                         galleryStr += '    </video>\n'
+                        galleryStr += '    </figure>\n'
                         galleryStr += '  </a>\n'
                     if postJsonObject['object'].get('url'):
                         videoPostUrl = postJsonObject['object']['url']