Final testing changes, new button icons.