diff --git a/src/repsnapper-icon.svg b/src/repsnapper-icon.svg
index a0ea65c8..dd6ddf10 100644
--- a/src/repsnapper-icon.svg
+++ b/src/repsnapper-icon.svg
@@ -9,28 +9,21 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
+   width="256"
+   height="256"
    id="svg10139"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="repsnapper.svg"
+   sodipodi:docname="repsnapper-icon16.svg"
    inkscape:export-filename="/home/churchyard/Obrázky/repsnapper/repsnapper16.png"
-   inkscape:export-xdpi="30"
-   inkscape:export-ydpi="30">
+   inkscape:export-xdpi="5.625"
+   inkscape:export-ydpi="5.625">
   <defs
      id="defs10141">
     <filter
        inkscape:collect="always"
-       id="filter10969">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.91320388"
-         id="feGaussianBlur10971" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter10953">
+       id="filter10953"
+       color-interpolation-filters="sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="1.1336322"
@@ -44,17 +37,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.8994949"
-     inkscape:cx="5.4863417"
-     inkscape:cy="19.014766"
+     inkscape:zoom="1.2374369"
+     inkscape:cx="20.428754"
+     inkscape:cy="118.36859"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1616"
-     inkscape:window-height="1026"
+     inkscape:window-width="1302"
+     inkscape:window-height="744"
      inkscape:window-x="64"
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
@@ -66,31 +59,38 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Miroslav Hrončok &lt;miro@hroncok.cz&gt;</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
      id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g10171"
-       style="stroke:#2e3436;filter:url(#filter10953);opacity:0.52797203">
-      <path
-         style="fill:#8ae234;fill-opacity:0;stroke:#2e3436;stroke-width:7.32534170000000007;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         d="M 24.102368,5.0688278 C 20.096533,8.5857864 16.015108,11.87584 12.910184,15.169091 9.2356954,19.066453 7.0411124,22.757962 7.0411124,27.248459 c 0,9.411974 7.5469156,16.958889 16.9588876,16.958889 9.411974,0 16.958888,-7.546915 16.958888,-16.958889 0,-4.494969 -2.188527,-8.214902 -5.834949,-12.11349 C 32.053885,11.852607 28.038885,8.5759384 24.102368,5.0688278 z"
-         id="path10173"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#2e3436;stroke-width:6.94106817000000031;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="M 32.863411,39.748474 32.661381,24.426028 24.013759,15.385167 24.114774,37.009638 15.167112,30.407572 14.962676,13.437018"
-         id="path10175"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-    </g>
+     inkscape:groupmode="layer"
+     transform="translate(0,208)">
     <g
-       id="g10167">
+       id="g10167"
+       transform="matrix(5.3729942,0,0,5.3729942,-0.95185979,-208.99005)">
       <path
          inkscape:connector-curvature="0"
          id="path10978"
@@ -104,25 +104,14 @@
          style="fill:none;stroke:#4e9a06;stroke-width:6.94106817;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
-       id="path10995"
-       d="M 33.065442,42.172841 32.661381,24.325013 23.912744,15.183137 24.013759,36.908623 15.066097,30.407572 14.659631,12.931942"
-       style="fill:none;stroke:#8ae234;stroke-width:4.64099979;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path10993"
-       d="M 24.102368,5.0688278 C 20.096533,8.5857864 16.015108,11.87584 12.910184,15.169091 9.2356954,19.066453 7.0411124,22.757962 7.0411124,27.248459 c 0,9.411974 7.5469156,16.958889 16.9588876,16.958889 9.411974,0 16.958888,-7.546915 16.958888,-16.958889 0,-4.494969 -2.188527,-8.214902 -5.834949,-12.11349 C 32.053885,11.852607 28.038885,8.5759384 24.102368,5.0688278 z"
-       style="fill:#8ae234;fill-opacity:0;stroke:#8ae234;stroke-width:5.125;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-    <path
-       style="fill:none;stroke:#73d216;stroke-width:2.84100008;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 33.166457,42.980962 32.863411,24.426028 24.013759,15.385168 24.114774,37.110653 15.167112,30.508587 14.558615,13.437018"
+       style="fill:none;stroke:#73d216;stroke-width:15.26467705;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 177.25132,15.481429 -1.62827,-93.230576 -47.54913,-48.576493 0.54276,116.7309096 -48.075735,-35.4728626 -3.26945,-91.725447"
        id="path10999"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccc" />
     <path
