Fixing icon width and button alignment problems