Some icon and style updates