diff --git a/pysollib/tile/solverdialog.py b/pysollib/tile/solverdialog.py
index 8859f145..0ad6f18a 100644
--- a/pysollib/tile/solverdialog.py
+++ b/pysollib/tile/solverdialog.py
@@ -42,13 +42,14 @@ from pysollib.mfxutil import KwStruct
 from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkwidget import MfxDialog
 from tkwidget import PysolCombo
+from pysollib.ui.tktile.solverdialog import BaseSolverDialog
 
 
 # ************************************************************************
 # *
 # ************************************************************************
 
-class SolverDialog(MfxDialog):
+class SolverDialog(BaseSolverDialog, MfxDialog):
 
     def _calcToolkit(self):
         return ttk
@@ -180,32 +181,6 @@ class SolverDialog(MfxDialog):
                       )
         return MfxDialog.initKw(self, kw)
 
-    def mDone(self, button):
-        if button == 0:
-            self.startSolving()
-        elif button == 1:
-            self.startPlay()
-        elif button == 2:
-            self.app.menubar.mNewGame()
-        elif button == 3:
-            global solver_dialog
-            solver_dialog = None
-            self.destroy()
-        return EVENT_HANDLED
-
-    def mCancel(self, *event):
-        return self.mDone(3)
-
-    def wmDeleteWindow(self, *event):
-        return self.mDone(3)
-
-    def gameSelected(self, *event):
-        name = self.games_var.get()
-        if not name:
-            return
-        id = self.games[name]
-        self.app.menubar._mSelectGame(id)
-
     def connectGame(self, game):
         name = self.app.getGameTitleName(game.id)
         if name in self.gamenames:
@@ -217,61 +192,6 @@ class SolverDialog(MfxDialog):
             self.games_var.current(0)
         self.play_button.config(state='disabled')
 
-    def _reset(self):
-        self.play_button.config(state='disabled')
-        self.setText(iter='', depth='', states='')
-        self.result_label['text'] = ''
-        self.top.update_idletasks()
-
-    def reset(self):
-        self.play_button.config(state='disabled')
-
-    def startSolving(self):
-        from gettext import ungettext
-
-        self._reset()
-        game = self.app.game
-        solver = game.Solver_Class(game, self) # create solver instance
-        game.solver = solver
-        preset = self.preset_var.get()
-        max_iters = self.max_iters_var.get()
-        max_depth = self.max_depth_var.get()
-        progress = self.progress_var.get()
-        solver.config(preset=preset, max_iters=max_iters,
-                      max_depth=max_depth, progress=progress)
-        solver.computeHints()
-        hints_len = len(solver.hints)-1
-        if hints_len > 0:
-            t = ungettext('This game is solveable in %d move.',
-                          'This game is solveable in %d moves.',
-                          hints_len) % hints_len
-            self.result_label['text'] = t
-            self.play_button.config(state='normal')
-        else:
-            self.result_label['text'] = (_('I could not solve this game.') if solver.solver_state == 'unsolved' else _('Iterations count exceeded (Intractable)'))
-            self.play_button.config(state='disabled')
-
-    def startPlay(self):
-        self.play_button.config(state='disabled')
-        self.start_button.focus()
-        if self.app.game.pause:
-            self.app.menubar.mPause()
-        self.app.top.tkraise()
-        self.app.top.update_idletasks()
-        self.app.top.update()
-        self.app.top.after(200)
-        self.app.game.startDemo(level=3)
-
-    def setText(self, **kw):
-        if 'iter' in kw:
-            self.iter_label['text'] = kw['iter']
-        if 'depth' in kw:
-            self.depth_label['text'] = kw['depth']
-        if 'states' in kw:
-            self.states_label['text'] = kw['states']
-        self.top.update_idletasks()
-
-
 
 solver_dialog = None
 
diff --git a/pysollib/tk/solverdialog.py b/pysollib/tk/solverdialog.py
index 3abc8396..6e51f440 100644
--- a/pysollib/tk/solverdialog.py
+++ b/pysollib/tk/solverdialog.py
@@ -40,13 +40,14 @@ from pysollib.mfxutil import KwStruct
 # Toolkit imports
 from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkwidget import MfxDialog
+from pysollib.ui.tktile.solverdialog import BaseSolverDialog
 
 
 # ************************************************************************
 # *
 # ************************************************************************
 
-class SolverDialog(MfxDialog):
+class SolverDialog(BaseSolverDialog, MfxDialog):
 
     def _calcToolkit(self):
         return Tkinter
@@ -182,32 +183,6 @@ class SolverDialog(MfxDialog):
                       )
         return MfxDialog.initKw(self, kw)
 
-    def mDone(self, button):
-        if button == 0:
-            self.startSolving()
-        elif button == 1:
-            self.startPlay()
-        elif button == 2:
-            self.app.menubar.mNewGame()
-        elif button == 3:
-            global solver_dialog
-            solver_dialog = None
-            self.destroy()
-        return EVENT_HANDLED
-
-    def mCancel(self, *event):
-        return self.mDone(3)
-
-    def wmDeleteWindow(self, *event):
-        return self.mDone(3)
-
-    def gameSelected(self, *event):
-        name = self.games_var.get()
-        if not name:
-            return
-        id = self.games[name]
-        self.app.menubar._mSelectGame(id)
-
     def connectGame(self, game):
         name = self.app.getGameTitleName(game.id)
         if name in self.gamenames:
@@ -219,61 +194,6 @@ class SolverDialog(MfxDialog):
             self.games_var.set('')
         self.play_button.config(state='disabled')
 
