Few more finishing touches and icons