diff --git a/src/components/forms/input.css b/src/components/forms/input.css
index 91b42d4cc59e69dc505975a90d22db22891b5253..bd69596368e4aca073dac10f8c19c1a588197825 100644
--- a/src/components/forms/input.css
+++ b/src/components/forms/input.css
@@ -2,7 +2,8 @@
 @import "../../css/colors.css";
 
 .input-form {
-    padding: $space 0.75rem;
+    height: 2rem;
+    padding: 0 0.75rem;
 
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size: 0.625rem;
diff --git a/src/components/sprite-info/sprite-info.css b/src/components/sprite-info/sprite-info.css
index 16803973b360a6d1df6e2294b3e6b88393007cd3..25e96382f13710bc9ad46c5bdcc5f4d3a3d1698e 100644
--- a/src/components/sprite-info/sprite-info.css
+++ b/src/components/sprite-info/sprite-info.css
@@ -3,7 +3,7 @@
 
 .sprite-info {
     height: $sprite-info-height;
-    padding: $space;
+    padding: 0.75rem;
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     background-color: white;
     color: #575e75;
@@ -17,7 +17,9 @@
     justify-content: space-between;
 }
 
-.row-primary { margin-bottom: $space; }
+.row-primary {
+    margin-bottom: 0.5rem;
+}
 
 .label { opacity: 0.8; }
 
@@ -29,15 +31,9 @@
 
 .icon-wrapper {
     display: inline-block;
-
-    /*
-        content-box is normally the browser's default.
-        We're overriding the global, which we set to border-box
-    */
-    box-sizing: content-box;
-    width: 1.0rem;
-    height: 1.0rem;
-    padding: 0.25rem;
+    width: 2rem;
+    height: 2rem;
+    padding: 0.5rem;
     outline: none;
     user-select: none;
 }
diff --git a/src/components/stage-selector/stage-selector.css b/src/components/stage-selector/stage-selector.css
index cfe255a4fad5eaaa17dec31520907253622ebbc7..ef364139a75f537d5787d460033d6198fd277231 100644
--- a/src/components/stage-selector/stage-selector.css
+++ b/src/components/stage-selector/stage-selector.css
@@ -1,7 +1,7 @@
 @import "../../css/units.css";
 @import "../../css/colors.css";
 
-$header-height: calc(2rem - 2px); /* @todo: half the SpriteInfo area header? */
+$header-height: calc($stage-menu-height - 2px);
 
 .stage-selector {
     position: relative; /* for the child element border */
diff --git a/src/css/units.css b/src/css/units.css
index d951e3e1a874a4b34f22483d8d6cdc977d772e32..3de6174a2fe38b65148f7d99a5e459950e37160a 100644
--- a/src/css/units.css
+++ b/src/css/units.css
@@ -3,8 +3,8 @@ $space: 0.5rem;
 $sprites-per-row: 5;
 
 $menu-bar-height: 3rem;
-$sprite-info-height: 5.25rem; /* @todo: SpriteInfo isn't explicitly set to this height yet */
-$stage-menu-height: 3rem;
+$sprite-info-height: 6rem;
+$stage-menu-height: 2.75rem;
 
 $library-header-height: 4.375rem;