diff --git a/src/plugins/view/geoview.py b/src/plugins/view/geoview.py
index aeef11702..aee4a0958 100644
--- a/src/plugins/view/geoview.py
+++ b/src/plugins/view/geoview.py
@@ -447,7 +447,7 @@ class GeoView(HtmlView):
         self.already_testing = False
         self.alt_provider = self._config.get('preferences.alternate-provider')
         self.usedmap = "googlev3" if self.alt_provider else "openlayers"
-        fpath = os.path.join(const.ROOT_DIR, 'mapstraction',
+        fpath = os.path.join(const.ROOT_DIR, 'plugins/webstuff/images',
                                              'crosshairs.png')
         self.crosspath = urlparse.urlunsplit(
             ('file', '', URL_SEP.join(fpath.split(os.sep)), '', '')
@@ -1780,7 +1780,7 @@ class GeoView(HtmlView):
                 "css"  : self._add_stylesheet()
                 }
             )
-        fpath = os.path.join(const.ROOT_DIR, 'mapstraction',
+        fpath = os.path.join(const.ROOT_DIR, 'plugins/webstuff/js/mapstraction',
                                              "mxn.js?(googlev3,openlayers)")
         upath = urlparse.urlunsplit(
             ('file', '', URL_SEP.join(fpath.split(os.sep)), '', '')
@@ -2014,7 +2014,7 @@ class GeoView(HtmlView):
             value = 'gramps-geo-default' # we use default icon.
         if ( value == "gramps-geo-default" ):
             value = value.replace("default",'" + default_icon + "')
-        ipath = os.path.join(const.ROOT_DIR, 'images/22x22/', '%s.png' % value )
+        ipath = os.path.join(const.ROOT_DIR, 'plugins/webstuff/images', '%s.png' % value )
         upath = urlparse.urlunsplit(('file', '',
                                      URL_SEP.join(ipath.split(os.sep)), '', ''))
         # Workaround to avoid a drift problem with openlayers.
@@ -2523,7 +2523,7 @@ class GeoView(HtmlView):
         delp = 'type="text/css" rel="stylesheet" />\n'
         # Get the GeoView stylesheet.
         cpath = os.path.join(const.ROOT_DIR,
-                             'data',
+                             'plugins/webstuff/css',
                              'GeoView.css'
                             )
         gpath = urlparse.urlunsplit(('file', '',