diff --git a/hackertray/__init__.py b/hackertray/__init__.py
index 117faa6..489d77f 100644
--- a/hackertray/__init__.py
+++ b/hackertray/__init__.py
@@ -65,6 +65,10 @@ class HackerNewsApp:
 		file.write(json.dumps(l))
 		gtk.main_quit()
 
+	def run(self):
+		gtk.main()
+		return 0
+
 	'''Opens the link in the web browser'''
 	def open(self, widget, event=None, data=None):
 		#We disconnect and reconnect the event in case we have
@@ -107,9 +111,5 @@ def getHomePage():
 	return r.json()
 
 def main():
-	gtk.main()
-	return 0
-
-if __name__ == "__main__":
 	indicator = HackerNewsApp()
-	main()
\ No newline at end of file
+	indicator.run()
diff --git a/hackertray/appindicator_replacement.py b/hackertray/appindicator_replacement.py
index 0a0ab72..1167c99 100644
--- a/hackertray/appindicator_replacement.py
+++ b/hackertray/appindicator_replacement.py
@@ -25,8 +25,8 @@ STATUS_ATTENTION = 1
 
 # Locations to search for the given icon
 search_locations = [ os.path.join(os.path.dirname(sys.executable), "images"),
-                     os.path.join(os.path.dirname(sys.path[0]), "images"),
-                     os.path.join(os.path.dirname(sys.path[0]), "../images"),
+                     os.path.join(os.path.dirname(__file__), "images"),
+                     os.path.join(os.path.dirname(__file__), "../images"),
                      '/usr/share/pixmaps' ]
 
 def get_icon_filename(icon_name):
diff --git a/setup.py b/setup.py
index 6ad0e7c..2bbbcbf 100644
--- a/setup.py
+++ b/setup.py
@@ -8,8 +8,12 @@ setup(name='hackertray',
       author_email='me@captnemo.in',
       license='MIT',
       packages=['hackertray'],
+      package_data={'hackertray': ['../images/hacker-tray.png']},
+      include_package_data=True,
       install_requires=[
           'requests',
       ],
-      scripts=['bin/hackertray'],
-      zip_safe=False)
\ No newline at end of file
+      entry_points={
+          'console_scripts': ['hackertray = hackertray:main'],
+      },
+      zip_safe=False)