diff --git a/src/images/svg_icons/application-x-kst.svg b/src/images/svg_icons/application-x-kst.svg
diff --git a/src/images/svg_icons/application-x-kst.svgz b/src/images/svg_icons/application-x-kst.svgz
diff --git a/src/images/svg_icons/arrow.svg b/src/images/svg_icons/arrow.svg
diff --git a/src/images/svg_icons/changefile.svg b/src/images/svg_icons/changefile.svg
diff --git a/src/images/svg_icons/changefile2.svg b/src/images/svg_icons/changefile2.svg
diff --git a/src/images/svg_icons/changefile2.svgz b/src/images/svg_icons/changefile2.svgz
diff --git a/src/images/svg_icons/changerange.svg b/src/images/svg_icons/changerange.svg
diff --git a/src/images/svg_icons/code-class.svgz b/src/images/svg_icons/code-class.svgz
diff --git a/src/images/svg_icons/configure.svgz b/src/images/svg_icons/configure.svgz
diff --git a/src/images/svg_icons/data-manager.svgz b/src/images/svg_icons/data-manager.svgz
diff --git a/src/images/svg_icons/data_manager.svg b/src/images/svg_icons/data_manager.svg
diff --git a/src/images/svg_icons/data_manager.svgz b/src/images/svg_icons/data_manager.svgz
diff --git a/src/images/svg_icons/data_wizard.svg b/src/images/svg_icons/data_wizard.svg
diff --git a/src/images/svg_icons/datamode.svg b/src/images/svg_icons/datamode.svg
diff --git a/src/images/svg_icons/datamode_old.svg b/src/images/svg_icons/datamode_old.svg
diff --git a/src/images/svg_icons/dialog-information.svgz b/src/images/svg_icons/dialog-information.svgz
diff --git a/src/images/svg_icons/document-close.svgz b/src/images/svg_icons/document-close.svgz
diff --git a/src/images/svg_icons/document-open-recent.svgz b/src/images/svg_icons/document-open-recent.svgz
diff --git a/src/images/svg_icons/document-open.svgz b/src/images/svg_icons/document-open.svgz
diff --git a/src/images/svg_icons/document-print.svgz b/src/images/svg_icons/document-print.svgz
diff --git a/src/images/svg_icons/document-save-as.svgz b/src/images/svg_icons/document-save-as.svgz
diff --git a/src/images/svg_icons/document-save.svgz b/src/images/svg_icons/document-save.svgz
diff --git a/src/images/svg_icons/draw-bezier-curves.svgz b/src/images/svg_icons/draw-bezier-curves.svgz
diff --git a/src/images/svg_icons/edit-redo.svgz b/src/images/svg_icons/edit-redo.svgz
diff --git a/src/images/svg_icons/edit-undo.svgz b/src/images/svg_icons/edit-undo.svgz
diff --git a/src/images/svg_icons/edit_equation.svg b/src/images/svg_icons/edit_equation.svg
diff --git a/src/images/svg_icons/edit_equation.svgz b/src/images/svg_icons/edit_equation.svgz
diff --git a/src/images/svg_icons/edit_matrix.svg b/src/images/svg_icons/edit_matrix.svg
diff --git a/src/images/svg_icons/edit_matrix2.svg b/src/images/svg_icons/edit_matrix2.svg
diff --git a/src/images/svg_icons/edit_scalar.svg b/src/images/svg_icons/edit_scalar.svg
diff --git a/src/images/svg_icons/edit_string.svg b/src/images/svg_icons/edit_string.svg
diff --git a/src/images/svg_icons/edit_vector.svg b/src/images/svg_icons/edit_vector.svg
diff --git a/src/images/svg_icons/end.svg b/src/images/svg_icons/end.svg
diff --git a/src/images/svg_icons/image-x-generic.svgz b/src/images/svg_icons/image-x-generic.svgz
diff --git a/src/images/svg_icons/insert-image.svgz b/src/images/svg_icons/insert-image.svgz
diff --git a/src/images/svg_icons/kbugbuster.svgz b/src/images/svg_icons/kbugbuster.svgz
diff --git a/src/images/svg_icons/kst.svg b/src/images/svg_icons/kst.svg
diff --git a/src/images/svg_icons/kst.svgz b/src/images/svg_icons/kst.svgz
diff --git a/src/images/svg_icons/kst_bold.svgz b/src/images/svg_icons/kst_bold.svgz
diff --git a/src/images/svg_icons/kst_changefile.svgz b/src/images/svg_icons/kst_changefile.svgz
diff --git a/src/images/svg_icons/kst_changenpts.svgz b/src/images/svg_icons/kst_changenpts.svgz
diff --git a/src/images/svg_icons/kst_datamode.svgz b/src/images/svg_icons/kst_datamode.svgz
diff --git a/src/images/svg_icons/kst_differentiatecurves.svgz b/src/images/svg_icons/kst_differentiatecurves.svgz
diff --git a/src/images/svg_icons/kst_downarrow.svgz b/src/images/svg_icons/kst_downarrow.svgz
diff --git a/src/images/svg_icons/kst_gfx_arrow.svgz b/src/images/svg_icons/kst_gfx_arrow.svgz
diff --git a/src/images/svg_icons/kst_gfx_circle.svgz b/src/images/svg_icons/kst_gfx_circle.svgz
diff --git a/src/images/svg_icons/kst_gfx_ellipse.svgz b/src/images/svg_icons/kst_gfx_ellipse.svgz
diff --git a/src/images/svg_icons/kst_gfx_label.svgz b/src/images/svg_icons/kst_gfx_label.svgz
diff --git a/src/images/svg_icons/kst_gfx_line.svgz b/src/images/svg_icons/kst_gfx_line.svgz
diff --git a/src/images/svg_icons/kst_gfx_rectangle.svgz b/src/images/svg_icons/kst_gfx_rectangle.svgz
diff --git a/src/images/svg_icons/kst_gfx_sharedaxisbox.svgz b/src/images/svg_icons/kst_gfx_sharedaxisbox.svgz
diff --git a/src/images/svg_icons/kst_italic.svgz b/src/images/svg_icons/kst_italic.svgz
diff --git a/src/images/svg_icons/kst_leftarrow.svgz b/src/images/svg_icons/kst_leftarrow.svgz
diff --git a/src/images/svg_icons/kst_matrixedit.svgz b/src/images/svg_icons/kst_matrixedit.svgz
diff --git a/src/images/svg_icons/kst_matrixnew.svgz b/src/images/svg_icons/kst_matrixnew.svgz
diff --git a/src/images/svg_icons/kst_mime.svg b/src/images/svg_icons/kst_mime.svg
diff --git a/src/images/svg_icons/kst_mime.svgz b/src/images/svg_icons/kst_mime.svgz
diff --git a/src/images/svg_icons/kst_newplot.svgz b/src/images/svg_icons/kst_newplot.svgz
diff --git a/src/images/svg_icons/kst_reload.svgz b/src/images/svg_icons/kst_reload.svgz
diff --git a/src/images/svg_icons/kst_rightarrow.svgz b/src/images/svg_icons/kst_rightarrow.svgz
diff --git a/src/images/svg_icons/kst_scalaredit.svgz b/src/images/svg_icons/kst_scalaredit.svgz
diff --git a/src/images/svg_icons/kst_scalarnew.svgz b/src/images/svg_icons/kst_scalarnew.svgz
diff --git a/src/images/svg_icons/kst_stringedit.svgz b/src/images/svg_icons/kst_stringedit.svgz
diff --git a/src/images/svg_icons/kst_stringnew.svgz b/src/images/svg_icons/kst_stringnew.svgz
diff --git a/src/images/svg_icons/kst_tiny.svg b/src/images/svg_icons/kst_tiny.svg
diff --git a/src/images/svg_icons/kst_tiny.svgz b/src/images/svg_icons/kst_tiny.svgz
diff --git a/src/images/svg_icons/kst_uparrow.svgz b/src/images/svg_icons/kst_uparrow.svgz
diff --git a/src/images/svg_icons/kst_vectoredit.svgz b/src/images/svg_icons/kst_vectoredit.svgz
diff --git a/src/images/svg_icons/kst_vectornew.svgz b/src/images/svg_icons/kst_vectornew.svgz
diff --git a/src/images/svg_icons/layoutmode.svg b/src/images/svg_icons/layoutmode.svg
diff --git a/src/images/svg_icons/layoutmode.svgz b/src/images/svg_icons/layoutmode.svgz
diff --git a/src/images/svg_icons/lr_arrow.svg b/src/images/svg_icons/lr_arrow.svg
diff --git a/src/images/svg_icons/magnifying_glass.svg b/src/images/svg_icons/magnifying_glass.svg
diff --git a/src/images/svg_icons/magnifying_glass.svgz b/src/images/svg_icons/magnifying_glass.svgz
diff --git a/src/images/svg_icons/new-log-event.svgz b/src/images/svg_icons/new-log-event.svgz
diff --git a/src/images/svg_icons/new_curve.svg b/src/images/svg_icons/new_curve.svg
diff --git a/src/images/svg_icons/new_curve.svgz b/src/images/svg_icons/new_curve.svgz
diff --git a/src/images/svg_icons/new_curve2.svg b/src/images/svg_icons/new_curve2.svg
diff --git a/src/images/svg_icons/new_curve2.svgz b/src/images/svg_icons/new_curve2.svgz
diff --git a/src/images/svg_icons/new_equation.svg b/src/images/svg_icons/new_equation.svg
diff --git a/src/images/svg_icons/new_equation.svgz b/src/images/svg_icons/new_equation.svgz
diff --git a/src/images/svg_icons/new_matrix.svg b/src/images/svg_icons/new_matrix.svg
diff --git a/src/images/svg_icons/new_scalar.svg b/src/images/svg_icons/new_scalar.svg
diff --git a/src/images/svg_icons/new_string.svg b/src/images/svg_icons/new_string.svg
diff --git a/src/images/svg_icons/new_vector.svg b/src/images/svg_icons/new_vector.svg
diff --git a/src/images/svg_icons/newplot.svg b/src/images/svg_icons/newplot.svg
diff --git a/src/images/svg_icons/page-previous.svgz b/src/images/svg_icons/page-previous.svgz
diff --git a/src/images/svg_icons/plainplot.svg b/src/images/svg_icons/plainplot.svg
diff --git a/src/images/svg_icons/plainplot.svgz b/src/images/svg_icons/plainplot.svgz
diff --git a/src/images/svg_icons/plotdialog.svg b/src/images/svg_icons/plotdialog.svg
diff --git a/src/images/svg_icons/plotdialog.svgz b/src/images/svg_icons/plotdialog.svgz
diff --git a/src/images/svg_icons/tab-close.svgz b/src/images/svg_icons/tab-close.svgz
diff --git a/src/images/svg_icons/tab-new.svgz b/src/images/svg_icons/tab-new.svgz
diff --git a/src/images/svg_icons/text-x-log.svgz b/src/images/svg_icons/text-x-log.svgz
diff --git a/src/images/svg_icons/tied-zoom.svg b/src/images/svg_icons/tied-zoom.svg
diff --git a/src/images/svg_icons/tied-zoom.svgz b/src/images/svg_icons/tied-zoom.svgz
diff --git a/src/images/svg_icons/tiedzoom.svg b/src/images/svg_icons/tiedzoom.svg
diff --git a/src/images/svg_icons/tiedzoom.svgz b/src/images/svg_icons/tiedzoom.svgz
diff --git a/src/images/svg_icons/tools-wizard.svgz b/src/images/svg_icons/tools-wizard.svgz
diff --git a/src/images/svg_icons/transform-move.svgz b/src/images/svg_icons/transform-move.svgz
diff --git a/src/images/svg_icons/unused/arrow.svgz b/src/images/svg_icons/unused/arrow.svgz
diff --git a/src/images/svg_icons/unused/end.svgz b/src/images/svg_icons/unused/end.svgz
diff --git a/src/images/svg_icons/unused/lr_arrow.svgz b/src/images/svg_icons/unused/lr_arrow.svgz
diff --git a/src/images/svg_icons/unused/zoomx.svgz b/src/images/svg_icons/unused/zoomx.svgz
diff --git a/src/images/svg_icons/unused/zoomxy.svgz b/src/images/svg_icons/unused/zoomxy.svgz
diff --git a/src/images/svg_icons/unused/zoomy.svgz b/src/images/svg_icons/unused/zoomy.svgz
diff --git a/src/images/svg_icons/unused/zoomzy.svgz b/src/images/svg_icons/unused/zoomzy.svgz
diff --git a/src/images/svg_icons/x-zoom.svgz b/src/images/svg_icons/x-zoom.svgz
diff --git a/src/images/svg_icons/xy-zoom.svgz b/src/images/svg_icons/xy-zoom.svgz
diff --git a/src/images/svg_icons/y-zoom.svgz b/src/images/svg_icons/y-zoom.svgz
diff --git a/src/images/svg_icons/zoomx.svg b/src/images/svg_icons/zoomx.svg
diff --git a/src/images/svg_icons/zoomxy.svg b/src/images/svg_icons/zoomxy.svg
diff --git a/src/images/svg_icons/zoomy.svg b/src/images/svg_icons/zoomy.svg
diff --git a/src/images/svg_icons/zoomzy.svg b/src/images/svg_icons/zoomzy.svg
diff --git a/src/images/document-export.png → src/images/unused/document-export.png b/src/images/document-export.png → src/images/unused/document-export.png
diff --git a/src/images/draw-eraser.png → src/images/unused/draw-eraser.png b/src/images/draw-eraser.png → src/images/unused/draw-eraser.png
diff --git a/src/images/kst_blank.png → src/images/unused/kst_blank.png b/src/images/kst_blank.png → src/images/unused/kst_blank.png
diff --git a/src/images/kst_choosecolor.png → src/images/unused/kst_choosecolor.png b/src/images/kst_choosecolor.png → src/images/unused/kst_choosecolor.png
diff --git a/src/images/kst_csdnew.png → src/images/unused/kst_csdnew.png b/src/images/kst_csdnew.png → src/images/unused/kst_csdnew.png
diff --git a/src/images/kst_curvenew.png → src/images/unused/kst_curvenew.png b/src/images/kst_curvenew.png → src/images/unused/kst_curvenew.png
diff --git a/src/images/kst_datamanager.png → src/images/unused/kst_datamanager.png b/src/images/kst_datamanager.png → src/images/unused/kst_datamanager.png
diff --git a/src/images/kst_datawizard.png → src/images/unused/kst_datawizard.png b/src/images/kst_datawizard.png → src/images/unused/kst_datawizard.png
diff --git a/src/images/kst_editplots.png → src/images/unused/kst_editplots.png b/src/images/kst_editplots.png → src/images/unused/kst_editplots.png
diff --git a/src/images/kst_equationedit.png → src/images/unused/kst_equationedit.png b/src/images/kst_equationedit.png → src/images/unused/kst_equationedit.png
diff --git a/src/images/kst_equationnew.png → src/images/unused/kst_equationnew.png b/src/images/kst_equationnew.png → src/images/unused/kst_equationnew.png
diff --git a/src/images/kst_eventnew.png → src/images/unused/kst_eventnew.png b/src/images/kst_eventnew.png → src/images/unused/kst_eventnew.png
diff --git a/src/images/kst_gfx_breaklayout.png → src/images/unused/kst_gfx_breaklayout.png b/src/images/kst_gfx_breaklayout.png → src/images/unused/kst_gfx_breaklayout.png
diff --git a/src/images/kst_gfx_layout.png → src/images/unused/kst_gfx_layout.png b/src/images/kst_gfx_layout.png → src/images/unused/kst_gfx_layout.png
diff --git a/src/images/kst_gfx_picture.png → src/images/unused/kst_gfx_picture.png b/src/images/kst_gfx_picture.png → src/images/unused/kst_gfx_picture.png
diff --git a/src/images/kst_gfx_polygon.png → src/images/unused/kst_gfx_polygon.png b/src/images/kst_gfx_polygon.png → src/images/unused/kst_gfx_polygon.png
diff --git a/src/images/kst_gfx_polyline.png → src/images/unused/kst_gfx_polyline.png b/src/images/kst_gfx_polyline.png → src/images/unused/kst_gfx_polyline.png
diff --git a/src/images/kst_gfx_rounded_rectangle.png → ...ages/unused/kst_gfx_rounded_rectangle.png b/src/images/kst_gfx_rounded_rectangle.png → ...ages/unused/kst_gfx_rounded_rectangle.png
diff --git a/src/images/kst_graphics.png → src/images/unused/kst_graphics.png b/src/images/kst_graphics.png → src/images/unused/kst_graphics.png
diff --git a/src/images/kst_histogramnew.png → src/images/unused/kst_histogramnew.png b/src/images/kst_histogramnew.png → src/images/unused/kst_histogramnew.png
diff --git a/src/images/kst_imagenew.png → src/images/unused/kst_imagenew.png b/src/images/kst_imagenew.png → src/images/unused/kst_imagenew.png
diff --git a/src/images/kst_layoutmode.png → src/images/unused/kst_layoutmode.png b/src/images/kst_layoutmode.png → src/images/unused/kst_layoutmode.png
diff --git a/src/images/unused/kst_newplot.png b/src/images/unused/kst_newplot.png
diff --git a/src/images/kst_pluginnew.png → src/images/unused/kst_pluginnew.png b/src/images/kst_pluginnew.png → src/images/unused/kst_pluginnew.png
diff --git a/src/images/kst_psdnew.png → src/images/unused/kst_psdnew.png b/src/images/kst_psdnew.png → src/images/unused/kst_psdnew.png
diff --git a/src/images/kst_quickcurves.png → src/images/unused/kst_quickcurves.png b/src/images/kst_quickcurves.png → src/images/unused/kst_quickcurves.png
diff --git a/src/images/kst_quickpsd.png → src/images/unused/kst_quickpsd.png b/src/images/kst_quickpsd.png → src/images/unused/kst_quickpsd.png
diff --git a/src/images/kst_viewmanager.png → src/images/unused/kst_viewmanager.png b/src/images/kst_viewmanager.png → src/images/unused/kst_viewmanager.png
diff --git a/src/images/kst_zoomtie.png → src/images/unused/kst_zoomtie.png b/src/images/kst_zoomtie.png → src/images/unused/kst_zoomtie.png
diff --git a/src/images/kst_zoomx.png → src/images/unused/kst_zoomx.png b/src/images/kst_zoomx.png → src/images/unused/kst_zoomx.png
diff --git a/src/images/kst_zoomxy.png → src/images/unused/kst_zoomxy.png b/src/images/kst_zoomxy.png → src/images/unused/kst_zoomxy.png
diff --git a/src/images/kst_zoomy.png → src/images/unused/kst_zoomy.png b/src/images/kst_zoomy.png → src/images/unused/kst_zoomy.png
diff --git a/src/images/kstplot.png → src/images/unused/kstplot.png b/src/images/kstplot.png → src/images/unused/kstplot.png
diff --git a/src/images/magnifying_glass.png → src/images/unused/magnifying_glass.png b/src/images/magnifying_glass.png → src/images/unused/magnifying_glass.png
diff --git a/src/images/no.png → src/images/unused/no.png b/src/images/no.png → src/images/unused/no.png
diff --git a/src/images/plainplot.png → src/images/unused/plainplot.png b/src/images/plainplot.png → src/images/unused/plainplot.png
diff --git a/src/images/resource-group.png → src/images/unused/resource-group.png b/src/images/resource-group.png → src/images/unused/resource-group.png
diff --git a/src/images/yes.png → src/images/unused/yes.png b/src/images/yes.png → src/images/unused/yes.png
diff --git a/src/kst/main.cpp b/src/kst/main.cpp
@@ -66,6 +66,11 @@ int main(int argc, char *argv[]) {
   // qDebug() << "Dir = " + app.applicationDirPath() + "/../share/kst" + localeSuffix;
   app.installTranslator(&kstDirectoryTranslator);
 
+#ifdef QT5
+  app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+#endif
+
+
   app.initMainWindow();
   if (app.mainWindow()->initFromCommandLine()) {
     app.mainWindow()->show();

diff --git a/src/libkst/editablematrix.cpp b/src/libkst/editablematrix.cpp
@@ -20,8 +20,10 @@
 
 #include "debug.h"
 #include <qbytearray.h>
+
 #include <QXmlStreamWriter>
 
+
 namespace Kst {
 
 const QString EditableMatrix::staticTypeString = "Editable Matrix";
@@ -59,6 +61,7 @@ void EditableMatrix::save(QXmlStreamWriter &xml) {
   xml.writeAttribute("ystep", QString::number(yStepSize()));
   xml.writeTextElement("data", qCompress(qba).toBase64());
   xml.writeEndElement();
+
 }
 
 

diff --git a/src/libkst/editablevector.cpp b/src/libkst/editablevector.cpp
@@ -21,6 +21,7 @@
 // qCompress the bytearray
 #include <QXmlStreamWriter>
 #include <QFile>
+//#include <QDataStream>
 
 #include "debug.h"
 namespace Kst {

diff --git a/src/libkstapp/CMakeLists.txt b/src/libkstapp/CMakeLists.txt
@@ -1,8 +1,8 @@
 kst_init(${kst_binary_name} app)
 
 if(kst_qt5)
-	kst_files_ignore(svgitem)
-	add_definitions(-DKST_NO_SVG)
+        #kst_files_ignore(svgitem)
+        #add_definitions(-DKST_NO_SVG)
 	#add_definitions(-DKST_NO_PRINTER)
 	if(UNIX)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")

diff --git a/src/libkstapp/contenttab.cpp b/src/libkstapp/contenttab.cpp
@@ -15,6 +15,7 @@
 #include "objectstore.h"
 #include "relation.h"
 #include "dialoglauncher.h"
+#include "geticon.h"
 
 #include <qdebug.h>
 
@@ -25,10 +26,10 @@ ContentTab::ContentTab(QWidget *parent, ObjectStore *store)
 
   setupUi(this);
 
-  _up->setIcon(QPixmap(":kst_uparrow.png"));
-  _down->setIcon(QPixmap(":kst_downarrow.png"));
-  _add->setIcon(QPixmap(":kst_rightarrow.png"));
-  _remove->setIcon(QPixmap(":kst_leftarrow.png"));
+  _up->setIcon(KstGetIcon("kst_uparrow"));
+  _down->setIcon(KstGetIcon("kst_downarrow"));
+  _add->setIcon(KstGetIcon("kst_rightarrow"));
+  _remove->setIcon(KstGetIcon("kst_leftarrow"));
   _up->setToolTip(tr("Raise in plot order: Alt+Up"));
   _down->setToolTip(tr("Lower in plot order: Alt+Down"));
   _add->setToolTip(tr("Select: Alt+s"));

diff --git a/src/libkstapp/datawizard.cpp b/src/libkstapp/datawizard.cpp
@@ -35,6 +35,7 @@
 #include "sharedaxisboxitem.h"
 #include "boxitem.h"
 #include "updateserver.h"
+#include "geticon.h"
 
 
 namespace Kst {
@@ -184,10 +185,10 @@ DataWizardPageVectors::DataWizardPageVectors(QWidget *parent)
   : QWizardPage(parent) {
    setupUi(this);
 
-  _up->setIcon(QPixmap(":kst_uparrow.png"));
-  _down->setIcon(QPixmap(":kst_downarrow.png"));
-  _add->setIcon(QPixmap(":kst_rightarrow.png"));
-  _remove->setIcon(QPixmap(":kst_leftarrow.png"));
+  _up->setIcon(KstGetIcon("kst_uparrow"));
+  _down->setIcon(KstGetIcon("kst_downarrow"));
+  _add->setIcon(KstGetIcon("kst_rightarrow"));
+  _remove->setIcon(KstGetIcon("kst_leftarrow"));
   _up->setToolTip(tr("Raise in plot order: Alt+Up"));
   _down->setToolTip(tr("Lower in plot order: Alt+Down"));
   _add->setToolTip(tr("Select: Alt+s"));

diff --git a/src/libkstapp/differentiatecurvesdialog.cpp b/src/libkstapp/differentiatecurvesdialog.cpp
@@ -14,6 +14,7 @@
 #include "linestyle.h"
 #include "curve.h"
 #include "colorsequence.h"
+#include "geticon.h"
 
 #include "objectstore.h"
 #include "mainwindow.h"
@@ -48,10 +49,10 @@ DifferentiateCurvesDialog::DifferentiateCurvesDialog(QWidget *parent)
   connect(_selectedListBox, SIGNAL(itemSelectionChanged()), this, SLOT(updateButtons()));
 
   // Use the standard icons
-  _up->setIcon(QPixmap(":kst_uparrow.png"));
-  _down->setIcon(QPixmap(":kst_downarrow.png"));
-  _add->setIcon(QPixmap(":kst_rightarrow.png"));
-  _remove->setIcon(QPixmap(":kst_leftarrow.png"));
+  _up->setIcon(KstGetIcon("kst_uparrow"));
+  _down->setIcon(KstGetIcon("kst_downarrow"));
+  _add->setIcon(KstGetIcon("kst_rightarrow"));
+  _remove->setIcon(KstGetIcon("kst_leftarrow"));
   _up->setToolTip(tr("Move the selected property up the priority list"));
   _down->setToolTip(tr("Move the selected property down the priority list"));
   _add->setToolTip(tr("Add the selected property to the list of properties to cycle through"));

diff --git a/src/libkstapp/labelcreator.cpp b/src/libkstapp/labelcreator.cpp
@@ -16,6 +16,7 @@
 #include "objectstore.h"
 #include "mainwindow.h"
 #include "document.h"
+#include "geticon.h"
 
 #include "applicationsettings.h"
 #include "dialogdefaults.h"
@@ -30,10 +31,10 @@ LabelCreator::LabelCreator(QWidget *parent)
   setWindowTitle(tr("Create Label Dialog"));
   _bold->setFixedWidth(32);
   _bold->setFixedHeight(32);
-  _bold->setIcon(QPixmap(":kst_bold.png"));
+  _bold->setIcon(KstGetIcon("kst_bold"));
   _italic->setFixedWidth(32);
   _italic->setFixedHeight(32);
-  _italic->setIcon(QPixmap(":kst_italic.png"));
+  _italic->setIcon(KstGetIcon("kst_italic"));
   _labelColor->setFixedWidth(32);
   _labelColor->setFixedHeight(32);
 

diff --git a/src/libkstapp/labelpropertiestab.cpp b/src/libkstapp/labelpropertiestab.cpp
@@ -16,6 +16,7 @@
 #include "objectstore.h"
 #include "mainwindow.h"
 #include "document.h"
+#include "geticon.h"
 
 namespace Kst {
 
@@ -41,10 +42,10 @@ LabelPropertiesTab::LabelPropertiesTab(QWidget *parent)
 
   _bold->setFixedWidth(32);
   _bold->setFixedHeight(32);
-  _bold->setIcon(QPixmap(":kst_bold.png"));
+  _bold->setIcon(KstGetIcon("kst_bold"));
   _italic->setFixedWidth(32);
   _italic->setFixedHeight(32);
-  _italic->setIcon(QPixmap(":kst_italic.png"));
+  _italic->setIcon(KstGetIcon("kst_italic"));
   _labelColor->setFixedWidth(32);
   _labelColor->setFixedHeight(32);
 

diff --git a/src/libkstapp/labeltab.cpp b/src/libkstapp/labeltab.cpp
@@ -16,6 +16,7 @@
 #include "objectstore.h"
 #include "mainwindow.h"
 #include "document.h"
+#include "geticon.h"
 
 #include "applicationsettings.h"
 
@@ -26,9 +27,9 @@ LabelTab::LabelTab(PlotItem* plotItem, QWidget *parent)
 
   setupUi(this);
 
-  _globalLabelBold->setIcon(QPixmap(":kst_bold.png"));
+  _globalLabelBold->setIcon(KstGetIcon("kst_bold"));
   _globalLabelBold->setFixedWidth(32);
-  _globalLabelItalic->setIcon(QPixmap(":kst_italic.png"));
+  _globalLabelItalic->setIcon(KstGetIcon("kst_italic"));
   _globalLabelItalic->setFixedWidth(32);
   _globalLabelColor->setFixedWidth(32);
   _globalLabelColor->setFixedHeight(32);

diff --git a/src/libkstapp/legendtab.cpp b/src/libkstapp/legendtab.cpp
@@ -12,6 +12,7 @@
 
 #include "legendtab.h"
 #include "objectstore.h"
+#include "geticon.h"
 
 #include <qdebug.h>
 
@@ -24,21 +25,21 @@ LegendTab::LegendTab(QWidget *parent)
 
   _single = true;
 
-  _up->setIcon(QPixmap(":kst_uparrow.png"));
-  _down->setIcon(QPixmap(":kst_downarrow.png"));
-  _add->setIcon(QPixmap(":kst_rightarrow.png"));
-  _remove->setIcon(QPixmap(":kst_leftarrow.png"));
+  _up->setIcon(KstGetIcon("kst_uparrow"));
+  _down->setIcon(KstGetIcon("kst_downarrow"));
+  _add->setIcon(KstGetIcon("kst_rightarrow"));
+  _remove->setIcon(KstGetIcon("kst_leftarrow"));
   _up->setToolTip(tr("Raise in list order: Alt+Up"));
   _down->setToolTip(tr("Lower in list order: Alt+Down"));
   _add->setToolTip(tr("Select: Alt+s"));
   _remove->setToolTip(tr("Remove: Alt+r"));
 
   _bold->setFixedWidth(32);
   _bold->setFixedHeight(32);
-  _bold->setIcon(QPixmap(":kst_bold.png"));
+  _bold->setIcon(KstGetIcon("kst_bold"));
   _italic->setFixedWidth(32);
   _italic->setFixedHeight(32);
-  _italic->setIcon(QPixmap(":kst_italic.png"));
+  _italic->setIcon(KstGetIcon("kst_italic"));
   _labelColor->setFixedWidth(32);
   _labelColor->setFixedHeight(32);
 

diff --git a/src/libkstapp/mainwindow.cpp b/src/libkstapp/mainwindow.cpp
diff --git a/src/libkstapp/mainwindow.h b/src/libkstapp/mainwindow.h
@@ -72,6 +72,7 @@ class MainWindow : public QMainWindow
     static void setWidgetFlags(QWidget*);
     void updateRecentKstFiles(const QString& newfilename = QString());
 
+
   public Q_SLOTS:
     void showDataManager();
     void showDebugDialog();

diff --git a/src/libkstapp/overridelabeltab.cpp b/src/libkstapp/overridelabeltab.cpp
@@ -16,16 +16,17 @@
 #include "objectstore.h"
 #include "mainwindow.h"
 #include "document.h"
+#include "geticon.h"
 
 namespace Kst {
 
 OverrideLabelTab::OverrideLabelTab(QString title, QWidget *parent)
   : DialogTab(parent), _fontDirty(false) {
 
   setupUi(this);
-  _bold->setIcon(QPixmap(":kst_bold.png"));
+  _bold->setIcon(KstGetIcon("kst_bold"));
   _bold->setFixedWidth(32);
-  _italic->setIcon(QPixmap(":kst_italic.png"));
+  _italic->setIcon(KstGetIcon("kst_italic"));
   _italic->setFixedWidth(32);
   _labelColor->setFixedWidth(32);
   _labelColor->setFixedHeight(32);

diff --git a/src/libkstapp/svgitem.h b/src/libkstapp/svgitem.h
@@ -13,10 +13,11 @@
 #ifndef SVGITEM_H
 #define SVGITEM_H
 
+
 #include "viewitem.h"
 #include "graphicsfactory.h"
 
-class QSvgRenderer;
+#include <QSvgRenderer>
 
 namespace Kst {
 
@@ -55,7 +56,6 @@ class CreateSvgCommand : public CreateCommand
     void createItem();
 };
 
-
 class SvgItemFactory : public GraphicsFactory {
   public:
     SvgItemFactory();

diff --git a/src/libkstapp/themedialog.cpp b/src/libkstapp/themedialog.cpp
@@ -31,6 +31,7 @@
 #include "ellipseitem.h"
 #include "arrowitem.h"
 #include "labelitem.h"
+#include "geticon.h"
 
 namespace Kst {
 
@@ -54,10 +55,10 @@ ThemeDialog::ThemeDialog(QWidget *parent) : QDialog(parent) {
 
   _bold->setFixedWidth(32);
   _bold->setFixedHeight(32);
-  _bold->setIcon(QPixmap(":kst_bold.png"));
+  _bold->setIcon(KstGetIcon("kst_bold"));
   _italic->setFixedWidth(32);
   _italic->setFixedHeight(32);
-  _italic->setIcon(QPixmap(":kst_italic.png"));
+  _italic->setIcon(KstGetIcon("kst_italic"));
   _labelColor->setFixedWidth(32);
   _labelColor->setFixedHeight(32);
 

diff --git a/src/libkstapp/viewvectordialog.cpp b/src/libkstapp/viewvectordialog.cpp
@@ -16,6 +16,7 @@
 #include "vectormodel.h"
 #include "editmultiplewidget.h"
 #include "updateserver.h"
+#include "geticon.h"
 
 #include <datacollection.h>
 #include <objectstore.h>
@@ -62,12 +63,12 @@ ViewVectorDialog::ViewVectorDialog(QWidget *parent, Document *doc)
   }
   // Add/remove buttons
   _addButton = new QPushButton();
-  _addButton->setIcon(QPixmap(":kst_rightarrow.png"));
+  _addButton->setIcon(KstGetIcon("kst_rightarrow"));
   _addButton->setShortcut(tr("Alt+S"));
   _addButton->setToolTip(tr("View selected vector(s)"));
   _addButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
   _removeButton = new QPushButton();
-  _removeButton->setIcon(QPixmap(":kst_leftarrow.png"));
+  _removeButton->setIcon(KstGetIcon("kst_leftarrow"));
   _removeButton->setShortcut(tr("Alt+R"));
   _removeButton->setToolTip(tr("Remove selected vector(s) from view"));
   _removeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);

diff --git a/src/widgets/datasourceselector.cpp b/src/widgets/datasourceselector.cpp
@@ -13,6 +13,7 @@
 #include "datasourceselector.h"
 
 #include "datasourceselectordialog.h"
+#include "geticon.h"
 
 #include <QStyle>
 #include <QLineEdit>
@@ -55,7 +56,7 @@ void DataSourceSelector::setup() {
   setLayout(layout);
 
   int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
-  _fileButton->setIcon(QPixmap(":kst_changefile.png"));
+  _fileButton->setIcon(KstGetIcon("kst_changefile"));
   _fileButton->setFixedSize(size + 8, size + 8);
 
   setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);

diff --git a/src/widgets/filerequester.cpp b/src/widgets/filerequester.cpp
@@ -11,6 +11,7 @@
  ***************************************************************************/
 
 #include "filerequester.h"
+#include "geticon.h"
 
 #include <QStyle>
 #include <QLineEdit>
@@ -45,7 +46,7 @@ void FileRequester::setup() {
   setLayout(layout);
 
   int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
-  _fileButton->setIcon(QPixmap(":kst_changefile.png"));
+  _fileButton->setIcon(KstGetIcon("kst_changefile"));
   _fileButton->setFixedSize(size + 8, size + 8);
 
   setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);

diff --git a/src/widgets/geticon.cpp b/src/widgets/geticon.cpp
@@ -0,0 +1,29 @@
+/***************************************************************************
+ *                                                                         *
+ *   copyright : (C) 2016 C. Barth Netterfield
+ *                   netterfield@astro.utoronto.ca                         *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include <QIcon>
+#include <QFile>
+#include <QDebug>
+
+QIcon KstGetIcon(QString icon_name) {
+  static bool has_svg = true;
+
+  QString svg_name = ":svg_icons/"+icon_name+".svgz";
+  if (QFile::exists(svg_name)) {
+    //qDebug() << svg_name;
+    return QIcon(svg_name);
+  } else {
+    QString png_name = ":"+icon_name+".png";
+    qDebug() << png_name;
+    return QIcon(png_name);
+  }
+}
+
diff --git a/src/widgets/geticon.h b/src/widgets/geticon.h
@@ -0,0 +1,7 @@
+#ifndef GETICON_H
+#define GETICON_H
+
+QIcon KstGetIcon(QString icon_name);
+
+#endif // GETICON_H
+
diff --git a/src/widgets/matrixselector.cpp b/src/widgets/matrixselector.cpp
@@ -16,6 +16,7 @@
 
 #include "dialoglauncher.h"
 #include "datacollection.h"
+#include "geticon.h"
 
 namespace Kst {
 
@@ -26,8 +27,8 @@ MatrixSelector::MatrixSelector(QWidget *parent, ObjectStore *store)
 
   int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
 
-  _newMatrix->setIcon(QPixmap(":kst_matrixnew.png"));
-  _editMatrix->setIcon(QPixmap(":kst_matrixedit.png"));
+  _newMatrix->setIcon(KstGetIcon("kst_matrixnew"));
+  _editMatrix->setIcon(KstGetIcon("kst_matrixedit"));
 
   _newMatrix->setFixedSize(size + 8, size + 8);
   _editMatrix->setFixedSize(size + 8, size + 8);

diff --git a/src/widgets/scalarselector.cpp b/src/widgets/scalarselector.cpp
@@ -18,6 +18,7 @@
 #include "updateserver.h"
 
 #include "enodes.h"
+#include "geticon.h"
 
 namespace Kst {
 
@@ -29,8 +30,8 @@ ScalarSelector::ScalarSelector(QWidget *parent, ObjectStore *store)
 
   int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
 
-  _newScalar->setIcon(QPixmap(":kst_scalarnew.png"));
-  _editScalar->setIcon(QPixmap(":kst_scalaredit.png"));
+  _newScalar->setIcon(KstGetIcon("kst_scalarnew"));
+  _editScalar->setIcon(KstGetIcon("kst_scalaredit"));
 
   _newScalar->setFixedSize(size + 8, size + 8);
   _editScalar->setFixedSize(size + 8, size + 8);

diff --git a/src/widgets/stringselector.cpp b/src/widgets/stringselector.cpp
@@ -14,6 +14,7 @@
 
 #include "dialoglauncher.h"
 #include "objectstore.h"
+#include "geticon.h"
 
 namespace Kst {
 
@@ -24,8 +25,8 @@ StringSelector::StringSelector(QWidget *parent, ObjectStore *store)
 
   int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
 
-  _newString->setIcon(QPixmap(":kst_stringnew.png"));
-  _editString->setIcon(QPixmap(":kst_stringedit.png"));
+  _newString->setIcon(KstGetIcon("kst_stringnew"));
+  _editString->setIcon(KstGetIcon("kst_stringedit"));
 
   _newString->setFixedSize(size + 8, size + 8);
   _editString->setFixedSize(size + 8, size + 8);

diff --git a/src/widgets/vectorselector.cpp b/src/widgets/vectorselector.cpp
@@ -18,6 +18,7 @@
 #include "dialogdefaults.h"
 #include "curve.h"
 #include "updateserver.h"
+#include "geticon.h"
 
 namespace Kst {
 
@@ -28,8 +29,8 @@ VectorSelector::VectorSelector(QWidget *parent, ObjectStore *store)
 
   int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
 
-  _newVector->setIcon(QPixmap(":kst_vectornew.png"));
-  _editVector->setIcon(QPixmap(":kst_vectoredit.png"));
+  _newVector->setIcon(KstGetIcon("kst_vectornew"));
+  _editVector->setIcon(KstGetIcon("kst_vectoredit"));
 
   _newVector->setFixedSize(size + 8, size + 8);
   _editVector->setFixedSize(size + 8, size + 8);