-       style="fill:#8ae234;fill-opacity:0;stroke:#73d216;stroke-width:3.125;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       d="M 24.102368,5.0688278 C 20.096533,8.5857864 16.015108,11.87584 12.910184,15.169091 9.2356954,19.066453 7.0411124,22.757962 7.0411124,27.248459 c 0,9.411974 7.5469156,16.958889 16.9588876,16.958889 9.411974,0 16.958888,-7.546915 16.958888,-16.958889 0,-4.494969 -2.188527,-8.214902 -5.834949,-12.11349 C 32.053885,11.852607 28.038885,8.5759384 24.102368,5.0688278 z"
+       style="fill:#8ae234;fill-opacity:0;stroke:#73d216;stroke-width:16.79060555;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 128.55003,-181.75527 c -21.52333,18.89659 -43.452807,36.57403 -60.135546,54.26866 -19.743005,20.94049 -31.534488,40.774954 -31.534488,64.902368 0,50.570482 40.549534,91.120012 91.120004,91.120012 50.57048,0 91.12001,-40.54953 91.12001,-91.120012 0,-24.151443 -11.75895,-44.138618 -31.35115,-65.085718 -16.49538,-17.63611 -38.06795,-35.24163 -59.21883,-54.08531 z"
        id="path10997"
        inkscape:connector-curvature="0" />
   </g>
diff --git a/src/repsnapper.cpp b/src/repsnapper.cpp
index 03c2d79a..1042da5a 100644
--- a/src/repsnapper.cpp
+++ b/src/repsnapper.cpp
@@ -310,10 +310,7 @@ int main(int argc, char **argv)
   mainwin->setNonPrintingMode(nonprintingmode, opts.gcode_output_path);
 
   Glib::RefPtr<Gio::File> iconfile = find_global_config("repsnapper-icon.svg");
-  if (iconfile)
-    mainwin->set_icon_from_file(iconfile->get_path());
-  else
-    mainwin->set_icon_name("gtk-convert");
+  mainwin->set_icon_file(iconfile);
   mainwin->set_title("Repsnapper");
 
   if (opts.stl_input_path.size() > 0) {
diff --git a/src/ui/prefs_dlg.h b/src/ui/prefs_dlg.h
index 594978f4..eb4cc678 100644
--- a/src/ui/prefs_dlg.h
+++ b/src/ui/prefs_dlg.h
@@ -38,6 +38,7 @@ class PrefsDlg {
   PrefsDlg(Model *model, Glib::RefPtr<Gtk::Builder> &builder);
   ~PrefsDlg();
   void show();
+  void set_icon_from_file(const string path) {m_preferences_dlg->set_icon_from_file(path);}
 };
 
 #endif // SETTINGS_H
diff --git a/src/ui/view.cpp b/src/ui/view.cpp
index d9f2a93b..124a73a5 100644
--- a/src/ui/view.cpp
+++ b/src/ui/view.cpp
@@ -591,6 +591,17 @@ void View::hide_on_response(int, Gtk::Dialog *dialog)
   dialog->hide();
 }
 
+void View::set_icon_file(Glib::RefPtr<Gio::File> file)
+{
+  iconfile = file;
+  if (iconfile) {
+    set_icon_from_file(iconfile->get_path());
+    m_settings_ui->set_icon_from_file(iconfile->get_path());
+  } else
+    set_icon_name("gtk-convert");
+}
+
+
 void View::show_dialog(const char *name)
 {
   Gtk::Dialog *dialog;
@@ -599,7 +610,10 @@ void View::show_dialog(const char *name)
     cerr << "no such dialog " << name << "\n";
     return;
   }
-  dialog->set_icon_name("gtk-convert");
+  if (iconfile)
+    dialog->set_icon_from_file(iconfile->get_path());
+  else
+    dialog->set_icon_name("gtk-convert");
   dialog->signal_response().connect (sigc::bind(sigc::mem_fun(*this, &View::hide_on_response), dialog));
   dialog->show();
   //  dialog->set_transient_for (*this);
diff --git a/src/ui/view.h b/src/ui/view.h
index 296b2655..7d355e18 100644
--- a/src/ui/view.h
+++ b/src/ui/view.h
@@ -233,6 +233,9 @@ class View : public Gtk::Window
 
   Glib::Mutex mutex;
 
+  Glib::RefPtr<Gio::File> iconfile;
+  void set_icon_file(Glib::RefPtr<Gio::File> iconfile);
+
 };
 
 #ifdef MODEL_IMPLEMENTATION