diff --git a/plugin/src/App/Components/Header.lua b/plugin/src/App/Components/Header.lua
index 4d31db0ef..81e2f46ac 100644
--- a/plugin/src/App/Components/Header.lua
+++ b/plugin/src/App/Components/Header.lua
@@ -37,7 +37,7 @@ local function Header(props)
 				TextXAlignment = Enum.TextXAlignment.Left,
 				TextTransparency = props.transparency,
 
-				Size = UDim2.new(1, 0, 0, 14),
+				Size = UDim2.new(1, 0, 0, theme.TextSize.Body),
 
 				LayoutOrder = 2,
 				BackgroundTransparency = 1,
diff --git a/plugin/src/App/Components/PatchVisualizer/DomLabel.lua b/plugin/src/App/Components/PatchVisualizer/DomLabel.lua
index 571c81b7f..689f81439 100644
--- a/plugin/src/App/Components/PatchVisualizer/DomLabel.lua
+++ b/plugin/src/App/Components/PatchVisualizer/DomLabel.lua
@@ -255,7 +255,7 @@ function DomLabel:render()
 						TextSize = theme.TextSize.Body,
 						TextColor3 = theme.SubTextColor,
 						TextTransparency = props.transparency,
-						Size = UDim2.new(0, 0, 0, 16),
+						Size = UDim2.new(0, 0, 0, theme.TextSize.Body),
 						AutomaticSize = Enum.AutomaticSize.X,
 						LayoutOrder = 2,
 					})
@@ -268,7 +268,7 @@ function DomLabel:render()
 						TextSize = theme.TextSize.Body,
 						TextColor3 = theme.Diff.Warning,
 						TextTransparency = props.transparency,
-						Size = UDim2.new(0, 0, 0, 16),
+						Size = UDim2.new(0, 0, 0, theme.TextSize.Body),
 						AutomaticSize = Enum.AutomaticSize.X,
 						LayoutOrder = 6,
 					})
diff --git a/plugin/src/App/Components/Tag.lua b/plugin/src/App/Components/Tag.lua
index 6eb2756fb..6e6d4c4f0 100644
--- a/plugin/src/App/Components/Tag.lua
+++ b/plugin/src/App/Components/Tag.lua
@@ -22,7 +22,7 @@ return function(props)
 			layoutOrder = props.layoutOrder,
 			position = props.position,
 			anchorPoint = props.anchorPoint,
-			size = UDim2.new(0, 0, 0, 16),
+			size = UDim2.new(0, 0, 0, theme.TextSize.Medium),
 			automaticSize = Enum.AutomaticSize.X,
 		}, {
 			Padding = e("UIPadding", {
diff --git a/plugin/src/App/Components/TextButton.lua b/plugin/src/App/Components/TextButton.lua
index 372b76081..6751476c2 100644
--- a/plugin/src/App/Components/TextButton.lua
+++ b/plugin/src/App/Components/TextButton.lua
@@ -52,7 +52,7 @@ function TextButton:render()
 		local bindingEnabled = bindingUtil.deriveProperty(self.binding, "enabled")
 
 		return e("ImageButton", {
-			Size = UDim2.new(0, 15 + textBounds.X + 15, 0, 34),
+			Size = UDim2.new(0, (theme.TextSize.Body * 2) + textBounds.X, 0, 34),
 			Position = self.props.position,
 			AnchorPoint = self.props.anchorPoint,
 
diff --git a/plugin/src/App/Notifications.lua b/plugin/src/App/Notifications.lua
index d8d2fb0ff..ece8f1f7c 100644
--- a/plugin/src/App/Notifications.lua
+++ b/plugin/src/App/Notifications.lua
@@ -105,7 +105,7 @@ function Notification:render()
 					transparency = transparency,
 				})
 
-				buttonsX += getTextBounds(action.text, theme.Font.Main, theme.TextSize.Large, math.huge).X + 30
+				buttonsX += getTextBounds(action.text, theme.Font.Main, theme.TextSize.Large, math.huge).X + (theme.TextSize.Body * 2)
 
 				count += 1
 			end
diff --git a/plugin/src/App/StatusPages/Confirming.lua b/plugin/src/App/StatusPages/Confirming.lua
index 970da0863..3f3958a4c 100644
--- a/plugin/src/App/StatusPages/Confirming.lua
+++ b/plugin/src/App/StatusPages/Confirming.lua
@@ -70,7 +70,7 @@ function ConfirmingPage:render()
 				TextColor3 = theme.TextColor,
 				TextXAlignment = Enum.TextXAlignment.Left,
 				TextTransparency = self.props.transparency,
-				Size = UDim2.new(1, 0, 0, 20),
+				Size = UDim2.new(1, 0, 0, theme.TextSize.Large + 2),
 				BackgroundTransparency = 1,
 			}),
 
diff --git a/plugin/src/App/StatusPages/Connected.lua b/plugin/src/App/StatusPages/Connected.lua
index c7b706de6..1d089e28f 100644
--- a/plugin/src/App/StatusPages/Connected.lua
+++ b/plugin/src/App/StatusPages/Connected.lua
@@ -66,7 +66,7 @@ function ChangesViewer:render()
 					TextXAlignment = Enum.TextXAlignment.Left,
 					TextColor3 = theme.TextColor,
 					TextTransparency = self.props.transparency,
-					Size = UDim2.new(1, -40, 0, 20),
+					Size = UDim2.new(1, -40, 0, theme.TextSize.Large + 2),
 					Position = UDim2.new(0, 40, 0, 0),
 					BackgroundTransparency = 1,
 				}),
