Refactor made and checked

Also added new icons for app on client side