diff --git a/Cargo.lock b/Cargo.lock
index 8cdfbc894aa0..f639115b80d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1308,7 +1308,7 @@ checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
 [[package]]
 name = "ecolor"
 version = "0.20.0"
-source = "git+https://github.com/emilk/egui?rev=fe7ff6626652d2da6c1fa63b7b75131cd9d664ab#fe7ff6626652d2da6c1fa63b7b75131cd9d664ab"
+source = "git+https://github.com/emilk/egui?rev=e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c#e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1317,7 +1317,7 @@ dependencies = [
 [[package]]
 name = "eframe"
 version = "0.20.1"
-source = "git+https://github.com/emilk/egui?rev=fe7ff6626652d2da6c1fa63b7b75131cd9d664ab#fe7ff6626652d2da6c1fa63b7b75131cd9d664ab"
+source = "git+https://github.com/emilk/egui?rev=e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c#e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c"
 dependencies = [
  "bytemuck",
  "directories-next",
@@ -1344,7 +1344,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.20.1"
-source = "git+https://github.com/emilk/egui?rev=fe7ff6626652d2da6c1fa63b7b75131cd9d664ab#fe7ff6626652d2da6c1fa63b7b75131cd9d664ab"
+source = "git+https://github.com/emilk/egui?rev=e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c#e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c"
 dependencies = [
  "accesskit",
  "ahash 0.8.2",
@@ -1366,7 +1366,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.20.0"
-source = "git+https://github.com/emilk/egui?rev=fe7ff6626652d2da6c1fa63b7b75131cd9d664ab#fe7ff6626652d2da6c1fa63b7b75131cd9d664ab"
+source = "git+https://github.com/emilk/egui?rev=e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c#e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c"
 dependencies = [
  "bytemuck",
  "epaint",
@@ -1380,7 +1380,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.20.1"
-source = "git+https://github.com/emilk/egui?rev=fe7ff6626652d2da6c1fa63b7b75131cd9d664ab#fe7ff6626652d2da6c1fa63b7b75131cd9d664ab"
+source = "git+https://github.com/emilk/egui?rev=e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c#e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c"
 dependencies = [
  "arboard",
  "egui",
@@ -1405,7 +1405,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.20.0"
-source = "git+https://github.com/emilk/egui?rev=fe7ff6626652d2da6c1fa63b7b75131cd9d664ab#fe7ff6626652d2da6c1fa63b7b75131cd9d664ab"
+source = "git+https://github.com/emilk/egui?rev=e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c#e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c"
 dependencies = [
  "egui",
  "serde",
@@ -1415,7 +1415,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.20.1"
-source = "git+https://github.com/emilk/egui?rev=fe7ff6626652d2da6c1fa63b7b75131cd9d664ab#fe7ff6626652d2da6c1fa63b7b75131cd9d664ab"
+source = "git+https://github.com/emilk/egui?rev=e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c#e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1437,7 +1437,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 [[package]]
 name = "emath"
 version = "0.20.0"
-source = "git+https://github.com/emilk/egui?rev=fe7ff6626652d2da6c1fa63b7b75131cd9d664ab#fe7ff6626652d2da6c1fa63b7b75131cd9d664ab"
+source = "git+https://github.com/emilk/egui?rev=e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c#e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1483,7 +1483,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.20.0"
-source = "git+https://github.com/emilk/egui?rev=fe7ff6626652d2da6c1fa63b7b75131cd9d664ab#fe7ff6626652d2da6c1fa63b7b75131cd9d664ab"
+source = "git+https://github.com/emilk/egui?rev=e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c#e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.2",
diff --git a/Cargo.toml b/Cargo.toml
index cc0696bf0bfe..30aea8cec007 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,14 +67,14 @@ arrow2_convert = { git = "https://github.com/rerun-io/arrow2-convert", rev = "7e
 # arrow2 = { path = "../arrow2" }
 # arrow2_convert = { path = "../arrow2-convert/arrow2_convert" }
 
-# 2023-01-27 - add ability to disable the vertical line in indented blocks (e.g. our blurprint panel tree)
-ecolor = { git = "https://github.com/emilk/egui", rev = "fe7ff6626652d2da6c1fa63b7b75131cd9d664ab" }
-eframe = { git = "https://github.com/emilk/egui", rev = "fe7ff6626652d2da6c1fa63b7b75131cd9d664ab" }
-egui = { git = "https://github.com/emilk/egui", rev = "fe7ff6626652d2da6c1fa63b7b75131cd9d664ab" }
-egui_extras = { git = "https://github.com/emilk/egui", rev = "fe7ff6626652d2da6c1fa63b7b75131cd9d664ab" }
-egui-wgpu = { git = "https://github.com/emilk/egui", rev = "fe7ff6626652d2da6c1fa63b7b75131cd9d664ab" }
-emath = { git = "https://github.com/emilk/egui", rev = "fe7ff6626652d2da6c1fa63b7b75131cd9d664ab" }
-epaint = { git = "https://github.com/emilk/egui", rev = "fe7ff6626652d2da6c1fa63b7b75131cd9d664ab" }
+# 2023-01-27 - dragvalue/sliders use proportional font
+ecolor = { git = "https://github.com/emilk/egui", rev = "e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c" }
+eframe = { git = "https://github.com/emilk/egui", rev = "e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c" }
+egui = { git = "https://github.com/emilk/egui", rev = "e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c" }
+egui_extras = { git = "https://github.com/emilk/egui", rev = "e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c" }
+egui-wgpu = { git = "https://github.com/emilk/egui", rev = "e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c" }
+emath = { git = "https://github.com/emilk/egui", rev = "e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c" }
+epaint = { git = "https://github.com/emilk/egui", rev = "e7c0547e23aa6139c51ecdd4bb1dc346bbcac22c" }
 # ecolor = { path = "../../egui/crates/ecolor" }
 # eframe = { path = "../../egui/crates/eframe" }
 # egui = { path = "../../egui/crates/egui" }
diff --git a/crates/re_ui/src/design_tokens.rs b/crates/re_ui/src/design_tokens.rs
index 79f0fdaa0a84..ee57d57d8ea1 100644
--- a/crates/re_ui/src/design_tokens.rs
+++ b/crates/re_ui/src/design_tokens.rs
@@ -128,7 +128,8 @@ fn apply_design_tokens(ctx: &egui::Context) -> DesignTokens {
     // Add stripes to grids and tables?
     egui_style.visuals.striped = false;
     egui_style.visuals.indent_has_left_vline = false;
-    egui_style.spacing.indent = 14.0;
+    egui_style.spacing.button_padding = egui::Vec2::new(1.0, 1.0); // Makes the icons in the blueprint panel align
+    egui_style.spacing.indent = 14.0; // From figma
 
     egui_style.debug.show_blocking_widget = false; // turn this on to debug interaction problems
 
diff --git a/crates/re_ui/src/lib.rs b/crates/re_ui/src/lib.rs
index 1f2b3f5e9c79..d8178830fb9c 100644
--- a/crates/re_ui/src/lib.rs
+++ b/crates/re_ui/src/lib.rs
@@ -124,8 +124,8 @@ impl ReUi {
     pub fn hovering_frame(&self) -> egui::Frame {
         let style = self.egui_ctx.style();
         egui::Frame {
-            inner_margin: egui::style::Margin::same(2.0),
-            outer_margin: egui::style::Margin::same(4.0),
+            inner_margin: egui::style::Margin::symmetric(4.0, 2.0),
+            outer_margin: egui::style::Margin::same(2.0),
             rounding: Self::small_rounding().into(),
             fill: style.visuals.window_fill(),
             stroke: style.visuals.window_stroke(),
diff --git a/crates/re_viewer/src/ui/viewport.rs b/crates/re_viewer/src/ui/viewport.rs
index d101641f55dd..6d221942b2f7 100644
--- a/crates/re_viewer/src/ui/viewport.rs
+++ b/crates/re_viewer/src/ui/viewport.rs
@@ -770,9 +770,14 @@ fn hovering_panel(
     rect: egui::Rect,
     add_contents: impl FnOnce(&mut egui::Ui),
 ) {
-    let mut ui = ui.child_ui(rect, egui::Layout::top_down(egui::Align::LEFT));
-    ui.horizontal(|ui| {
-        frame.show(ui, add_contents);
+    let height = 28.0; // TODO(emilk): remove this hard-coded monstrosity
+    let mut max_rect = rect;
+    max_rect.max.y = max_rect.min.y + height;
+
+    ui.allocate_ui_at_rect(max_rect, |ui| {
+        ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| {
+            frame.show(ui, add_contents);
+        });
     });
 }