Fixed alignment of toggle button, added icons