Fix #33 - Different theme, using icons on buttons