* add reply-icons * resolve conflict * update tags * revert tag changes Co-authored-by: Eric Fennis <eric.fennis@gmail.com>