#29 #31 Add drawer item icons and counters