added icons and push
fix bug calendar