diff --git a/headers/os/interface/InterfaceDefs.h b/headers/os/interface/InterfaceDefs.h
index d692a0127a..c5a59b8a80 100644
--- a/headers/os/interface/InterfaceDefs.h
+++ b/headers/os/interface/InterfaceDefs.h
@@ -239,8 +239,12 @@ enum {
 	B_USE_WINDOW_INSETS = B_USE_WINDOW_SPACING,
 	B_USE_SMALL_SPACING = -1006,
 	B_USE_SMALL_INSETS = B_USE_SMALL_SPACING,
-	B_USE_BIG_SPACING = -1007,
+	B_USE_CORNER_SPACING = -1007,
+	B_USE_CORNER_INSETS = B_USE_CORNER_SPACING,
+	B_USE_BIG_SPACING = -1008,
 	B_USE_BIG_INSETS = B_USE_BIG_SPACING,
+	B_USE_BORDER_SPACING = -1009,
+	B_USE_BORDER_INSETS = B_USE_BORDER_SPACING,
 };
 
 
diff --git a/headers/private/interface/HaikuControlLook.h b/headers/private/interface/HaikuControlLook.h
index b8edf7f152..be6f9c624d 100644
--- a/headers/private/interface/HaikuControlLook.h
+++ b/headers/private/interface/HaikuControlLook.h
@@ -337,8 +337,6 @@ public:
 									uint32 flags = 0,
 									uint32 borders = B_ALL_BORDERS,
 									orientation orientation = B_HORIZONTAL);
-	virtual float				GetScrollBarWidth(
-									orientation orientation = B_VERTICAL);
 
 protected:
 			void				_DrawButtonFrame(BView* view, BRect& rect,
diff --git a/src/kits/interface/ControlLook.cpp b/src/kits/interface/ControlLook.cpp
index 6081cffded..85f882048b 100644
--- a/src/kits/interface/ControlLook.cpp
+++ b/src/kits/interface/ControlLook.cpp
@@ -3,9 +3,9 @@
  * Distributed under the terms of the MIT License.
  */
 
-
 #include <ControlLook.h>
 
+#include <algorithm>
 #include <binary_compatibility/Interface.h>
 
 
@@ -37,8 +37,13 @@ BControlLook::ComposeSpacing(float spacing)
 			return be_control_look->DefaultItemSpacing();
 		case B_USE_SMALL_SPACING:
 			return ceilf(be_control_look->DefaultItemSpacing() * 0.7f);
+		case B_USE_CORNER_SPACING:
+			return ceilf(be_control_look->DefaultItemSpacing() * 1.273f);
 		case B_USE_BIG_SPACING:
-			return ceilf(be_control_look->DefaultItemSpacing() * 1.3f);
+			return ceilf(be_control_look->DefaultItemSpacing() * 1.8f);
+
+		case B_USE_BORDER_SPACING:
+			return std::max(1.0f, floorf(be_control_look->DefaultItemSpacing() / 11.0f));
 	}
 
 	return spacing;
@@ -86,10 +91,7 @@ BControlLook::GetInsets(frame_type frameType, background_type backgroundType,
 float
 BControlLook::GetScrollBarWidth(orientation orientation)
 {
-	// this matches HaikuControlLook.cpp currently
-	if (be_plain_font->Size() <= 12.0f)
-		return 14.0f;
-	return be_plain_font->Size() / 12.0f * 14.0f;
+	return ComposeSpacing(B_USE_CORNER_SPACING);
 }
 
 
diff --git a/src/kits/interface/HaikuControlLook.cpp b/src/kits/interface/HaikuControlLook.cpp
index edd31589d1..ab2ef31d8f 100644
--- a/src/kits/interface/HaikuControlLook.cpp
+++ b/src/kits/interface/HaikuControlLook.cpp
@@ -3840,17 +3840,6 @@ HaikuControlLook::_FillGlossyGradient(BView* view, const BRect& rect,
 }
 
 
-float
-HaikuControlLook::GetScrollBarWidth(orientation orientation)
-{
-	// HaikuControlLook does not make a distinction between the
-	// width and height of the scrollbar, but other controllooks may
-	if (be_plain_font->Size() <= 12.0f)
-		return 14.0f;
-	return be_plain_font->Size() / 12.0f * 14.0f;
-}
-
-
 void
 HaikuControlLook::_MakeGradient(BGradientLinear& gradient, const BRect& rect,
 	const rgb_color& base, float topTint, float bottomTint,