diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 922afc4338..b7d5ac36d2 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -203,9 +203,11 @@ class ITUNES(DriverBase):
     #  0x1294   iPhone 3GS
     #  0x1297   iPhone 4
     #  0x129a   iPad
-    #  0x12a2   iPad2
+    #  0x129f   iPad2 (WiFi)
+    #  0x12a2   iPad2 (GSM)
+    #  0x12a3   iPad2 (CDMA)
     VENDOR_ID = [0x05ac]
-    PRODUCT_ID = [0x1292,0x1293,0x1294,0x1297,0x1299,0x129a,0x129f,0x12a2]
+    PRODUCT_ID = [0x1292,0x1293,0x1294,0x1297,0x1299,0x129a,0x129f,0x12a2,0x12a3]
     BCD = [0x01]
 
     # Plugboard ID
diff --git a/src/calibre/gui2/dialogs/message_box.py b/src/calibre/gui2/dialogs/message_box.py
index f9354a0cfc..fdec19dc69 100644
--- a/src/calibre/gui2/dialogs/message_box.py
+++ b/src/calibre/gui2/dialogs/message_box.py
@@ -19,17 +19,23 @@ class MessageBox(QDialog, Ui_Dialog): # {{{
     INFO = 2
     QUESTION = 3
 
-    def __init__(self, type_, title, msg, det_msg='', show_copy_button=True,
-            parent=None):
+    def __init__(self, type_, title, msg,
+                 det_msg='',
+                 q_icon=None,
+                 show_copy_button=True,
+                 parent=None):
         QDialog.__init__(self, parent)
-        icon = {
-                self.ERROR : 'error',
-                self.WARNING: 'warning',
-                self.INFO:    'information',
-                self.QUESTION: 'question',
-        }[type_]
-        icon = 'dialog_%s.png'%icon
-        self.icon = QIcon(I(icon))
+        if q_icon is None:
+            icon = {
+                    self.ERROR : 'error',
+                    self.WARNING: 'warning',
+                    self.INFO:    'information',
+                    self.QUESTION: 'question',
+            }[type_]
+            icon = 'dialog_%s.png'%icon
+            self.icon = QIcon(I(icon))
+        else:
+            self.icon = q_icon
         self.setupUi(self)
 
         self.setWindowTitle(title)
@@ -44,7 +50,6 @@ class MessageBox(QDialog, Ui_Dialog): # {{{
                     self.bb.ActionRole)
             self.ctc_button.clicked.connect(self.copy_to_clipboard)
 
-
         self.show_det_msg = _('Show &details')
         self.hide_det_msg = _('Hide &details')
         self.det_msg_toggle = self.bb.addButton(self.show_det_msg, self.bb.ActionRole)