diff --git a/src/apps/deskbar/BarMenuTitle.cpp b/src/apps/deskbar/BarMenuTitle.cpp
index 84413abdde..6651e4b5fa 100644
--- a/src/apps/deskbar/BarMenuTitle.cpp
+++ b/src/apps/deskbar/BarMenuTitle.cpp
@@ -135,7 +135,7 @@ TBarMenuTitle::DrawContent()
 		menu->SetHighColor(black);
 	}
 
-	menu->SetDrawingMode(B_OP_OVER);
+	menu->SetDrawingMode(B_OP_ALPHA);
 
 	BRect dstRect(fIcon->Bounds());
 	dstRect.OffsetTo(frame.LeftTop());
diff --git a/src/apps/deskbar/Jamfile b/src/apps/deskbar/Jamfile
index b630a09d5d..9859bb70a2 100644
--- a/src/apps/deskbar/Jamfile
+++ b/src/apps/deskbar/Jamfile
@@ -34,4 +34,17 @@ App Deskbar :
 	Switcher.cpp
 	;
 
-LinkSharedOSLibs Deskbar : libbe.so libtracker.so ;
+if $(TARGET_PLATFORM) = haiku {
+	# link for Haiku
+
+	LinkSharedOSLibs Deskbar :
+		libbe.so libtracker.so
+	;
+
+} else {
+	# link against build platform libs
+
+	LinkSharedOSLibs Deskbar :
+		be tracker
+	;
+}
diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp
index f1b1b3f58b..b6afaf07ec 100644
--- a/src/apps/deskbar/StatusView.cpp
+++ b/src/apps/deskbar/StatusView.cpp
@@ -143,7 +143,9 @@ TReplicantTray::AttachedToWindow()
 
 #ifdef DB_ADDONS		
 	//	load addons and rehydrate archives		
+#if !__HAIKU__
 	InitAddOnSupport();	
+#endif
 #endif
 	ResizeToPreferred();
 }
