diff --git a/src/prefs/scrollbar/ScrollBarView.cpp b/src/prefs/scrollbar/ScrollBarView.cpp
index d5741df35b..376f4674b0 100644
--- a/src/prefs/scrollbar/ScrollBarView.cpp
+++ b/src/prefs/scrollbar/ScrollBarView.cpp
@@ -187,12 +187,21 @@ void
 ScrollBarView::SetAllScrollBars(void)
 {
 	fSingle->SetFromScrollBarInfo(gSettings);
+	fSingle->SetDoubleArrows(false);
 	fDouble->SetFromScrollBarInfo(gSettings);
+	fDouble->SetDoubleArrows(true);
+	
 	fProportional->SetFromScrollBarInfo(gSettings);
+	fProportional->SetFixedThumb(false);
 	fFixed->SetFromScrollBarInfo(gSettings);
+	fFixed->SetFixedThumb(true);
+	
 	fFlat->SetFromScrollBarInfo(gSettings);
+	fFlat->SetKnobStyle(THUMB_BLANK);
 	fDots->SetFromScrollBarInfo(gSettings);
+	fDots->SetKnobStyle(THUMB_DOTS);
 	fLines->SetFromScrollBarInfo(gSettings);
+	fLines->SetKnobStyle(THUMB_LINES);
 	
 	fSingle->SetSelected( !gSettings.double_arrows );
 	fDouble->SetSelected( gSettings.double_arrows );
diff --git a/src/prefs/scrollbar/fakescrollbar.cpp b/src/prefs/scrollbar/fakescrollbar.cpp
index d11f25117f..68dbb65dc5 100644
--- a/src/prefs/scrollbar/fakescrollbar.cpp
+++ b/src/prefs/scrollbar/fakescrollbar.cpp
@@ -25,7 +25,6 @@
 //	Description:	Control to simulate a scrollbar
 //  
 //------------------------------------------------------------------------------
-#include "scrollbar.h"
 #include "fakescrollbar.h"
 #include "messages.h"