diff --git a/src/preferences/keyboard/Keyboard.rdef b/src/preferences/keyboard/Keyboard.rdef
index f5f1941076..13fb74f137 100644
--- a/src/preferences/keyboard/Keyboard.rdef
+++ b/src/preferences/keyboard/Keyboard.rdef
@@ -15,11 +15,9 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Keyboard",
-	long_info  = "Keyboard ©2004-2007 Haiku"
+	long_info  = "Keyboard ©2004-2009 Haiku"
 };
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-
 resource vector_icon {
 	$"6E63696605020016023910813A2974BB43733A501C4A60D94AC7F400E9FFB902"
 	$"001602B8513BB55C0A38B9DABBC2B74A98024B8D270066FF9002011603BC39E2"
@@ -35,143 +33,3 @@ resource vector_icon {
 	$"0106000A03030908071001178322040A000107000A010108000A020109000A03"
 	$"0105100117810004"
 };
-
-#else // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource large_icon {
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFFFF001B1C1B0000FFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFFFF001B151C3F1B1C0000FFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF001B151C1C0F1B1C1B1C0000FFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFF001B151C1C00151C1B1C1B1C1C00FFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF001B151C1C1B0000001C1C1B1C3F0E00FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003F3F15151C1B1C15001C1B3F0E0F00FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFF003F153F3F15151C001B1C3F0E0F0F00FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF0000003F151515163F3F15151C3F0E0F0F0F0F00FFFFFFFFFFFF"
-	$"FFFFFFFFFF001B1C1B000016151515163F3F3F0E0F0F0F0F0F00FFFFFFFFFFFF"
-	$"FFFFFFFF001B151C1C1B1C000015151615150F0F0F0000000F00FFFFFFFFFFFF"
-	$"FFFFFF001B151C00001C1B1C1C00001515150F0F001C1B1C0000FFFFFFFFFFFF"
-	$"FFFF001B151C1C001B00001C1C1B1C0000150F001C151B1C1C1B0000FFFFFFFF"
-	$"FF001B151C1C1B1C001C1B1C1B1C007B7B00001C151C00001B1C1B1C0000FFFF"
-	$"FF003F3F15151C1B001C1C1B1C3F00DA7B7B00151C003F001B001C1B1C1C00FF"
-	$"FF003F153F3F15151C1B1C1C3F002B2CDA7B001B1C1C1B00001C1B1C1C3F0E00"
-	$"003F151515163F3F15151C3F0E002B2FEB003F15151C1B001C1C1B1C3F0E0F00"
-	$"003F1515151615153F3F3F0E002B2B2F2F00163F3F15151C1B1C1C3F0E0F0F00"
-	$"003F15151516151515160E0F002B2F2F00161515153F3F15151C3F0E0F0F0F00"
-	$"003F15151516151515160E002B2B2F2F001615151516153F3F3F0E0F0F0F0F00"
-	$"003F15151500000016150F002B2F2F003F15151516151515160E0F0F0F0F0F00"
-	$"FF000015007B7B7B0015002B2B2F2F003F15151516151515160E0F0F0F0F0F00"
-	$"FFFFFF007B7B7BDA0015002B2F2F00003F15151516151515160E0F0F0F0F00FF"
-	$"FFFFFF002B2CDA7B7B002B2CEB2F00FF0000151515161515150F0F0F0F00FFFF"
-	$"FFFFFFFF002B2CDA7B2B2CEB2F00FFFFFFFF000015151516150F0F0E00FFFFFF"
-	$"FFFFFFFF002B2CDA7B2B2CEB2F00FFFFFFFFFFFF00001515150F0F00FFFFFFFF"
-	$"FFFFFFFFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFF0000150F00FFFFFFFFFF"
-	$"FFFFFFFFFF002B2C2B2B2F2F00FFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFF"
-	$"FFFFFFFFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF002B2CEB2F00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF002B2F000E0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFF0000000E0F0F0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-};
-
-resource mini_icon {
-	$"FFFFFFFFFFFFFF0000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFF001B1C0000FFFFFFFFFF"
-	$"FFFFFFFFFF001B1C1B1C1C0000FFFFFF"
-	$"FFFFFFFF00153F3F1B1C0F0F00FFFFFF"
-	$"FFFF00001B0015163F0E0F0F00FFFFFF"
-	$"FF001B1C1B1C0000150F000000FFFFFF"
-	$"003F3F1B1C1B1C0000001C1B1C0000FF"
-	$"0015153F3F1B007B001C1B1C1C1B1C00"
-	$"00151516150F002F003F1B1C1B1C0F00"
-	$"0015151615002F0015153F3F1B0F0F00"
-	$"0000000000002F00151516150F0F0F00"
-	$"FF002B00002F0000001515150F0F0000"
-	$"FF002B7B2CEB00FFFF0000150F0000FF"
-	$"FFFF002B2F0000FFFFFFFF000000FFFF"
-	$"FFFF002B2F00FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFF00000E0F0FFFFFFFFFFFFFFFFF"
-};
-
-#endif // HAIKU_TARGET_PLATFORM_HAIKU
-
-resource file_types message;
-
-resource(601, "key_bmap") #'bits' array {
-	$"424D14050000000000003A000000280000001100000012000000010018000000"
-	$"0000DA040000130B0000130B00000000F0420000F042FFFFFFFFD8D8D8D8D8D8"
-	$"D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8000000000000D8D8D8D8D8"
-	$"D8D8D8D8D8D8D8D8D8D8D8D8D800D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8"
-	$"D8D8D8000000000000A8A8A8787878000000D8D8D8D8D8D8D8D8D8D8D8D8D8D8"
-	$"D800D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8000000000000A8A8A8A8A8A8A8A8A8"
-	$"787878787878000000D8D8D8D8D8D8D8D8D8D8D8D800D8D8D8D8D8D8D8D8D800"
-	$"0000000000A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8787878787878787878000000"
-	$"D8D8D8D8D8D8D8D8D800D8D8D8000000000000A8A8A8A8A8A8A8A8A8A8A8A8A8"
-	$"A8A8A8A8A8A8A8A8787878787878787878787878000000D8D8D8D8D8D8000000"
-	$"00FFFFFFA8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A878787878"
-	$"7878787878787878787878000000D8D8D800000000FFFFFFA8A8A8A8A8A8A8A8"
-	$"A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A878787878787878787878787887878787"
-	$"878700000000000000FFFFFFA8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8"
-	$"A8A8A8A878787878787878787878787878787878787800000000000000FFFFFF"
-	$"A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8FFFFFFFFFFFFFFFFFF7878787878"
-	$"7878787878787878787800000000000000FFFFFFA8A8A8A8A8A8A8A8A8A8A8A8"
-	$"FFFFFFFFFFFFA8A8A8A8A8A8E0E0E0FFFFFF7878787878787878787878780000"
-	$"0000D8D8D8000000FFFFFFA8A8A8FFFFFFFFFFFFA8A8A8A8A8A8E0E0E0000000"
-	$"D8D8D8E0E0E0FFFFFF78787878787878787800000000D8D8D8000000FFFFFFFF"
-	$"FFFFA8A8A8A8A8A8E0E0E0D8D8D8E0E0E0A8A8A8000000E0E0E0E0E0E0FFFFFF"
-	$"78787878787800000000D8D8D8000000D8D8D8A8A8A8E0E0E0E0E0E0D8D8D800"
-	$"0000000000000000E0E0E0E0E0E0D8D8D8E0E0E0FFFFFF78787800000000D8D8"
-	$"D8D8D8D8000000D8D8D8A8A8A8E0E0E0E0E0E0000000A8A8A8E0E0E0D8D8D8E0"
-	$"E0E0D8D8D8E0E0E0E0E0E0000000D8D8D800D8D8D8D8D8D8D8D8D8000000D8D8"
-	$"D8A8A8A8E0E0E0E0E0E0787878D8D8D8E0E0E0D8D8D8E0E0E0000000000000D8"
-	$"D8D8D8D8D800D8D8D8D8D8D8D8D8D8D8D8D8000000D8D8D8A8A8A8E0E0E0FFFF"
-	$"FFD8D8D8E0E0E0000000000000D8D8D8D8D8D8D8D8D8D8D8D800D8D8D8D8D8D8"
-	$"D8D8D8D8D8D8D8D8D8000000D8D8D8E0E0E0D8D8D8000000000000D8D8D8D8D8"
-	$"D8D8D8D8D8D8D8D8D8D8D8D8D800D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8"
-	$"000000000000000000D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8"
-	$"D800000008428E0000FF0000114300000C420000114300004842008E00FF0000"
-	$"114300004C42000011430000844200008EFF0000124300000040000012430000"
-	$"90418F8F8FFFF99001000000984100001243000008428F0000FF000012430000"
-	$"0C420000124300004842008F00FF0000124300004C4200001243000084420000"
-	$"8FFF00001343000000400000134300009041909090FF00001343000098410000"
-	$"134300000842900000FF0000134300000C420000134300004842009000FF0000"
-	$"134300004C420000134300008442000090FF0000144300000040000014430000"
-	$"9041919191FF00001443000098410000144300000842910000FF000014430000"
-	$"0C420000144300004842009100FF0000144300004C4200001443000084420000"
-	$"91FF000015430000004000001543000090419292"
-};
-
-resource(602, "clock_bmap") #'bits' array {
-	$"424DEB030000000000003A000000280000000F0000000F000000010018000000"
-	$"0000B1030000130B0000130B00000800000008000000FFFFFFFFD8D8D8D8D8D8"
-	$"D8D8D8D8D8D8D8D8D8000000000000000000000000000000D8D8D8D8D8D8D8D8"
-	$"D8D8D8D8D8D8D8000000D8D8D8D8D8D8D8D8D800000000000080808080808080"
-	$"8080808080808080000000000000D8D8D8D8D8D8D8D8D8000000D8D8D8D8D8D8"
-	$"000000B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B88080808080800000"
-	$"00D8D8D8D8D8D8000000D8D8D8000000B8B8B8B8B8B8B8B8B880808080808080"
-	$"8080808080808080B8B8B8B8B8B8808080000000D8D8D8000000D8D8D8000000"
-	$"B8B8B8B8B8B8808080FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF808080B8B8B88080"
-	$"80000000D8D8D8000000000000FFFFFFB8B8B8808080FFFFFFFFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFFFFFFFF808080B8B8B8808080000000000000000000FFFFFF"
-	$"B8B8B8808080FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF808080B8B8"
-	$"B8808080000000000000000000FFFFFFB8B8B8808080FFFFFFFFFFFFFFFFFF00"
-	$"0000000000FFFFFFFFFFFF808080B8B8B8808080000000000000000000FFFFFF"
-	$"B8B8B8808080FFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFF808080B8B8"
-	$"B8808080000000000000000000FFFFFFB8B8B8808080FFFFFFFFFFFFFFFFFF00"
-	$"0000FFFFFFFFFFFFFFFFFF808080B8B8B8808080000000000000D8D8D8000000"
-	$"FFFFFFB8B8B8808080FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF808080B8B8B8B8B8"
-	$"B8000000D8D8D8000000D8D8D8000000FFFFFFB8B8B8B8B8B880808080808080"
-	$"8080808080808080B8B8B8B8B8B8B8B8B8000000D8D8D8000000D8D8D8D8D8D8"
-	$"000000FFFFFFFFFFFFB8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B80000"
-	$"00D8D8D8D8D8D8000000D8D8D8D8D8D8D8D8D8000000000000FFFFFFFFFFFFFF"
-	$"FFFFFFFFFFFFFFFF000000000000D8D8D8D8D8D8D8D8D8000000D8D8D8D8D8D8"
-	$"D8D8D8D8D8D8D8D8D8000000000000000000000000000000D8D8D8D8D8D8D8D8"
-	$"D8D8D8D8D8D8D800000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000804000008040000140000000505"
-	$"0000A504070085050000A40404000D000000000000000000000063000100A404"
-	$"0400FFFFFFFF61000100FFFFFFFF0B4D01000100000000000000000000000000"
-	$"0000000000000000000000"
-};
-
diff --git a/src/preferences/keyboard/KeyboardView.cpp b/src/preferences/keyboard/KeyboardView.cpp
index 7b46f01988..ef932e9451 100644
--- a/src/preferences/keyboard/KeyboardView.cpp
+++ b/src/preferences/keyboard/KeyboardView.cpp
@@ -66,8 +66,8 @@ KeyboardView::KeyboardView(BRect rect)
 	
 	// Create the "Typing test area" text box...
 	frame.OffsetBy(0,frame.Height() + 15);
