#61879, 140925, dwildt, class + button expand