Update to ToolBar style to fix image persistance issue