 +		delete fBitmap;
 +		fBitmap = NULL;
 +	}
++
++	fDisabledBitmap = new BBitmap(fBitmap);
++	rgb_color* pixel = (rgb_color*)fDisabledBitmap->Bits();
++	for(int i = 0; i < fDisabledBitmap->BitsLength()/4; i++)
++	{
++		*pixel = tint_color(*pixel, B_DISABLED_MARK_TINT);
++		pixel++;
++	}
 +#else
 +	// No vector icon support on BeOS. We could try to load a bitmap one
 +	fBitmap = NULL;
++	fDisabledBitmap = NULL;
 +#endif
 +}
 +

+};
+
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index 4003b09..6389e75 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -22,7 +22,9 @@

 nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
 {
 	struct beos_scaffolding *g = (struct beos_scaffolding *)malloc(sizeof(*g));
@@ -1676,7 +1807,6 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
 
 	g->window = NULL;
 	g->menu_bar = NULL;
