Update badge icons (Issue #99) and merge updates