Clean-up && Add in Unified icon

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>