diff --git a/MANIFEST.in b/MANIFEST.in
index b56caaea..6796a0a7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,7 @@ include version
 include onionshare/index.html
 include onionshare/404.html
 include onionshare/strings.json
+include onionshare_gui/onionshare-icon.png
 include onionshare_gui/templates/index.html
 include onionshare_gui/static/jquery-1.11.1.min.js
 include onionshare_gui/static/helpers.js
diff --git a/onionshare_gui/onionshare-icon.png b/onionshare_gui/onionshare-icon.png
new file mode 100644
index 00000000..b6d4b6c6
Binary files /dev/null and b/onionshare_gui/onionshare-icon.png differ
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index 68b634a2..6a542d84 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -28,11 +28,13 @@ class Window(QWebView):
         self.resize(580, 400)
         self.setMinimumSize(580, 400)
         self.setMaximumSize(580, 400)
+        self.setWindowIcon(QIcon("onionshare-icon.png"))
         self.load(QUrl("http://127.0.0.1:{0}".format(webapp_port)))
 
 def alert(msg, icon=QMessageBox.NoIcon):
     dialog = QMessageBox()
     dialog.setWindowTitle("OnionShare")
+    self.setWindowIcon(QIcon("onionshare-icon.png"))
     dialog.setText(msg)
     dialog.setIcon(icon)
     dialog.exec_()
diff --git a/onionshare_gui/static/logo.png b/onionshare_gui/static/logo.png
index c8140bda..43884c1f 100644
Binary files a/onionshare_gui/static/logo.png and b/onionshare_gui/static/logo.png differ
diff --git a/setup.py b/setup.py
index 41f3a2dc..914f9ab9 100644
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@ elif platform.system() == 'Windows':
     args['data_files'] = [
         ('', ['LICENSE', 'README.md', 'version']),
         ('onionshare', ['onionshare/index.html', 'onionshare/404.html', 'onionshare/strings.json']),
+        ('onionshare_gui', ['onionshare_gui/onionshare-icon.png']),
         ('onionshare_gui/templates', glob('onionshare_gui/templates/*')),
         ('onionshare_gui/static', glob('onionshare_gui/static/*'))
     ]