Android :: Buttons In TableLayout Cropped On 1.6 And 2.1 But Not On 1.5 Or 2.2

I have four buttons arranged in a 2x2 TableLayout. These buttons each have an image on the left and some text. The buttons display fine in the emulator for 1.5, and for 2.2, but when testing with 1.6 the two buttons in the righthand column are cropped so that they are missing their righthand edge (the padding to the right of the text is missing and the button ends abruptly with squared off corners rather than rounded ones). There is plenty of room for the TableLayout to expand to accommodate the full width of the buttons. This happens for all screen sizes.

The layout looks like this and itself appears within a RelativeLayout:

CODE:...............

The buttons are styled as follows:

CODE:.................

I'm assuming this is a 1.6-specific bug. Has anybody else come across this problem? Any suggestions for work-arounds?

I've had the opportunity to try it with Android 2.1 (both on the emulator and a device), and the problem happens there too. So 1.5 good, 1.6 bad, 2.1 bad, 2.2 good.