Use icon in no expanded view too for now to avoid Lollipop layout bug.