Move icon/bg/cstm_announce check to correct place