Patch by Gonzalo Odiard <[email protected]> Modified by me to allow icon theme to override the bundle one.