-    def _reset(self):
-        self.play_button.config(state='disabled')
-        self.setText(iter='', depth='', states='')
-        self.result_label['text'] = ''
-        self.top.update_idletasks()
-
-    def reset(self):
-        self.play_button.config(state='disabled')
-
-    def startSolving(self):
-        from gettext import ungettext
-
-        self._reset()
-        game = self.app.game
-        solver = game.Solver_Class(game, self) # create solver instance
-        game.solver = solver
-        preset = self.preset_var.get()
-        max_iters = self.max_iters_var.get()
-        max_depth = self.max_depth_var.get()
-        progress = self.progress_var.get()
-        solver.config(preset=preset, max_iters=max_iters,
-                      max_depth=max_depth, progress=progress)
-        solver.computeHints()
-        hints_len = len(solver.hints)-1
-        if hints_len > 0:
-            t = ungettext('This game is solveable in %d move.',
-                          'This game is solveable in %d moves.',
-                          hints_len) % hints_len
-            self.result_label['text'] = t
-            self.play_button.config(state='normal')
-        else:
-            self.result_label['text'] = (_('I could not solve this game.') if solver.solver_state == 'unsolved' else _('Iterations count exceeded (Intractable)'))
-            self.play_button.config(state='disabled')
-
-    def startPlay(self):
-        self.play_button.config(state='disabled')
-        self.start_button.focus()
-        if self.app.game.pause:
-            self.app.menubar.mPause()
-        self.app.top.tkraise()
-        self.app.top.update_idletasks()
-        self.app.top.update()
-        self.app.top.after(200)
-        self.app.game.startDemo(level=3)
-
-    def setText(self, **kw):
-        if 'iter' in kw:
-            self.iter_label['text'] = kw['iter']
-        if 'depth' in kw:
-            self.depth_label['text'] = kw['depth']
-        if 'states' in kw:
-            self.states_label['text'] = kw['states']
-        self.top.update_idletasks()
-
-
 
 solver_dialog = None
 
diff --git a/pysollib/ui/tktile/solverdialog.py b/pysollib/ui/tktile/solverdialog.py
new file mode 100644
index 00000000..1bc624e2
--- /dev/null
+++ b/pysollib/ui/tktile/solverdialog.py
@@ -0,0 +1,81 @@
+class BaseSolverDialog:
+
+    def mDone(self, button):
+        if button == 0:
+            self.startSolving()
+        elif button == 1:
+            self.startPlay()
+        elif button == 2:
+            self.app.menubar.mNewGame()
+        elif button == 3:
+            global solver_dialog
+            solver_dialog = None
+            self.destroy()
+        return EVENT_HANDLED
+
+    def mCancel(self, *event):
+        return self.mDone(3)
+
+    def wmDeleteWindow(self, *event):
+        return self.mDone(3)
+
+    def gameSelected(self, *event):
+        name = self.games_var.get()
+        if not name:
+            return
+        id = self.games[name]
+        self.app.menubar._mSelectGame(id)
+
+    def _reset(self):
+        self.play_button.config(state='disabled')
+        self.setText(iter='', depth='', states='')
+        self.result_label['text'] = ''
+        self.top.update_idletasks()
+
+    def reset(self):
+        self.play_button.config(state='disabled')
+
+    def startSolving(self):
+        from gettext import ungettext
+
+        self._reset()
+        game = self.app.game
+        solver = game.Solver_Class(game, self) # create solver instance
+        game.solver = solver
+        preset = self.preset_var.get()
+        max_iters = self.max_iters_var.get()
+        max_depth = self.max_depth_var.get()
+        progress = self.progress_var.get()
+        solver.config(preset=preset, max_iters=max_iters,
+                      max_depth=max_depth, progress=progress)
+        solver.computeHints()
+        hints_len = len(solver.hints)-1
+        if hints_len > 0:
+            t = ungettext('This game is solveable in %d move.',
+                          'This game is solveable in %d moves.',
+                          hints_len) % hints_len
+            self.result_label['text'] = t
+            self.play_button.config(state='normal')
+        else:
+            self.result_label['text'] = (_('I could not solve this game.') if solver.solver_state == 'unsolved' else _('Iterations count exceeded (Intractable)'))
+            self.play_button.config(state='disabled')
+
+    def startPlay(self):
+        self.play_button.config(state='disabled')
+        self.start_button.focus()
+        if self.app.game.pause:
+            self.app.menubar.mPause()
+        self.app.top.tkraise()
+        self.app.top.update_idletasks()
+        self.app.top.update()
+        self.app.top.after(200)
+        self.app.game.startDemo(level=3)
+
+    def setText(self, **kw):
+        if 'iter' in kw:
+            self.iter_label['text'] = kw['iter']
+        if 'depth' in kw:
+            self.depth_label['text'] = kw['depth']
+        if 'states' in kw:
+            self.states_label['text'] = kw['states']
+        self.top.update_idletasks()
diff --git a/scripts/gen_individual_importing_tests.py b/scripts/gen_individual_importing_tests.py
index 80b94ca8..f8da5320 100644
--- a/scripts/gen_individual_importing_tests.py
+++ b/scripts/gen_individual_importing_tests.py
@@ -182,6 +182,7 @@ for module_name in [
 'pysollib.ui.tktile.card',
 'pysollib.ui.tktile.colorsdialog',
 'pysollib.ui.tktile.menubar',
+'pysollib.ui.tktile.solverdialog',
 'pysollib.ui.tktile.tkcanvas',
 'pysollib.ui.tktile.tkconst',
 'pysollib.ui.tktile.tkutil',