added icons and renamed decompose to deconstruct