diff --git a/src/apps/deskbar/icon-freelogo.rdef b/src/apps/deskbar/icon-freelogo.rdef
index ae6aee34f2..7901dec592 100644
--- a/src/apps/deskbar/icon-freelogo.rdef
+++ b/src/apps/deskbar/icon-freelogo.rdef
@@ -1,41 +1,110 @@
 
 resource(14, "kBeLogoBits") archive BBitmap
 {
-	"_frame" = rect { 0.00000, 0.00000, 46.0000, 19.0000 },
-	"_cspace" = 4,
-	"_bmflags" = 1,
-	"_rowbytes" = 48,
+	"_frame" = rect { 0.0, 0.0, 35.0, 21.0 },
+	"_cspace" = 8200,
+	"_bmflags" = 0,
+	"_rowbytes" = 144,
 	"_data" = array
 	{
-		$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-		$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFFFFDCDCDCDCDCDCDCDCDCDCDCDCDCDC"
-		$"DCDCDCDCDCDCE4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4FFFF3F"
-		$"FFFFDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCE9E4E4E4E4E4E4E4E4E4"
-		$"E4E4E4E4E4E4E4E4E4E4E4E4E4FFFF3FFFFFDCDCDCDC2424DCDC24DCDCDCDCDC"
-		$"DCDCDCDCDCBFEFE4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4FFFF3F"
-		$"FFFFDCDCDC8D87878D8787B323DCDCDCDCDCDCDCDCBFEEE4E4E4E4C35ADA3FDA"
-		$"5AC3E4E4E4E4A2DA1E5AE4E4E4FFFF3FFFFFDCDCDCDC603FDCDC8D3F1623DCDC"
-		$"DCDCDCDCDCDCD4E4E4E4A31E1DA2C3A21D1EA2E4E4C33F5AA21E5AE4E4FFFF3F"
-		$"FFFFDCDCDC24873FDCDC24603FDCDCDCDCDCDCDCDCDCD4E4E4C31E5AE4E4E4E4"
-		$"E45A1EC3E45ADAE4E4A21DE4E4FFFF3FFFFFDCDCDC24873FDCDC24601EDCDCDC"
-		$"DCDC24DCDCDCD4E4E4591DE4E4E4E4E4E4E41D59E45ADAE4E4E4E4E4E4FFFF3F"
-		$"FFFFDCDCDC24873FDCDCB31DB3DC24B3878787DCDCDCD4E4E41DA2E4E4E4E4E4"
-		$"E4E4A21DE4C33FDAA3E4E4E4E4FFFF3FFFFFDCDCDC24873F8D871CB32423B31C"
-		$"24241C8723DCD4E4E43FC3E4E4E4E4E4E4E4C33FE4E4C3DA3FDAC3E4E4FFFF3F"
-		$"FFFFDCDCDC24873FDCDCDC1D1B241B60ADAD1B1CDCDCD4E4E43FA2E4E4E4E4E4"
-		$"E4E4A23FE4E4E4E4C3DA1DE4E4FFFF3FFFFFDCDCDC24873FDCDC24B33FB31DAD"
-		$"DCD3DCDCDCDCD4E4E4DADAE4E4E4E4E4E4E45ADAE4C3E4E4E4C33FC3E4FFFF3F"
-		$"FFFFDCDCDC24873FDCDC23B33FAD1D8D24DCDCDCDCDCD4E4E4A23FA2E4E4E4E4"
-		$"E4A23FA3E41DA2E4E4A33FC3E4FFFF3FFFFFDCDCDC24873F242424193FDC873F"
-		$"DC24DC16DCDCD4E4E4E45A3F5AE4E4E45A3F5AE4E45A1DC3C3DADAE4E4FFFF3F"
-		$"FFFFDCDCDC8D1C1E8D8D601DB324DC1C1E601C8DDCDCD4E4E4E4E45A3F3F3F3F"
-		$"1EA2E4E4E4C3DA3F3FDAC3E4E4FFFF3FFFFFDCDCDCD3DCDCBFD3DCDC23DCDC24"
-		$"D3B3DCDCDCBFCEE4E4E4E4E4E4C3C3C3E4E4E4E4E4E4E4C3C3E4E4E4E4FFFF3F"
-		$"FFFFDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCBFEFE4E4E4E4E4E4E4E4E4"
-		$"E4E4E4E4E4E4E4E4E4E4E4E4E4FFFF3FFFFFDCDCDCDCDCDCDCDCDCDCDCDCDCDC"
-		$"DCDCDCDCDCDCE9E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4FFFF3F"
-		$"FFFFDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCE4E4E4E4E4E4E4E4E4E4"
-		$"E4E4E4E4E4E4E4E4E4E4E4E4E4FFFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-		$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+		$"00000000000000000000000700000043002151bb0055c8c50000001500000001"
+		$"000000030000000d0000000200000000000000000000000000000027003779d8"
+		$"0174f4ff0174ecff017bf2ff0180f6ff0185f6ff018bf7ff004b81c20000001c"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
+		$"000000000000000000000000000000000000000000000000000000000000002b"
+		$"00030bc00061effd004fc4c000000625000000310000005b00153f2300000001"
+		$"000000000000000600000045004faff10171f4ff0175f4ff0179f5ff017ef5ff"
+		$"0182f6ff0188f6ff005799e20000004100000013000000050000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
+		$"00000000000000000000000000000020000000aa004fc8fb0060f2ff004bbfe0"
+		$"000613ba003387e1004ec9c40000001300000001000000140002067e0065e7fd"
+		$"016ff4ff0173f4ff0177f5ff017cf5ff0181f6ff0186f6ff0078d5fc002642c5"
+		$"000000680000001e000000020000000000000000000000000000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000018"
+		$"0000008d003a96f6005df2ff005df2ff005aeaff005ef2ff005eeffd002e7682"
+		$"0000001f0000003b00275ece006af3ff016df4ff0171f4ff0175f4ff017af5ff"
+		$"0180f5ff0185f6ff018bf7ff028ff4ff0173bdd50000001c0000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
+		$"000000000000000000000000000000140000007b00307ef2005cf2ff005cf2ff"
+		$"005cf2ff005cf2ff005ef2ff005dedfd003890c000122fb5005ee1fd0069f3ff"
+		$"006cf4ff0170f4ff0175f4ff017af5ff017ff5ff0185f6ff018bf7ff018bf0fd"
+		$"0027436100000009000000000000000000000000000000000000000000000000"
+		$"0000000000000000000000000000000000000000000000050000000c00000026"
+		$"00000087002b72f2005bf2ff005bf2ff005bf2ff005cf2ff005df2ff005ff2ff"
+		$"0060f3ff005fe8ff0066f3ff0069f3ff006cf4ff0170f4ff0174f4ff0179f5ff"
+		$"017ff5ff0185f6ff018bf7ff0165add400000020000000000000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
+		$"000000030000001f0005135900112f9400163dd90046b8fd005bf2ff005bf2ff"
+		$"005bf2ff005cf2ff005df2ff005ff2ff0061f3ff0063f3ff0066f3ff0069f3ff"
+		$"016df4ff0171f4ff0175f4ff017af5ff0180f5ff0185f6ff018bf4ff00233f73"
+		$"0000000c00000000000000000000000100000000000000000000000000000000"
+		$"000000000000000000000000000000000000000100000025000000a1004fccf9"
+		$"005df2ff005cf2ff005cf2ff005cf2ff005cf2ff005df2ff005ef2ff0060f2ff"
+		$"0062f3ff0064f3ff0067f3ff006af3ff016ef4ff0172f4ff0177f5ff017cf5ff"
+		$"0181f6ff0186f6ff0088f1fd0000003d000000060000000b002537280000001c"
+		$"00000004000000000000000000000000000000070000000f0000000c00000001"
+		$"00000000000000110000006c001c4ae4005ef2ff005ef2ff005df2ff005df2ff"
+		$"005ef2ff005ef2ff005ff2ff0061f3ff0063f3ff0066f3ff0069f3ff006cf4ff"
+		$"0170f4ff0174f4ff0178f5ff017ef5ff0182f6ff0188f6ff018ef4ff00000055"
+		$"0000002d0062998e0192ddeb0000006a000000190000000d0000001700334231"
+		$"017da6810171948c00000038000000090000000000000001000000270000009e"
+		$"003e9df8005ff2ff005ff2ff005ff2ff0060f2ff0060f3ff0062f3ff0063f3ff"
+		$"0066f3ff0068f3ff006bf4ff016ef4ff0172f4ff0177f5ff017bf5ff0180f5ff"
+		$"0185f6ff018cf7ff0291f7ff0169ace3018fe2f602a3f9ff02a8f9ff004d70d6"
+		$"004f7186017aaaa70299d2dd02b6f6fb017aa4db000000650000001a00000001"
+		$"00000000000000000000000800000048000815c7005adeff0062f3ff0062f3ff"
+		$"0063f3ff0063f3ff0065f3ff0066f3ff0068f3ff006bf4ff016ef4ff0171f4ff"
+		$"0175f4ff017af5ff017ef5ff0183f6ff0189f6ff018ff7ff0295f7ff029bf8ff"
+		$"02a0f9ff02a5f9ff02aaf9ff02aefaff02b3faff03b6fbff03b9fbff01678be4"
+		$"000000710000001f000000020000000000000000000000000000000000000013"
+		$"00000066001a40db0062eaff0065f3ff0066f3ff0067f3ff0068f3ff006af3ff"
+		$"006cf4ff016ff4ff0172f4ff0175f4ff0179f5ff017ef5ff0182f6ff0188f6ff"
+		$"018df7ff0293f7ff0298f8ff029ef8ff02a3f9ff02a8f9ff02abfaff02b0faff"
+		$"03b3faff03b7fbff016488e9000000720000001e000000020000000000000000"
+		$"000000000000000000000000000000010000001d0000007b002355e90067eeff"
+		$"006af3ff006bf4ff006cf4ff016ef4ff0170f4ff0173f4ff0177f5ff017af5ff"
+		$"017ef5ff0182f6ff0187f6ff018cf7ff0292f7ff0297f8ff029df8ff02a2f9ff"
+		$"02a6f9ff02aafaff02aefaff02b2faff03b5fbff016e97f0000000790000001e"
+		$"000000020000000000000000000000000000000000000000000000010000000e"
+		$"00000026001c407200316edd0060d6fd016ff4ff0170f4ff0171f4ff0173f4ff"
+		$"0175f4ff0178f5ff017cf5ff017ff5ff0183f6ff0188f6ff018cf7ff0291f7ff"
+		$"0297f8ff029bf8ff02a0f9ff02a5f9ff02a9f9ff02acfaff02b0faff03b4faff"
+		$"0296cefb0003069f000000280000000200000000000000000000000000000000"
+		$"0000000000000000000000080000003c002959a5005ac0f00173f4ff0174f4ff"
+		$"0174f4ff0175f4ff0177f5ff0179f5ff017bf5ff017ef5ff0181f6ff0185f6ff"
+		$"0189f6ff018df7ff0292f7ff0297f8ff029cf8ff02a0f9ff02a5f9ff02a9f9ff"
+		$"02acfaff02b0faff03b3faff03b6fbff0185b5f60000006e0000001000000000"
+		$"0000000000000000000000000000000000000000000000000000000100000011"
+		$"000000420000009d002f60e90173e6ff017af5ff017cf5ff017df5ff017ff5ff"
+		$"0182f6ff0185f6ff0188f6ff018cf7ff0190f7ff0294f7ff0298f8ff029df8ff"
+		$"02a1f9ff02a5f9ff02a9f9ff02acfaff02affaff03b3faff03b6fbff03b9fbff"
+		$"02aae3fc001a2485000000140000000000000000000000000000000000000000"
+		$"00000000000000000000000000000000000000080000002800000075001122cd"
+		$"005cb0f90182f6ff0184f6ff0186f6ff0188f6ff018cf7ff018ff7ff0292f7ff"
+		$"0296f8ff029af8ff029ef8ff02a2f9ff02a6f9ff02a9f9ff02acfaff02affaff"
+		$"03b3faff03b5fbff03b8fbff0294c6f9005775e000131a850000001800000000"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
+		$"0000000000000002000000170000004b000000a0002441e0006cbff90189efff"
+		$"028cf1ff028eefff0180d5fd029af8ff029df8ff02a0f9ff02a4f9ff02a7f9ff"
+		$"02aafaff02adfaff02b0faff03b1f7ff0290c7f9015f82e800212dbc0000007b"
+		$"000000440000001d000000040000000000000000000000000000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000009"
+		$"00000025000000590000007c0000008f0000008d0000008d004066d40067a2f0"
+		$"029ef2ff02a6f9ff02a9f9ff02abfaff02aefaff02b1faff03b0f3ff00161fbf"
+		$"0000007a00000048000000260000001400000006000000000000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
+		$"00000000000000000000000000000000000000010000000c0000001400000019"
+		$"0000001900000034017cbdd600273b8c00344ed00194d9fc02adfaff02b0faff"
+		$"02b2faff03b4fbff03b8fbff016d95b400000024000000080000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
+		$"000000000000000000000000000000000000000500000036019eeaef00000031"
+		$"0000004900000197004460df028dc4f902a2e0fc02a8e5fd02afecfd02b7f4fb"
+		$"00607f5900000004000000000000000000000000000000000000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
+		$"0000000f002f456a01a4eaec0000001a000000090000001e0000004800000081"
+		$"0000009b000000a2000000a6000709a0001a24670000000f0000000000000000"
+		$"0000000000000000000000000000000000000000000000000000000000000000"
 	}
 };