diff --git a/ground/openpilotgcs/src/plugins/qmlview/svgimageprovider.cpp b/ground/openpilotgcs/src/libs/utils/svgimageprovider.cpp
similarity index 100%
rename from ground/openpilotgcs/src/plugins/qmlview/svgimageprovider.cpp
rename to ground/openpilotgcs/src/libs/utils/svgimageprovider.cpp
diff --git a/ground/openpilotgcs/src/plugins/qmlview/svgimageprovider.h b/ground/openpilotgcs/src/libs/utils/svgimageprovider.h
similarity index 100%
rename from ground/openpilotgcs/src/plugins/qmlview/svgimageprovider.h
rename to ground/openpilotgcs/src/libs/utils/svgimageprovider.h
diff --git a/ground/openpilotgcs/src/libs/utils/utils.pro b/ground/openpilotgcs/src/libs/utils/utils.pro
index 003497b4d..e7390ad77 100644
--- a/ground/openpilotgcs/src/libs/utils/utils.pro
+++ b/ground/openpilotgcs/src/libs/utils/utils.pro
@@ -5,7 +5,8 @@ QT += gui \
     network \
     xml \
     svg \
-    opengl
+    opengl \
+    declarative
 
 DEFINES += QTCREATOR_UTILS_LIB
 
@@ -51,7 +52,9 @@ SOURCES += reloadpromptutils.cpp \
     mytabbedstackwidget.cpp \
     mytabwidget.cpp \
     mylistwidget.cpp \
-    cachedsvgitem.cpp
+    cachedsvgitem.cpp \
+    svgimageprovider.cpp
+
 SOURCES += xmlconfig.cpp
 
 win32 {
@@ -106,7 +109,10 @@ HEADERS += utils_global.h \
     mytabbedstackwidget.h \
     mytabwidget.h \
     mylistwidget.h \
-    cachedsvgitem.h
+    cachedsvgitem.h \
+    svgimageprovider.h
+
+
 HEADERS += xmlconfig.h
 
 FORMS += filewizardpage.ui \
diff --git a/ground/openpilotgcs/src/plugins/qmlview/qmlview.pro b/ground/openpilotgcs/src/plugins/qmlview/qmlview.pro
index 5b2817e6d..c2897f3a0 100644
--- a/ground/openpilotgcs/src/plugins/qmlview/qmlview.pro
+++ b/ground/openpilotgcs/src/plugins/qmlview/qmlview.pro
@@ -14,8 +14,8 @@ HEADERS += \
     qmlviewgadgetwidget.h \
     qmlviewgadgetfactory.h \
     qmlviewgadgetconfiguration.h \
-    qmlviewgadgetoptionspage.h \
-    svgimageprovider.h
+    qmlviewgadgetoptionspage.h
+
 
 SOURCES += \
     qmlviewplugin.cpp \
@@ -23,8 +23,7 @@ SOURCES += \
     qmlviewgadgetfactory.cpp \
     qmlviewgadgetwidget.cpp \
     qmlviewgadgetconfiguration.cpp \
-    qmlviewgadgetoptionspage.cpp \
-    svgimageprovider.cpp
+    qmlviewgadgetoptionspage.cpp
 
 OTHER_FILES += QMLView.pluginspec
 
diff --git a/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetwidget.cpp
index a4c8f4f43..26e03b0e8 100644
--- a/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetwidget.cpp
@@ -30,6 +30,7 @@
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"
+#include "utils/svgimageprovider.h"
 
 #include <QDebug>
 #include <QSvgRenderer>
diff --git a/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetwidget.h b/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetwidget.h
index d0af0533b..d3019de36 100644
--- a/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetwidget.h
+++ b/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetwidget.h
@@ -29,7 +29,6 @@
 #define QMLVIEWGADGETWIDGET_H_
 
 #include "qmlviewgadgetconfiguration.h"
-#include "svgimageprovider.h"
 
 #include <QtDeclarative/qdeclarativeview.h>