diff --git a/gaphor/services/helpservice.py b/gaphor/services/helpservice.py
index 46d02b972..34789c94f 100644
--- a/gaphor/services/helpservice.py
+++ b/gaphor/services/helpservice.py
@@ -40,8 +40,8 @@ class HelpService(object):
 
     @action(name='help-about', stock_id='gtk-about')
     def about(self):
-        data_dir =  os.path.join(pkg_resources.get_distribution('gaphor').location, 'gaphor', 'data')
-        logo = gtk.gdk.pixbuf_new_from_file(os.path.join(data_dir, 'pixmaps', 'logo.png'))
+        logo_file =  os.path.join(pkg_resources.get_distribution('gaphor').location, 'gaphor', 'ui', 'pixmaps', 'logo.png')
+        logo = gtk.gdk.pixbuf_new_from_file(logo_file)
         version = Application.distribution.version
         about = gtk.Dialog("About Gaphor", self.gui_manager.main_window.window, gtk.DIALOG_MODAL, (gtk.STOCK_OK, gtk.RESPONSE_OK))
         about.set_default_response(gtk.RESPONSE_OK)
diff --git a/setup.py b/setup.py
index df190b687..1ffd84a94 100644
--- a/setup.py
+++ b/setup.py
@@ -125,7 +125,6 @@ setup(
             'diagram_export_manager = gaphor.services.diagramexportmanager:DiagramExportManager',
             'action_manager = gaphor.services.actionmanager:ActionManager',
             'gui_manager = gaphor.services.guimanager:GUIManager',
-            'help = gaphor.services.helpservice:HelpService',
             'copy = gaphor.services.copyservice:CopyService',
             'xmi_export = gaphor.plugins.xmiexport:XMIExport',
             'diagram_layout = gaphor.plugins.diagramlayout:DiagramLayout',
@@ -133,6 +132,7 @@ setup(
             'check_metamodel = gaphor.plugins.checkmetamodel:CheckModelWindow',
             'live_object_browser = gaphor.plugins.liveobjectbrowser:LiveObjectBrowser',
             'alignment = gaphor.plugins.alignment:Alignment',
+            'help = gaphor.services.helpservice:HelpService',
         ],
         'gaphor.uicomponents': [
             'mainwindow = gaphor.ui.mainwindow:MainWindow',