+ cleanup
 + more icons wrapped into partials