Icons added for shapes and colors labs, labels changed.