diff --git a/hpage.cabal b/hpage.cabal
--- a/hpage.cabal
+++ b/hpage.cabal
@@ -1,5 +1,5 @@
 name: hpage
-version: 0.4.4
+version: 0.4.5
 cabal-version: >=1.6
 build-type: Custom
 license: BSD3
@@ -17,6 +17,7 @@
 tested-with: GHC ==6.10.3, GHC ==6.10.4
 data-files: LICENSE README
             res/images/*.png
+            res/images/*.ico
             res/images/icon/hPage.icns
             res/images/icon/hpage.tif
             res/help/helpPage.hs
diff --git a/res/images/compiled.png b/res/images/compiled.png
deleted file mode 100644
Binary files a/res/images/compiled.png and /dev/null differ
diff --git a/res/images/imported.png b/res/images/imported.png
deleted file mode 100644
Binary files a/res/images/imported.png and /dev/null differ
diff --git a/res/images/interpreted.png b/res/images/interpreted.png
deleted file mode 100644
Binary files a/res/images/interpreted.png and /dev/null differ
diff --git a/res/images/m_compiled.ico b/res/images/m_compiled.ico
new file mode 100644
Binary files /dev/null and b/res/images/m_compiled.ico differ
diff --git a/res/images/m_imported.ico b/res/images/m_imported.ico
new file mode 100644
Binary files /dev/null and b/res/images/m_imported.ico differ
diff --git a/res/images/m_interpreted.ico b/res/images/m_interpreted.ico
new file mode 100644
Binary files /dev/null and b/res/images/m_interpreted.ico differ
diff --git a/res/images/m_package.ico b/res/images/m_package.ico
new file mode 100644
Binary files /dev/null and b/res/images/m_package.ico differ
diff --git a/src/HPage/GUI/FreeTextWindow.hs b/src/HPage/GUI/FreeTextWindow.hs
--- a/src/HPage/GUI/FreeTextWindow.hs
+++ b/src/HPage/GUI/FreeTextWindow.hs
@@ -87,7 +87,7 @@
         lstPages <- singleListBox pnlPs [style := wxLB_NEEDED_SB, outerSize := sz 400 600]
         
         -- Modules Lists
-        imageFiles <- mapM imageFile ["imported.png", "interpreted.png", "compiled.png"]
+        imageFiles <- mapM imageFile ["m_imported.ico", "m_interpreted.ico", "m_compiled.ico"]
         imagePaths <- mapM getAbsoluteFilePath imageFiles
         images     <- imageListFromFiles (sz 16 16) imagePaths
         lstLoadedModules <- listCtrlEx pnlLMs (wxLC_NO_HEADER + wxLC_SINGLE_SEL)
@@ -431,7 +431,10 @@
                     return ()
                 Just setupConfig ->
                     do
-                        loadres <- tryIn model (HP.loadPackage setupConfig)
+                        loadres <- tryIn model $ do
+                                                    lr <- HP.loadPackage setupConfig
+                                                    HP.addPage
+                                                    return lr
                         case loadres of
                             Left err ->
                                 warningDialog win "Error" err
@@ -634,7 +637,7 @@
                                                         row 5 [widget btnInterpret,
                                                                centre $ widget lblInterpret,
                                                                hfill $ widget txtKind]]
-                                repaint pnlRes
+                                repaint win
                         else do
                                 set btnInterpret [enabled := True]
                                 set txtValue [visible := True, text := HP.intValue interp]
@@ -648,7 +651,7 @@
                                                                hfill $ widget txtValue,
                                                                centre $ widget lbl4Dots,
                                                                hfill $ widget txtType]]
-                                repaint pnlRes
+                                repaint win
  
 runTxtHPSelection :: String ->  HPS.ServerHandle ->
                      HP.HPage (Either HP.InterpreterError HP.Interpretation) -> IO (Either ErrorString HP.Interpretation)
