wizard: fix wrong icon and icon disappearing when resuming unfinished wallet

electrum/gui/qt/wizard/wizard.py

@@ -187,8 +187,9 @@ class QEAbstractWizard(QDialog, MessageBoxMixin):
         self.error_msg.setText(str(page.error))
         self.error.setVisible(not page.busy and bool(page.error))
         icon = page.params.get('icon', icon_path('electrum.png'))
-        if icon and icon != self.icon_filename:
-            self.set_icon(icon)
+        if icon:
+            if icon != self.icon_filename:
+                self.set_icon(icon)
             self.logo.setVisible(True)
         else:
             self.logo.setVisible(False)

electrum/plugins/trustedcoin/qt.py

@@ -227,6 +227,8 @@ class Plugin(TrustedCoinPlugin):
     def init_wallet_wizard(self, wizard: 'QENewWalletWizard'):
         wizard.trustedcoin_qhelper = TrustedcoinPluginQObject(self, wizard, None)
         self.extend_wizard(wizard)
+        if wizard.start_viewstate and wizard.start_viewstate.view.startswith('trustedcoin_'):
+            wizard.start_viewstate.params.update({'icon': icon_path('trustedcoin-wizard.png')})
 
     def extend_wizard(self, wizard: 'QENewWalletWizard'):
         super().extend_wizard(wizard)