icon fixes, total badge duplicate.