fix button spacing issue #5735