Icons on tabs, refactoring.