-	frame.right = fDelaySlider->Frame().right + fIconBitmap->Bounds().Width() +
-				  kBorderSpace;
+	frame.right = fDelaySlider->Frame().right + kBorderSpace
+		+ (fIconBitmap != NULL ? fIconBitmap->Bounds().Width() : 0);
 	BTextControl *textcontrol = new BTextControl(frame,"typing_test_area",NULL,
 									"Typing test area",
 									new BMessage('TTEA'),
@@ -80,11 +80,11 @@ KeyboardView::KeyboardView(BRect rect)
 	
 	// Create the box for the sliders...
 	frame.left = frame.top = kBorderSpace;
-	frame.right = frame.left + fDelaySlider->Frame().right + 
-				fClockBitmap->Bounds().Width() + (kBorderSpace*2);
-	frame.bottom = textcontrol->Frame().bottom + (kBorderSpace*2);
-	fBox = new BBox(frame,"keyboard_box",B_FOLLOW_LEFT,B_WILL_DRAW,
-					B_FANCY_BORDER);
+	frame.right = frame.left + fDelaySlider->Frame().right + (kBorderSpace * 2)
+		+ (fClockBitmap != NULL ? fClockBitmap->Bounds().Width() : 0);
+	frame.bottom = textcontrol->Frame().bottom + (kBorderSpace * 2);
+	fBox = new BBox(frame,"keyboard_box",B_FOLLOW_LEFT, B_WILL_DRAW,
+		B_FANCY_BORDER);
 	AddChild(fBox);
 	
 	fBox->AddChild(fRepeatSlider);
@@ -118,14 +118,18 @@ KeyboardView::Draw(BRect updateFrame)
 {
 	BPoint pt;
 	pt.x = fRepeatSlider->Frame().right + 10;
-	pt.y = fRepeatSlider->Frame().bottom - 35 - 
-			(fIconBitmap->Bounds().Height()/3);
-	
-	fBox->DrawBitmap(fIconBitmap,pt);
-	
-	pt.y = fDelaySlider->Frame().bottom - 35 - 
-			(fIconBitmap->Bounds().Height()/3);
-	fBox->DrawBitmap(fClockBitmap,pt);
+
+	if (fIconBitmap != NULL) {
+		pt.y = fRepeatSlider->Frame().bottom - 35
+			- fIconBitmap->Bounds().Height() / 3;
+		fBox->DrawBitmap(fIconBitmap,pt);
+	}
+
+	if (fClockBitmap != NULL) {
+		pt.y = fDelaySlider->Frame().bottom - 35
+			- fClockBitmap->Bounds().Height() / 3;
+		fBox->DrawBitmap(fClockBitmap,pt);
+	}
 }
 
 void