@@ -79,8 +79,8 @@ function ChangesViewer:render()
 					TextColor3 = theme.SubTextColor,
 					TextTruncate = Enum.TextTruncate.AtEnd,
 					TextTransparency = self.props.transparency,
-					Size = UDim2.new(1, -40, 0, 16),
-					Position = UDim2.new(0, 40, 0, 20),
+					Size = UDim2.new(1, -40, 0, theme.TextSize.Medium),
+					Position = UDim2.new(0, 40, 0, theme.TextSize.Large + 2),
 					BackgroundTransparency = 1,
 				}),
 
@@ -223,7 +223,7 @@ local function ConnectionDetails(props)
 					TextTransparency = props.transparency,
 					TextXAlignment = Enum.TextXAlignment.Left,
 
-					Size = UDim2.new(1, 0, 0, 20),
+					Size = UDim2.new(1, 0, 0, theme.TextSize.Large),
 
 					LayoutOrder = 1,
 					BackgroundTransparency = 1,
@@ -237,7 +237,7 @@ local function ConnectionDetails(props)
 					TextTransparency = props.transparency,
 					TextXAlignment = Enum.TextXAlignment.Left,
 
-					Size = UDim2.new(1, 0, 0, 15),
+					Size = UDim2.new(1, 0, 0, theme.TextSize.Medium),
 
 					LayoutOrder = 2,
 					BackgroundTransparency = 1,
diff --git a/plugin/src/App/StatusPages/Settings/Setting.lua b/plugin/src/App/StatusPages/Settings/Setting.lua
index ebf3cb69b..40a1e232d 100644
--- a/plugin/src/App/StatusPages/Settings/Setting.lua
+++ b/plugin/src/App/StatusPages/Settings/Setting.lua
@@ -150,7 +150,7 @@ function Setting:render()
 				BackgroundTransparency = 1,
 			}, {
 				Heading = e("Frame", {
-					Size = UDim2.new(1, 0, 0, 16),
+					Size = UDim2.new(1, 0, 0, theme.TextSize.Medium),
 					BackgroundTransparency = 1,
 				}, {
 					Layout = e("UIListLayout", {
@@ -179,7 +179,7 @@ function Setting:render()
 						TextTransparency = self.props.transparency,
 						RichText = true,
 
-						Size = UDim2.new(1, 0, 0, 16),
+						Size = UDim2.new(1, 0, 0, theme.TextSize.Medium),
 
 						LayoutOrder = 2,
 						BackgroundTransparency = 1,