diff --git a/src/ui/web/css/login.css b/src/ui/web/css/login.css
index 1032ead0..192ccc13 100644
--- a/src/ui/web/css/login.css
+++ b/src/ui/web/css/login.css
@@ -34,7 +34,10 @@ limitations under the License.
     cursor: pointer;
     display: flex;
     align-items: center;
-    gap: 10px;
+}
+
+.SessionPickerView .session-info > :not(:first-child) {
+    margin-left: 8px;
 }
 
 .SessionPickerView li .user-id {
@@ -53,9 +56,13 @@ limitations under the License.
     display: flex;
 }
 
+.SessionLoadView > :not(:first-child) {
+    margin-left: 12px;
+}
+
 .SessionLoadView p {
     flex: 1;
-    margin: 0 0 0 10px;
+    margin: 0;
 }
 
 .SessionLoadView .spinner {
diff --git a/src/ui/web/css/room.css b/src/ui/web/css/room.css
index e57af8e5..8c70edf2 100644
--- a/src/ui/web/css/room.css
+++ b/src/ui/web/css/room.css
@@ -77,6 +77,6 @@ limitations under the License.
     justify-content: center;
 }
 
-.TimelineLoadingView div {
-    margin-right: 10px;
+.TimelineLoadingView > :not(:first-child) {
+    margin-left: 12px;
 }
diff --git a/src/ui/web/css/themes/element/theme.css b/src/ui/web/css/themes/element/theme.css
index 0bf46aef..8c71a839 100644
--- a/src/ui/web/css/themes/element/theme.css
+++ b/src/ui/web/css/themes/element/theme.css
@@ -507,3 +507,7 @@ ul.Timeline > li.messageStatus .message-container > p {
     text-align: center;
     border-radius: 10px;
 }
+
+.GapView > :not(:first-child) {
+    margin-left: 12px;
+}
diff --git a/src/ui/web/css/timeline.css b/src/ui/web/css/timeline.css
index d3f29fc9..44ff29d6 100644
--- a/src/ui/web/css/timeline.css
+++ b/src/ui/web/css/timeline.css
@@ -76,7 +76,6 @@ limitations under the License.
     visibility: visible;
 }
 
-.GapView > div {
-    flex: 1 1 0;
-    margin-right: 10px;
+.GapView > :nth-child(2) {
+    flex: 1;
 }