diff --git a/cypress/e2e/spaces/spaces.spec.ts b/cypress/e2e/spaces/spaces.spec.ts
index 2518ffebda..47232dc5af 100644
--- a/cypress/e2e/spaces/spaces.spec.ts
+++ b/cypress/e2e/spaces/spaces.spec.ts
@@ -77,8 +77,10 @@ describe("Spaces", () => {
         cy.stopSynapse(synapse);
     });
 
-    it("should allow user to create public space", () => {
-        openSpaceCreateMenu().within(() => {
+    it.only("should allow user to create public space", () => {
+        openSpaceCreateMenu();
+        cy.get("#mx_ContextualMenu_Container").percySnapshotElement("Space create menu");
+        cy.get(".mx_SpaceCreateMenu_wrapper .mx_ContextualMenu").within(() => {
             cy.get(".mx_SpaceCreateMenuType_public").click();
             cy.get('.mx_SpaceBasicSettings_avatarContainer input[type="file"]').selectFile(
                 "cypress/fixtures/riot.png",
diff --git a/res/css/structures/_SpaceRoomView.pcss b/res/css/structures/_SpaceRoomView.pcss
index f5d567d93f..633c94dfa3 100644
--- a/res/css/structures/_SpaceRoomView.pcss
+++ b/res/css/structures/_SpaceRoomView.pcss
@@ -38,9 +38,9 @@ $SpaceRoomViewInnerWidth: 428px;
     &::before {
         position: absolute;
         content: "";
-        width: 32px;
-        height: 32px;
-        top: 24px;
+        width: 24px;
+        height: 24px;
+        top: 27px;
         left: 20px;
         mask-position: center;
         mask-repeat: no-repeat;
diff --git a/res/css/views/dialogs/_JoinRuleDropdown.pcss b/res/css/views/dialogs/_JoinRuleDropdown.pcss
index ddb16c31df..83d73fcea2 100644
--- a/res/css/views/dialogs/_JoinRuleDropdown.pcss
+++ b/res/css/views/dialogs/_JoinRuleDropdown.pcss
@@ -50,8 +50,10 @@ limitations under the License.
     }
 
     .mx_JoinRuleDropdown_invite::before {
+        box-sizing: border-box;
         mask-image: url("$(res)/img/element-icons/lock.svg");
         mask-size: contain;
+        padding: 1px;
     }
 
     .mx_JoinRuleDropdown_public::before {
diff --git a/res/css/views/spaces/_SpaceCreateMenu.pcss b/res/css/views/spaces/_SpaceCreateMenu.pcss
index f1697dacb0..9bb95de2b6 100644
--- a/res/css/views/spaces/_SpaceCreateMenu.pcss
+++ b/res/css/views/spaces/_SpaceCreateMenu.pcss
@@ -58,8 +58,10 @@ $spacePanelWidth: 68px;
         .mx_SpaceCreateMenuType_public::before {
             mask-image: url("$(res)/img/globe.svg");
         }
+
         .mx_SpaceCreateMenuType_private::before {
             mask-image: url("$(res)/img/element-icons/lock.svg");
+            mask-size: 18px;
         }
 
         .mx_SpaceCreateMenu_back {