diff --git a/res/css/views/rooms/_InviteOnlyIcon.scss b/res/css/views/rooms/_InviteOnlyIcon.scss
index e70586bb73..f4d9e4869f 100644
--- a/res/css/views/rooms/_InviteOnlyIcon.scss
+++ b/res/css/views/rooms/_InviteOnlyIcon.scss
@@ -20,7 +20,7 @@ limitations under the License.
     position: relative;
     display: block !important;
     // Align the padlock with unencrypted room names
-    margin-left: 6px;
+    margin: 0 4px;
 
     &::before {
         background-color: $roomtile-name-color;
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index fae9d0dfe3..a05b4c0c0e 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -76,8 +76,8 @@ limitations under the License.
     left: 60px;
     margin-right: 0; // Counteract the E2EIcon class
     margin-left: 3px; // Counteract the E2EIcon class
-    width: 12px;
-    height: 12px;
+    width: 15px;
+    height: 15px;
 }
 
 .mx_MessageComposer_noperm_error {
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 6f0377b29c..47b8131ef0 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -21,10 +21,10 @@ limitations under the License.
     .mx_E2EIcon {
         margin: 0;
         position: absolute;
-        bottom: -1px;
-        right: -2px;
-        height: 10px;
-        width: 10px;
+        bottom: -2px;
+        right: -6px;
+        height: 15px;
+        width: 15px;
     }
 }
 
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index a24fdf2629..31d887cbbb 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -101,19 +101,19 @@ limitations under the License.
 // Note we match .mx_E2EIcon to make sure this matches more tightly than just
 // .mx_E2EIcon on its own
 .mx_RoomTile_e2eIcon.mx_E2EIcon {
-    height: 10px;
-    width: 10px;
+    height: 14px;
+    width: 14px;
     display: block;
     position: absolute;
-    bottom: -1px;
-    right: -2px;
+    bottom: -2px;
+    right: -5px;
     z-index: 1;
     margin: 0;
 }
 
 .mx_RoomTile_name {
     font-size: 14px;
-    padding: 0 6px;
+    padding: 0 4px;
     color: $roomtile-name-color;
     white-space: nowrap;
     overflow-x: hidden;
@@ -214,8 +214,3 @@ limitations under the License.
 .mx_GroupInviteTile .mx_RoomTile_name {
     flex: 1;
 }
-
-.mx_InviteOnlyIcon + .mx_RoomTile_nameContainer .mx_RoomTile_name {
-    // Scoot the padding in a bit from 6px to make it look better
-    padding-left: 3px;
-}