Refactor ui

You should be able to use styles to change the icon instead of keeping two instances around and showing/hiding one of them.