Account for icon width better in MessageBox display

This fixes Xamarin bug 16374 and FWNX-1304.

Change-Id: I160c4ccf10d57cb556e925db88307569205b25e4