VERA PATCH: Fixes for toolbar button for types