diff --git a/Tusker/Views/Status/StatusCollectionViewCell.swift b/Tusker/Views/Status/StatusCollectionViewCell.swift
index c03bfc6c..d2108875 100644
--- a/Tusker/Views/Status/StatusCollectionViewCell.swift
+++ b/Tusker/Views/Status/StatusCollectionViewCell.swift
@@ -116,15 +116,16 @@ extension StatusCollectionViewCell {
                 statusState.collapsed = false
             }
         }
+        collapseButton.isHidden = !statusState.collapsible!
         contentContainer.setCollapsed(statusState.collapsed!)
         if statusState.collapsed! {
             contentContainer.alpha = 0
             // TODO: is this accessing the image view before the button's been laid out?
-            collapseButton.imageView!.transform = CGAffineTransform(rotationAngle: .pi)
+            collapseButton.imageView!.transform = CGAffineTransform(rotationAngle: 0)
             collapseButton.accessibilityLabel = NSLocalizedString("Expand Status", comment: "expand status button accessibility label")
         } else {
             contentContainer.alpha = 1
-            collapseButton.imageView!.transform = CGAffineTransform(rotationAngle: 0)
+            collapseButton.imageView!.transform = CGAffineTransform(rotationAngle: .pi)
             collapseButton.accessibilityLabel = NSLocalizedString("Collapse Status", comment: "collapse status button accessibility label")
         }
     }