diff --git a/Source/Project64/UserInterface/Debugger/Debugger-TLB.cpp b/Source/Project64/UserInterface/Debugger/Debugger-TLB.cpp
index 1a089533c..eecd771f8 100644
--- a/Source/Project64/UserInterface/Debugger/Debugger-TLB.cpp
+++ b/Source/Project64/UserInterface/Debugger/Debugger-TLB.cpp
@@ -26,52 +26,53 @@ LRESULT	CDebugTlb::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lPara
     DlgSavePos_Init(DebuggerUI_TLBPos);
 
     LV_COLUMN  col;
+    float DPIScale = CClientDC(m_hWnd).GetDeviceCaps(LOGPIXELSX) / 96.0f;
 
     col.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
     col.fmt = LVCFMT_LEFT;
 
     col.pszText = "Index";
-    col.cx = 40;
+    col.cx = 40 * DPIScale;
     col.iSubItem = 0;
     ListView_InsertColumn(GetDlgItem(IDC_LIST), 0, &col);
 
     col.pszText = "Page Mask";
-    col.cx = 90;
+    col.cx = 90 * DPIScale;
     col.iSubItem = 1;
     ListView_InsertColumn(GetDlgItem(IDC_LIST), 1, &col);
 
     col.pszText = "Entry Hi";
-    col.cx = 90;
+    col.cx = 90 * DPIScale;
     col.iSubItem = 2;
     ListView_InsertColumn(GetDlgItem(IDC_LIST), 2, &col);
 
     col.pszText = "Entry Lo0";
-    col.cx = 90;
+    col.cx = 90 * DPIScale;
     col.iSubItem = 3;
     ListView_InsertColumn(GetDlgItem(IDC_LIST), 3, &col);
 
     col.pszText = "Entry Lo1";
-    col.cx = 90;
+    col.cx = 90 * DPIScale;
     col.iSubItem = 4;
     ListView_InsertColumn(GetDlgItem(IDC_LIST), 4, &col);
 
     col.pszText = "Index";
-    col.cx = 40;
+    col.cx = 40 * DPIScale;
     col.iSubItem = 0;
     ListView_InsertColumn(GetDlgItem(IDC_LIST2), 0, &col);
 
     col.pszText = "Valid";
-    col.cx = 40;
+    col.cx = 40 * DPIScale;
     col.iSubItem = 1;
     ListView_InsertColumn(GetDlgItem(IDC_LIST2), 1, &col);
 
     col.pszText = "Dirty";
-    col.cx = 40;
+    col.cx = 40 * DPIScale;
     col.iSubItem = 2;
     ListView_InsertColumn(GetDlgItem(IDC_LIST2), 2, &col);
 
     col.pszText = "Rule";
-    col.cx = 270;
+    col.cx = 270 * DPIScale;
     col.iSubItem = 3;
     ListView_InsertColumn(GetDlgItem(IDC_LIST2), 3, &col);
 
diff --git a/Source/Project64/UserInterface/UIResources.rc b/Source/Project64/UserInterface/UIResources.rc
index dbe2151bd..ad194ae6c 100644
--- a/Source/Project64/UserInterface/UIResources.rc
+++ b/Source/Project64/UserInterface/UIResources.rc
@@ -674,7 +674,7 @@ BEGIN
     EDITTEXT        IDC_CODE,7,25,147,12,ES_AUTOHSCROLL
 END
 
-IDD_Debugger_Commands DIALOGEX 0, 0, 523, 327
+IDD_Debugger_Commands DIALOGEX 0, 0, 535, 327
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Commands"
 FONT 8, "MS Shell Dlg", 400, 0, 0x0
@@ -682,20 +682,20 @@ BEGIN
     EDITTEXT        IDC_ADDR_EDIT,323,2,45,14,ES_UPPERCASE | ES_AUTOHSCROLL
     PUSHBUTTON      "‹",IDC_BACK_BTN,298,1,11,15,WS_DISABLED
     PUSHBUTTON      "›",IDC_FORWARD_BTN,310,1,11,15,WS_DISABLED
-    PUSHBUTTON      "...",IDC_SYMBOLS_BTN,369,1,21,15
-    PUSHBUTTON      "Skip",IDC_SKIP_BTN,391,1,31,15,WS_DISABLED
-    PUSHBUTTON      "Step",IDC_STEP_BTN,423,1,31,15,WS_DISABLED
-    PUSHBUTTON      "St.Ovr",IDC_STEPOVER_BTN,455,1,31,15,WS_DISABLED
-    PUSHBUTTON      "Go",IDC_GO_BTN,487,1,31,15,WS_DISABLED
+    PUSHBUTTON      "...",IDC_SYMBOLS_BTN,370,1,21,15
+    PUSHBUTTON      "Skip",IDC_SKIP_BTN,392,1,34,15,WS_DISABLED
+    PUSHBUTTON      "Step",IDC_STEP_BTN,427,1,34,15,WS_DISABLED
+    PUSHBUTTON      "St.Ovr",IDC_STEPOVER_BTN,462,1,34,15,WS_DISABLED
+    PUSHBUTTON      "Go",IDC_GO_BTN,497,1,34,15,WS_DISABLED
     LTEXT           "PC",IDC_PC_STATIC,304,24,8,9
     EDITTEXT        IDC_PC_EDIT,315,22,44,12,ES_UPPERCASE | ES_AUTOHSCROLL,WS_EX_RIGHT
     PUSHBUTTON      "View",IDC_VIEWPC_BTN,360,22,30,13,WS_DISABLED
-    PUSHBUTTON      "+",IDC_ADDBP_BTN,501,17,18,11
-    PUSHBUTTON      "-",IDC_RMBP_BTN,501,28,18,11
-    PUSHBUTTON      "x",IDC_CLEARBP_BTN,501,39,18,11
-    CONTROL         "",IDC_REG_TABS,"SysTabControl32",TCS_MULTILINE | 0x8,298,62,224,263
+    PUSHBUTTON      "+",IDC_ADDBP_BTN,511,17,20,12
+    PUSHBUTTON      "-",IDC_RMBP_BTN,511,29,20,12
+    PUSHBUTTON      "x",IDC_CLEARBP_BTN,511,41,20,12
+    CONTROL         "",IDC_REG_TABS,"SysTabControl32",TCS_MULTILINE | 0x8,298,62,234,233
     CONTROL         "",IDC_CMD_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_OWNERDRAWFIXED | LVS_NOSCROLL | LVS_NOSORTHEADER | WS_TABSTOP,0,0,284,327
-    LISTBOX         IDC_BP_LIST,422,17,78,42,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LISTBOX         IDC_BP_LIST,422,17,88,42,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "",IDC_OPCODE_BOX,298,14,119,45,0,WS_EX_TRANSPARENT
     EDITTEXT        IDC_OP_EDIT,458,51,59,12,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN | NOT WS_VISIBLE | NOT WS_BORDER
     SCROLLBAR       IDC_SCRL_BAR,284,0,12,327,SBS_VERT