diff --git a/SecVF/ISOCacheManagerWindow.swift b/SecVF/ISOCacheManagerWindow.swift
index f146a07..9f7b728 100644
--- a/SecVF/ISOCacheManagerWindow.swift
+++ b/SecVF/ISOCacheManagerWindow.swift
@@ -214,7 +214,8 @@ class ISOCacheManagerWindow: NSWindowController, NSTableViewDataSource, NSTableV
         button.isBordered = true
         button.target = self
         button.action = action
-        button.font = NSFont.systemFont(ofSize: 12, weight: .semibold)
+        button.font = NSFont.systemFont(
+            ofSize: LayoutConstants.fontSizeBody, weight: .semibold)
         return button
     }
 
diff --git a/SecVF/SwitchStatisticsWindowController.swift b/SecVF/SwitchStatisticsWindowController.swift
index f60ab04..a2cbf2e 100644
--- a/SecVF/SwitchStatisticsWindowController.swift
+++ b/SecVF/SwitchStatisticsWindowController.swift
@@ -126,7 +126,8 @@ class SwitchStatisticsWindowController: NSWindowController {
         textView = NSTextView(frame: scrollView.bounds)
         textView.isEditable = false
         textView.isSelectable = true
-        textView.font = NSFont.monospacedSystemFont(ofSize: 12, weight: .regular)
+        textView.font = NSFont.monospacedSystemFont(
+            ofSize: LayoutConstants.fontSizeBody, weight: .regular)
         textView.textColor = .labelColor
         textView.backgroundColor = NSColor.textBackgroundColor
         textView.autoresizingMask = [.width]
diff --git a/SecVF/VMLibraryWindowController.swift b/SecVF/VMLibraryWindowController.swift
index bae932f..c7b87c4 100644
--- a/SecVF/VMLibraryWindowController.swift
+++ b/SecVF/VMLibraryWindowController.swift
@@ -888,7 +888,8 @@ class VMLibraryWindowController: NSWindowController,
         let titleLabel = NSTextField(labelWithAttributedString: NSAttributedString(
             string: "SecVF",
             attributes: [
-                .font: NSFont.monospacedSystemFont(ofSize: 16, weight: .heavy),
+                .font: NSFont.monospacedSystemFont(
+                    ofSize: LayoutConstants.fontSizeHeader, weight: .heavy),
                 .foregroundColor: AppColors.textLight,
             ]))
         titleLabel.alignment = .center
@@ -1143,7 +1144,9 @@ class VMLibraryWindowController: NSWindowController,
         let label = NSTextField(labelWithString: text)
         label.frame = NSRect(x: 0, y: y, width: width, height: 20)
         label.alignment = .center
-        label.font = bold ? NSFont.systemFont(ofSize: 13, weight: .bold) : NSFont.systemFont(ofSize: 11, weight: .regular)
+        label.font = bold
+            ? NSFont.systemFont(ofSize: LayoutConstants.fontSizeSubtitle, weight: .bold)
+            : NSFont.systemFont(ofSize: LayoutConstants.fontSizeBody, weight: .regular)
         label.textColor = color
         label.isBordered = false
         label.isEditable = false
@@ -1628,7 +1631,7 @@ class VMLibraryWindowController: NSWindowController,
         btn.layer?.cornerRadius = LayoutConstants.cornerRadiusSM
         btn.attributedTitle = NSAttributedString(string: title, attributes: [
             .foregroundColor: AppColors.textPrimary,
-            .font: NSFont.systemFont(ofSize: 13, weight: .medium)
+            .font: NSFont.systemFont(ofSize: LayoutConstants.fontSizeSubtitle, weight: .medium)
         ])
         btn.toolTip = tooltip
         btn.setHoverTreatment(hoverBorder: AppColors.accentODGlow)
@@ -2939,8 +2942,8 @@ class VMLibraryWindowController: NSWindowController,
         let arpCheckbox = NSButton(checkboxWithTitle: "Filter ARP", target: self, action: #selector(toggleARPFilter(_:)))
         arpCheckbox.frame = NSRect(x: 188, y: packetPanelHeight - 56, width: 90, height: 22)
         arpCheckbox.state = .on  // Checked by default
-        arpCheckbox.font = NSFont.systemFont(ofSize: 11)
-        arpCheckbox.contentTintColor = NSColor.white
+        arpCheckbox.font = NSFont.systemFont(ofSize: LayoutConstants.fontSizeBody)
+        arpCheckbox.contentTintColor = AppColors.textPrimary
         packetPanel.addSubview(arpCheckbox)
 
         // ARP filtered count label.