Issue #949 - Add expand icon