Add toggle/expand icons to the separate scopes