diff --git a/src/sass/tweet/media.scss b/src/sass/tweet/media.scss
index a7ddf41..3c6c348 100644
--- a/src/sass/tweet/media.scss
+++ b/src/sass/tweet/media.scss
@@ -12,6 +12,7 @@
 
     .still-image {
         width: 100%;
+        display: block;
     }
 }
 
@@ -66,7 +67,14 @@
 
 .single-image {
     display: inline-block;
-    width: unset;
+    width: 100%;
+    max-height: 600px;
+
+    .attachments {
+        width: unset;
+        max-height: unset;
+        display: inherit;
+    }
 }
 
 .overlay-circle {
diff --git a/src/views/tweet.nim b/src/views/tweet.nim
index 4f49537..c890667 100644
--- a/src/views/tweet.nim
+++ b/src/views/tweet.nim
@@ -31,19 +31,24 @@ proc renderAlbum(tweet: Tweet): VNode =
   let
     groups = if tweet.photos.len < 3: @[tweet.photos]
              else: tweet.photos.distribute(2)
-    class = if groups.len == 1 and groups[0].len == 1: "single-image"
-            else: ""
 
-  buildHtml(tdiv(class=("attachments " & class))):
-    for i, photos in groups:
-      let margin = if i > 0: ".25em" else: ""
-      let flex = if photos.len > 1 or groups.len > 1: "flex" else: "block"
-      tdiv(class="gallery-row", style={marginTop: margin}):
-        for photo in photos:
-          tdiv(class="attachment image"):
-            a(href=getPicUrl(photo & "?name=orig"), class="still-image",
-              target="_blank", style={display: flex}):
-              genImg(photo)
+  if groups.len == 1 and groups[0].len == 1:
+    buildHtml(tdiv(class="single-image")):
+      tdiv(class="attachments gallery-row"):
+        a(href=getPicUrl(groups[0][0] & "?name=orig"), class="still-image",
+          target="_blank"):
+            genImg(groups[0][0])
+  else:
+    buildHtml(tdiv(class="attachments")):
+      for i, photos in groups:
+        let margin = if i > 0: ".25em" else: ""
+        let flex = if photos.len > 1 or groups.len > 1: "flex" else: "block"
+        tdiv(class="gallery-row", style={marginTop: margin}):
+          for photo in photos:
+            tdiv(class="attachment image"):
+              a(href=getPicUrl(photo & "?name=orig"), class="still-image",
+                target="_blank", style={display: flex}):
+                genImg(photo)
 
 proc isPlaybackEnabled(prefs: Prefs; video: Video): bool =
   case video.playbackType