diff --git a/src/apps/debugger/user_interface/gui/team_window/WatchPromptWindow.cpp b/src/apps/debugger/user_interface/gui/team_window/WatchPromptWindow.cpp
index 8464582e1f..34ae3beb88 100644
--- a/src/apps/debugger/user_interface/gui/team_window/WatchPromptWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/WatchPromptWindow.cpp
@@ -101,7 +101,7 @@ WatchPromptWindow::_Init()
 	BLayoutItem* labelItem = fTypeField->CreateLabelLayoutItem();
 	labelItem->View()->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	BLayoutBuilder::Group<>(this, B_VERTICAL)
-		.SetInsets(4.0f, 4.0f, 4.0f, 4.0f)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.AddGroup(B_HORIZONTAL, 4.0f)
 			.Add(fAddressInput)
 		.End()
diff --git a/src/apps/debugger/user_interface/gui/teams_window/StartTeamWindow.cpp b/src/apps/debugger/user_interface/gui/teams_window/StartTeamWindow.cpp
index bc5216e630..149bacd028 100644
--- a/src/apps/debugger/user_interface/gui/teams_window/StartTeamWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/teams_window/StartTeamWindow.cpp
@@ -73,7 +73,7 @@ StartTeamWindow::_Init()
 	fCancelButton = new BButton("Cancel", new BMessage(B_QUIT_REQUESTED));
 
 	BLayoutBuilder::Group<>(this, B_VERTICAL)
-		.SetInsets(4.0f, 4.0f, 4.0f, 4.0f)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.Add(fGuideText)
 		.AddGroup(B_HORIZONTAL, 4.0f)
 			.Add(fTeamTextControl)
diff --git a/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp b/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp
index b26bcd3255..052d63be12 100644
--- a/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp
@@ -149,7 +149,8 @@ TeamsWindow::_Init()
 	BLayoutBuilder::Group<>(this, B_VERTICAL)
 		.Add(fTeamsListView = new TeamsListView("TeamsList", fCurrentTeam))
 		.SetInsets(1.0f, 1.0f, 1.0f, 1.0f)
-		.AddGroup(B_HORIZONTAL, 4.0f)
+		.AddGroup(B_HORIZONTAL)
+			.SetInsets(B_USE_DEFAULT_SPACING)
 			.Add(fAttachTeamButton = new BButton("Attach", new BMessage(
 						MSG_DEBUG_THIS_TEAM)))
 			.Add(fCreateTeamButton = new BButton("Start new team"
diff --git a/src/kits/shared/PromptWindow.cpp b/src/kits/shared/PromptWindow.cpp
index 4eeac83ab1..7e7715b810 100644
--- a/src/kits/shared/PromptWindow.cpp
+++ b/src/kits/shared/PromptWindow.cpp
@@ -30,7 +30,7 @@ PromptWindow::PromptWindow(const char* title, const char* label,
 	BButton* acceptButton = new BButton("Accept", new
 		BMessage(kAcceptInput));
 	BLayoutBuilder::Group<>(this, B_VERTICAL)
-		.SetInsets(4.0f, 4.0f, 4.0f, 4.0f)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.Add(fInfoView)
 		.Add(fTextControl)
 		.AddGroup(B_HORIZONTAL)