some fixes n icons