diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp
index e453d32734..d91096c12d 100644
--- a/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp
@@ -489,7 +489,7 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 					dc.SetTextForeground(_T("#000000"));
 				}
 
-				dc.DrawText(wxString::FromAscii(dis2), 18*charWidth, rowY1);
+				dc.DrawText(wxString::FromAscii(dis2), 17 + 16*charWidth, rowY1);
 				// ------------
 			}
 
@@ -499,7 +499,7 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 			else
 				dc.SetTextForeground(_T("#8000FF")); // purple
 
-			dc.DrawText(wxString::FromAscii(dis), plain ? 3*charWidth : 10*charWidth, rowY1);
+			dc.DrawText(wxString::FromAscii(dis), 17 + (plain ? 1*charWidth : 8*charWidth), rowY1);
 
 			if (desc[0] == 0)
 			{
@@ -513,7 +513,7 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 				//UnDecorateSymbolName(desc,temp,255,UNDNAME_COMPLETE);
 				if (strlen(desc))
 				{
-					dc.DrawText(wxString::FromAscii(desc), 38 * charWidth, rowY1);
+					dc.DrawText(wxString::FromAscii(desc), 17 + 36 * charWidth, rowY1);
 				}
 			}
 
@@ -534,7 +534,7 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 	
 	for (int i = 0; i < numBranches; i++)
 	{
-	    int x = 46 * charWidth + (branches[i].srcAddr % 9) * 8;
+	    int x = 17 + 44 * charWidth + (branches[i].srcAddr % 9) * 8;
 	    _MoveTo(x-2, branches[i].src);
 
 		if (branches[i].dst < rc.height + 400 && branches[i].dst > -400)
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp
index 328a6e08a3..c6244fb7de 100644
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp
@@ -222,7 +222,7 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
 
 	dc.GetTextExtent(_T("W"),&w,&h);
 	int fontSize = w;
-	int textPlacement = 11 * fontSize;
+	int textPlacement = 17 + 9 * fontSize;
 	struct branch
 	{
 		int src, dst, srcAddr;