diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70138616f..709600b08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,7 +269,7 @@ endif()
 
 #set up the subsurface_link_libraries variable
 set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES})
-qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc)
+qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc map-widget/qml/map-widget.qrc)
 
 # include translations
 add_subdirectory(translations)
diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp
index 2060fdb7c..6d9cd867d 100644
--- a/desktop-widgets/mapwidget.cpp
+++ b/desktop-widgets/mapwidget.cpp
@@ -11,8 +11,8 @@
 #include "mainwindow.h"
 #include "divelistview.h"
 
-static const QUrl urlMapWidget = QUrl(QStringLiteral("qrc:/MapWidget.qml"));
-static const QUrl urlMapWidgetError = QUrl(QStringLiteral("qrc:/MapWidgetError.qml"));
+static const QUrl urlMapWidget = QUrl(QStringLiteral("qrc:/qml/MapWidget.qml"));
+static const QUrl urlMapWidgetError = QUrl(QStringLiteral("qrc:/qml/MapWidgetError.qml"));
 static bool isReady = false;
 static bool skipReload = false;
 
diff --git a/subsurface.qrc b/subsurface.qrc
index c4d43b2fe..97436bcf4 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -1,16 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="MapWidget.qml">map-widget/qml/MapWidget.qml</file>
-        <file alias="MapWidgetError.qml">map-widget/qml/MapWidgetError.qml</file>
-        <file alias="MapWidgetContextMenu.qml">map-widget/qml/MapWidgetContextMenu.qml</file>
-        <file alias="dive-location-marker-icon">map-widget/qml/icons/mapwidget-marker.png</file>
-        <file alias="dive-location-marker-inactive-icon">map-widget/qml/icons/mapwidget-marker-gray.png</file>
-        <file alias="dive-location-marker-selected-icon">map-widget/qml/icons/mapwidget-marker-selected.png</file>
-        <file alias="map-style-photo-icon">map-widget/qml/icons/mapwidget-toggle-satellite.png</file>
-        <file alias="map-style-map-icon">map-widget/qml/icons/mapwidget-toggle-street.png</file>
-        <file alias="open-menu-icon">map-widget/qml/icons/mapwidget-context-menu.png</file>
-        <file alias="zoom-in-icon">map-widget/qml/icons/mapwidget-zoom-in.png</file>
-        <file alias="zoom-out-icon">map-widget/qml/icons/mapwidget-zoom-out.png</file>
         <file alias="satellite-icon">icons/satellite.svg</file>
         <file alias="graph-icon">icons/graph.png</file>
         <file alias="hide-icon">icons/go-top.svg</file>