Bug fixes in context bar for dark themes, icon refresh