diff --git a/Cargo.toml b/Cargo.toml
index 66c7f0d..732fed4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,7 +87,7 @@ tui-textarea = "0.3.0"
 unicode-width = "0.1"
 
 # UI (images)
-ratatui-image = { version = "0.8.0", optional = true }
+ratatui-image = { version = "0.8.0", optional = true, features = ["crossterm"] }
 image = { version = "0.24.8", optional = true }
 
 [patch.crates-io]
diff --git a/src/app.rs b/src/app.rs
index f330cba..3c4fb30 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -53,6 +53,13 @@ pub struct App {
 
 impl App {
   pub async fn new(frame_rate: f64, log_receiver: mpsc::UnboundedReceiver<String>) -> Result<Self> {
+    // Forces PROTOCOL_PICKER to be initialized early, as it may get stuck if called
+    // after we started rendering.
+    #[cfg(feature = "images")]
+    log::info!(
+      "Using image protocol: {:?}",
+      crate::widgets::PROTOCOL_PICKER.protocol_type
+    );
     let config = Config::new()?;
     let datadir = config.config._data_dir.join("default");
     let future_clients = config.accounts.clone().map(|conf| {
diff --git a/src/buffers/room.rs b/src/buffers/room.rs
index 302ad57..7db8ae0 100644
--- a/src/buffers/room.rs
+++ b/src/buffers/room.rs
@@ -609,7 +609,12 @@ impl RoomBuffer {
     let initial_roominfo_hash = hash_roominfo(room.clone_info());
     let computed_roominfo = compute_room_info(room, initial_roominfo_hash).await;
 
-    tokio::task::spawn(update_roominfo_worker(room_id.clone(), initial_roominfo_hash, roominfo_rx, computed_roominfo_tx));
+    tokio::task::spawn(update_roominfo_worker(
+      room_id.clone(),
+      initial_roominfo_hash,
+      roominfo_rx,
+      computed_roominfo_tx,
+    ));
 
     let mut self_ = RoomBuffer {
       config,
@@ -691,7 +696,8 @@ impl Buffer for RoomBuffer {
   fn short_name(&self) -> String {
     self
       .computed_roominfo
-      .display_name.as_ref()
+      .display_name
+      .as_ref()
       .map(|dn| dn.to_string())
       .unwrap_or_else(|| {
         self
@@ -714,13 +720,15 @@ impl Buffer for RoomBuffer {
   fn parent(&self) -> Option<BufferId> {
     self
       .computed_roominfo
-      .parent.as_ref()
+      .parent
+      .as_ref()
       .map(|parent| BufferId::Room(parent.clone()))
   }
   fn children(&self) -> Option<SortedVec<(BufferSortKey, BufferId)>> {
     self
       .computed_roominfo
-      .children.as_ref()
+      .children
+      .as_ref()
       .map(|children: &SortedVec<_>| {
         let children = children
           .iter()
@@ -813,10 +821,7 @@ impl Buffer for RoomBuffer {
   }
 
   fn fully_read(&self) -> FullyReadStatus {
-    match self
-      .computed_roominfo
-      .fully_read_at.as_ref()
-    {
+    match self.computed_roominfo.fully_read_at.as_ref() {
       None => FullyReadStatus::All, // Unknown, assume it's read for now, we'll probably find out later
       Some(fully_read_at) => {
         // Iterate through all buffers, and if any buffer's last event is not the one where
@@ -1055,10 +1060,9 @@ async fn update_roominfo_worker(
     }
     last_roominfo_hash = roominfo_hash;
     tracing::trace!("visible change to {}", room_id);
-    let room = buf
-      .client
-      .get_room(&room_id)
-      .expect("client missing room");
-    computed_roominfo_tx.send(compute_room_info(room, roominfo_hash).await).expect("failed to send to computed_roominfo_tx");
+    let room = buf.client.get_room(&room_id).expect("client missing room");
+    computed_roominfo_tx
+      .send(compute_room_info(room, roominfo_hash).await)
+      .expect("failed to send to computed_roominfo_tx");
   }
 }
diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs
index 38c037d..e2b89db 100644
--- a/src/widgets/mod.rs
+++ b/src/widgets/mod.rs
@@ -78,7 +78,7 @@ mod images {
 
   lazy_static::lazy_static! {
     static ref PROTOCOL_PICKER_LOCK: Mutex<()> = Mutex::new(());
-    static ref PROTOCOL_PICKER: Picker = make_protocol_picker();
+    pub static ref PROTOCOL_PICKER: Picker = make_protocol_picker();
   }
 
   fn make_protocol_picker() -> Picker {
@@ -99,15 +99,33 @@ mod images {
   }
 
   impl<'a> OverlappableWidget for BottomAlignedImage<'a> {
-    fn height(&self, _width: u16) -> u64 {
-      20 // TODO
+    fn height(&self, width: u16) -> u64 {
+      let width_px: u32 = u32::min(
+        self.0.width(),
+        (width as u32) * (PROTOCOL_PICKER.font_size.0 as u32),
+      );
+      let height_px = u32::min(self.0.height(), width_px * self.0.height() / self.0.width());
+      u32::min(
+        u16::MAX.into(),
+        height_px / (PROTOCOL_PICKER.font_size.1 as u32),
+      )
+      .into()
     }
-    fn render_overlap(self, area: Rect, buf: &mut Buffer) -> (u16, u16) {
-      /*
-      let width = u16::min(100, area.width);
-      let width_px: u32 = (width as u32) * (PROTOCOL_PICKER.font_size.0 as u32);
-      let height_px = width_px * self.0.height() / self.0.width();
-      let height = u32::min(u16::MAX.into(), height_px / (PROTOCOL_PICKER.font_size.1 as u32)) as u16;
+
+    fn render_overlap(self, mut area: Rect, buf: &mut Buffer) -> (u16, u16) {
+      let width = u16::min(
+        u32::min(
+          u16::MAX.into(),
+          self.0.width() / (PROTOCOL_PICKER.font_size.0 as u32),
+        ) as u16,
+        area.width,
+      );
+      let height = u64::min(self.height(width), u16::MAX.into()) as u16;
+
+      area.y = u16::max(
+        area.y,
+        area.y.saturating_add(area.height).saturating_sub(height),
+      );
 
       let protocol = PROTOCOL_PICKER
         .clone()
@@ -122,14 +140,14 @@ mod images {
           ratatui_image::Resize::Crop,
         )
         .expect("picker.new_protocol failed");
-      let widget= ratatui_image::Image::new(protocol.as_ref());
+      let widget = ratatui_image::Image::new(protocol.as_ref());
       widget.render(area, buf); // TODO: scroll
-                                */
       (area.width, 20)
     }
   }
 }
 
+#[cfg(feature = "images")]
 pub use images::*;
 
 /*