diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs
index 5e5fc37f96..73ab2bcaf7 100644
--- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs
+++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs
@@ -191,8 +191,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					x = column.Left + 2 * CellWidthPadding - _hBar.Value;
-					// TODO: fix this CellPadding issue (2 * CellPadding vs just CellPadding)
+					x = 1 + column.Left + CellWidthPadding - _hBar.Value;
 					y = CellHeightPadding;
 				}
 
@@ -264,7 +263,7 @@ namespace BizHawk.Client.EmuHawk
 						{
 							// Center Text
 							int textX = Math.Max(((colHeight - textWidth) / 2), CellWidthPadding) + strOffsetX;
-							int textY = CellWidthPadding + strOffsetY;
+							int textY = CellHeightPadding + strOffsetY;
 
 							_renderer.PrepDrawString(Font, _foreColor, rotate: true);
 							DrawString(text, new Rectangle(baseX - textY, baseY + textX, 999, CellHeight));
diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
index ea1a2aa48b..2d7d06e205 100644
--- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
+++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
@@ -1648,7 +1648,7 @@ namespace BizHawk.Client.EmuHawk
 			RecalculateScrollBars();
 			if (_columns.VisibleColumns.Any())
 			{
-				MaxColumnWidth = _columns.VisibleColumns.Max(c => c.Width) + CellWidthPadding * 4;
+				MaxColumnWidth = _columns.VisibleColumns.Max(c => c.Width);
 			}
 		}
 
@@ -1946,7 +1946,7 @@ namespace BizHawk.Client.EmuHawk
 		private int ColumnHeight => CellHeight + 2;
 
 		// The width of a cell in Horizontal Orientation.
-		private int CellWidth => (int)_charSize.Width + CellWidthPadding * 4; // Double the padding for horizontal because it looks better
+		private int CellWidth => Math.Max((int)_charSize.Height + CellHeightPadding * 2, (int)_charSize.Width + CellWidthPadding * 2);
 
 		// The height of a cell in Vertical Orientation.
 		private int CellHeight => (int)_charSize.Height + CellHeightPadding * 2;
@@ -1967,7 +1967,7 @@ namespace BizHawk.Client.EmuHawk
 			
 			if (_columns.VisibleColumns.Any())
 			{
-				MaxColumnWidth = _columns.VisibleColumns.Max(c => c.Width) + CellWidthPadding * 4;
+				MaxColumnWidth = _columns.VisibleColumns.Max(c => c.Width);
 			}
 		}
 
diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs
index 78bd394f73..d64b47acae 100644
--- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs
+++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 
 namespace BizHawk.Client.EmuHawk
 {