Add icon warnings and whatever (bug 905356)