diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index 8afd2670a7..b8fb9b81c2 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -27,14 +27,19 @@ limitations under the License.
 .mx_ImageView_content {
     width: 100%;
 
+    display: flex;
+    flex-direction: column;
+}
+
+.mx_ImageView_image_wrapper {
     display: flex;
     justify-content: center;
     align-items: center;
-
+    height: 100%;
     overflow: hidden;
 }
 
-.mainImage {
+.mx_ImageView_image {
     object-fit: contain;
     pointer-events: all;
 
@@ -43,6 +48,8 @@ limitations under the License.
     min-width: 100px;
     min-height: 100px;
 
+    border-radius: 8px;
+
     &:hover {
         cursor: grab;
     }
@@ -51,7 +58,6 @@ limitations under the License.
 .mx_ImageView_panel {
     width: 100%;
     height: 68px;
-    position: absolute;
     z-index: 1000;
     align-self: flex-start;
     pointer-events: all;
@@ -62,7 +68,6 @@ limitations under the License.
 
 .mx_ImageView_toolbar {
     right: 0;
-    padding-right: 18px;
     display: flex;
     align-items: center;
 }
@@ -74,7 +79,6 @@ limitations under the License.
 
 .mx_ImageView_label {
     left: 0;
-    padding-left: 18px;
     text-align: left;
     display: flex;
     justify-content: center;
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index fd9d84b900..e35c8a3e15 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -286,17 +286,19 @@ export default class ImageView extends React.Component {
                             </AccessibleButton>
                         </div>
                     </div>
-                    <img
-                        src={this.props.src}
-                        title={this.props.name}
-                        style={style}
-                        className="mainImage"
-                        draggable={true}
-                        onMouseDown={this.onStartMoving}
-                        onMouseMove={this.onMoving}
-                        onMouseUp={this.onEndMoving}
-                        onMouseLeave={this.onEndMoving}
-                    />
+                    <div className="mx_ImageView_image_wrapper">
+                        <img
+                            src={this.props.src}
+                            title={this.props.name}
+                            style={style}
+                            className="mx_ImageView_image"
+                            draggable={true}
+                            onMouseDown={this.onStartMoving}
+                            onMouseMove={this.onMoving}
+                            onMouseUp={this.onEndMoving}
+                            onMouseLeave={this.onEndMoving}
+                        />
+                    </div>
                 </div>
             </FocusLock>
         );