Bug 1102317 - Keypad is shifted too far to the right

Thanks for taking the initiative on fixing the button margins. It's great that you noticed this, but we have to keep fixes separate so that QA can verify them for us. In this case, this issue will be fixed in bug 1102319. Before landing, please remove just this part of the fix.