General refactor / icons for Bright theme usage