* Icons trimmed

* Fixed logic to set initial UI state