Added sunny icon + some improvements