fix class hierarchy
adjust animation
use new icons