diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index d864ad9adf..9b77f70262 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -90,7 +90,7 @@ limitations under the License.
 }
 
 .mx_ImageView_button {
-    padding-left: 24px;
+    margin-left: 24px;
     display: block;
 
     &::before {
@@ -130,11 +130,12 @@ limitations under the License.
 }
 
 .mx_ImageView_button_close {
-    padding-left: 32px;
+    border-radius: 100%;
+    background: #21262C;
     &::before {
         width: 32px;
         height: 32px;
         mask-image: url('$(res)/img/image-view/close.svg');
-        background-color: none;
+        mask-size: 40%;
     }
 }
diff --git a/res/img/image-view/close.svg b/res/img/image-view/close.svg
index f849425264..d603b7f5cc 100644
--- a/res/img/image-view/close.svg
+++ b/res/img/image-view/close.svg
@@ -1,4 +1,3 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="32" height="32" rx="16" fill="#21262C"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4684 12.0406C21.8589 11.65 21.8589 11.0169 21.4684 10.6263C21.0779 10.2358 20.4447 10.2358 20.0542 10.6263L16.0472 14.6333L11.8114 10.3975C11.4208 10.007 10.7877 10.007 10.3972 10.3975C10.0066 10.788 10.0066 11.4212 10.3972 11.8117L14.633 16.0475L10.6261 20.0544C10.2356 20.445 10.2356 21.0781 10.6261 21.4686C11.0166 21.8592 11.6498 21.8592 12.0403 21.4686L16.0472 17.4618L19.8252 21.2398C20.2158 21.6303 20.8489 21.6303 21.2395 21.2398C21.63 20.8493 21.63 20.2161 21.2395 19.8256L17.4614 16.0475L21.4684 12.0406Z" fill="#A9B2BC"/>
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4684 2.04056C11.8589 1.65003 11.8589 1.01687 11.4684 0.626342C11.0779 0.235818 10.4447 0.235818 10.0542 0.626342L6.04718 4.63333L1.81137 0.397522C1.42084 0.00699783 0.78768 0.00699781 0.397156 0.397522C0.0066314 0.788046 0.00663096 1.42121 0.397155 1.81174L4.63297 6.04755L0.62608 10.0544C0.235557 10.445 0.235556 11.0781 0.626081 11.4686C1.0166 11.8592 1.64977 11.8592 2.04029 11.4686L6.04718 7.46176L9.82525 11.2398C10.2158 11.6303 10.8489 11.6303 11.2395 11.2398C11.63 10.8493 11.63 10.2161 11.2395 9.82561L7.46139 6.04755L11.4684 2.04056Z" fill="#A9B2BC"/>
 </svg>