icons for tabs changed, minor updates
fixing merge issues