diff --git a/icons/Matlab_PILOT_icon.png b/icons/Matlab_PILOT_icon.png
deleted file mode 100644
index 69acc364..00000000
Binary files a/icons/Matlab_PILOT_icon.png and /dev/null differ
diff --git a/icons/autopicsicon.png b/icons/autopicsicon.png
deleted file mode 100644
index cfa0e6a1..00000000
Binary files a/icons/autopicsicon.png and /dev/null differ
diff --git a/icons/delete.png b/icons/delete.png
deleted file mode 100644
index 74c37cf9..00000000
Binary files a/icons/delete.png and /dev/null differ
diff --git a/icons/filter.png b/icons/filter.png
deleted file mode 100644
index 1098d3ac..00000000
Binary files a/icons/filter.png and /dev/null differ
diff --git a/icons/locate_button.png b/icons/locate_button.png
deleted file mode 100644
index b28c8a4d..00000000
Binary files a/icons/locate_button.png and /dev/null differ
diff --git a/icons/manupicsicon.png b/icons/manupicsicon.png
deleted file mode 100644
index 8eec0efd..00000000
Binary files a/icons/manupicsicon.png and /dev/null differ
diff --git a/icons/printer.png b/icons/printer.png
deleted file mode 100644
index c5b92eb5..00000000
Binary files a/icons/printer.png and /dev/null differ
diff --git a/icons/pylot.ico b/icons/pylot.ico
deleted file mode 100644
index 81bd4cf5..00000000
Binary files a/icons/pylot.ico and /dev/null differ
diff --git a/icons/pylot.png b/icons/pylot.png
deleted file mode 100644
index 10f1fc94..00000000
Binary files a/icons/pylot.png and /dev/null differ
diff --git a/icons/sync.png b/icons/sync.png
deleted file mode 100644
index fa9ea46d..00000000
Binary files a/icons/sync.png and /dev/null differ
diff --git a/icons/zoom_0.png b/icons/zoom_0.png
deleted file mode 100644
index e1617bc9..00000000
Binary files a/icons/zoom_0.png and /dev/null differ
diff --git a/icons/zoom_in.png b/icons/zoom_in.png
deleted file mode 100644
index 65de2a5b..00000000
Binary files a/icons/zoom_in.png and /dev/null differ
diff --git a/icons/zoom_out.png b/icons/zoom_out.png
deleted file mode 100644
index 338e7b1e..00000000
Binary files a/icons/zoom_out.png and /dev/null differ
diff --git a/pylot/core/io/data.py b/pylot/core/io/data.py
index 2526469b..5dbab794 100644
--- a/pylot/core/io/data.py
+++ b/pylot/core/io/data.py
@@ -187,7 +187,7 @@ class Data(object):
                 self.get_evt_data().write(fnout + fnext, format=evtformat)
 
         # try exporting event via ObsPy
-        elif fnext == '.obs':
+        else:
             # check for stations picked automatically as well as manually
             # Prefer manual picks!
             evtdata_copy = self.get_evt_data().copy()
@@ -202,23 +202,29 @@ class Data(object):
                           evtdata_copy.picks[k].method_id == 'auto':
                           del evtdata_copy.picks[k]
                           break
-                
+            if fnext == '.obs':
+               try:
+                   evtdata_copy.write(fnout + fnext, format=evtformat)
+                   # write header afterwards
+                   evid = str(evtdata_org.resource_id).split('/')[1]
+                   header = '# EQEVENT:  Label: EQ%s  Loc:  X 0.00  Y 0.00  Z 10.00  OT 0.00 \n' % evid
+                   nllocfile = open(fnout + fnext)
+                   l = nllocfile.readlines()
+                   nllocfile.close()
+                   l.insert(0, header)
+                   nllocfile = open(fnout + fnext, 'w')
+                   nllocfile.write("".join(l))
+                   nllocfile.close()
+               except KeyError as e:
+                   raise KeyError('''{0} export format
+                                     not implemented: {1}'''.format(evtformat, e))
+            if fnext == '.cnv':
+               try:
+                   evtdata_org.write(fnout + fnext, format=evtformat)
+               except KeyError as e:
+                   raise KeyError('''{0} export format
+                                     not implemented: {1}'''.format(evtformat, e))
 
-            try:
-                evtdata_copy.write(fnout + fnext, format=evtformat)
-                # write header afterwards
-                evid = str(evtdata_org.resource_id).split('/')[1]
-                header = '# EQEVENT:  Label: EQ%s  Loc:  X 0.00  Y 0.00  Z 10.00  OT 0.00 \n' % evid
-                nllocfile = open(fnout + fnext)
-                l = nllocfile.readlines()
-                nllocfile.close()
-                l.insert(0, header)
-                nllocfile = open(fnout + fnext, 'w')
-                nllocfile.write("".join(l))
-                nllocfile.close()
-            except KeyError as e:
-                raise KeyError('''{0} export format
-                                  not implemented: {1}'''.format(evtformat, e))
 
     def getComp(self):
         """