diff --git a/src/kits/interface/Button.cpp b/src/kits/interface/Button.cpp
index 7091357169..d6a8ae8504 100644
--- a/src/kits/interface/Button.cpp
+++ b/src/kits/interface/Button.cpp
@@ -427,7 +427,7 @@ BButton::Draw(BRect updateRect)
 						255 - buttonBgColor.green,
 						255 - buttonBgColor.blue);
 		} else {
-			SetHighColor(maxShadowColor);	
+			SetHighColor(ui_color(B_CONTROL_TEXT_COLOR));
 			SetLowColor(buttonBgColor);
 		}
 	} else {
diff --git a/src/kits/interface/TabView.cpp b/src/kits/interface/TabView.cpp
index 6347483ae6..83a25a8003 100644
--- a/src/kits/interface/TabView.cpp
+++ b/src/kits/interface/TabView.cpp
@@ -221,7 +221,7 @@ BTab::DrawLabel(BView *owner, BRect frame)
 	if (label == NULL)
 		return;
 
-	owner->SetHighColor(0, 0, 0);
+	owner->SetHighColor(ui_color(B_CONTROL_TEXT_COLOR));
 	float width = owner->StringWidth(label);
 	// TODO: remove offset
 	float offset = frame.Height() / 2.0;
@@ -668,10 +668,11 @@ BTabView::Draw(BRect updateRect)
 BRect
 BTabView::DrawTabs()
 {
-	for (int32 i = 0; i < CountTabs(); i++)
+	for (int32 i = 0; i < CountTabs(); i++) {
 		TabAt(i)->DrawTab(this, TabFrame(i),
 			i == fSelection ? B_TAB_FRONT : (i == 0) ? B_TAB_FIRST : B_TAB_ANY,
 			i + 1 != fSelection);
+	}
 
 	if (fSelection < CountTabs())
 		return TabFrame(fSelection);