diff --git a/src/apps/debugger/debugger_interface/DebuggerInterface.h b/src/apps/debugger/debugger_interface/DebuggerInterface.h
index 37fadec4ee..ab0e1bc978 100644
--- a/src/apps/debugger/debugger_interface/DebuggerInterface.h
+++ b/src/apps/debugger/debugger_interface/DebuggerInterface.h
@@ -24,7 +24,7 @@ class ThreadInfo;
 class DebuggerInterface {
 public:
 								DebuggerInterface(team_id teamID);
-	virtual							~DebuggerInterface();
+	virtual						~DebuggerInterface();
 
 			status_t			Init();
 			void				Close();
diff --git a/src/apps/debugger/gui/team_window/ImageListView.cpp b/src/apps/debugger/gui/team_window/ImageListView.cpp
index aa6a3b5c5d..ec9d9fd4ac 100644
--- a/src/apps/debugger/gui/team_window/ImageListView.cpp
+++ b/src/apps/debugger/gui/team_window/ImageListView.cpp
@@ -231,7 +231,7 @@ ImageListView::TableRowInvoked(Table* table, int32 rowIndex)
 void
 ImageListView::_Init()
 {
-	fImagesTable = new Table("images list", 0);
+	fImagesTable = new Table("images list", 0, B_FANCY_BORDER);
 	AddChild(fImagesTable->ToView());
 
 	// columns
diff --git a/src/apps/debugger/gui/team_window/RegisterView.cpp b/src/apps/debugger/gui/team_window/RegisterView.cpp
index dcf3e36a06..306b84c13c 100644
--- a/src/apps/debugger/gui/team_window/RegisterView.cpp
+++ b/src/apps/debugger/gui/team_window/RegisterView.cpp
@@ -232,7 +232,7 @@ RegisterView::TableRowInvoked(Table* table, int32 rowIndex)
 void
 RegisterView::_Init()
 {
-	fRegisterTable = new Table("register list", 0);
+	fRegisterTable = new Table("register list", 0, B_FANCY_BORDER);
 	AddChild(fRegisterTable->ToView());
 
 	// columns
diff --git a/src/apps/debugger/gui/team_window/StackTraceView.cpp b/src/apps/debugger/gui/team_window/StackTraceView.cpp
index 57f3a5d0f7..1c3e2841f7 100644
--- a/src/apps/debugger/gui/team_window/StackTraceView.cpp
+++ b/src/apps/debugger/gui/team_window/StackTraceView.cpp
@@ -230,7 +230,7 @@ StackTraceView::TableRowInvoked(Table* table, int32 rowIndex)
 void
 StackTraceView::_Init()
 {
-	fFramesTable = new Table("register list", 0);
+	fFramesTable = new Table("register list", 0, B_FANCY_BORDER);
 	AddChild(fFramesTable->ToView());
 	fFramesTable->SetSortingEnabled(false);
 
diff --git a/src/apps/debugger/gui/team_window/TeamWindow.cpp b/src/apps/debugger/gui/team_window/TeamWindow.cpp
index f5e8a6e889..878026fcb1 100644
--- a/src/apps/debugger/gui/team_window/TeamWindow.cpp
+++ b/src/apps/debugger/gui/team_window/TeamWindow.cpp
@@ -30,7 +30,7 @@
 
 TeamWindow::TeamWindow(TeamDebugModel* debugModel, Listener* listener)
 	:
-	BWindow(BRect(100, 100, 899, 699), "Team", B_DOCUMENT_WINDOW,
+	BWindow(BRect(100, 100, 899, 699), "Team", B_TITLED_WINDOW,
 		B_ASYNCHRONOUS_CONTROLS),
 	fDebugModel(debugModel),
 	fActiveThread(NULL),
@@ -188,7 +188,10 @@ TeamWindow::_Init()
 {
 	BLayoutBuilder::Group<>(this, B_VERTICAL)
 		.AddSplit(B_VERTICAL, 3.0f)
-			.Add(fTabView = new BTabView("tab view"), 0.4f)
+			.AddGroup(B_VERTICAL, 0.0f, 0.4f)
+				.Add(fTabView = new BTabView("tab view"))
+				.SetInsets(4.0f, 4.0f, 4.0f, 0.0f)
+			.End()
 			.AddGroup(B_VERTICAL, 4.0f)
 				.AddGroup(B_HORIZONTAL, 4.0f)
 					.Add(fRunButton = new BButton("Run"))
@@ -196,10 +199,14 @@ TeamWindow::_Init()
 					.Add(fStepIntoButton = new BButton("Step Into"))
 					.Add(fStepOutButton = new BButton("Step Out"))
 					.AddGlue()
+					.SetInsets(4.0f, 0.0f, 4.0f, 0.0f)
 				.End()
 				.AddSplit(B_HORIZONTAL, 3.0f)
 					.Add(new BTextView("source view"), 3.0f)
-					.Add(fLocalsTabView = new BTabView("locals view"))
+					.AddGroup(B_VERTICAL)
+						.Add(fLocalsTabView = new BTabView("locals view"))
+						.SetInsets(0.0f, 0.0f, 4.0f, 4.0f)
+					.End()
 				.End()
 			.End()
 		.End();
diff --git a/src/apps/debugger/gui/team_window/ThreadListView.cpp b/src/apps/debugger/gui/team_window/ThreadListView.cpp
index 567be94ed9..30c556da92 100644
--- a/src/apps/debugger/gui/team_window/ThreadListView.cpp
+++ b/src/apps/debugger/gui/team_window/ThreadListView.cpp
@@ -245,7 +245,7 @@ ThreadListView::TableSelectionChanged(Table* table)
 void
 ThreadListView::_Init()
 {
-	fThreadsTable = new Table("threads list", 0);
+	fThreadsTable = new Table("threads list", 0, B_FANCY_BORDER);
 	AddChild(fThreadsTable->ToView());
 
 	// columns