diff --git a/branding/assets/riseup/icon.bmp b/branding/assets/riseup/icon.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..9e918e4d3490b7c7b89741840e10607ed55b9c99
Binary files /dev/null and b/branding/assets/riseup/icon.bmp differ
diff --git a/branding/assets/riseup/icon.icns b/branding/assets/riseup/icon.icns
old mode 100755
new mode 100644
index c65c9e17938b3dae0ae392d3e853684dd8e0237d..b4c9a204a49ba840091896ad0b0e5e4cba331302
Binary files a/branding/assets/riseup/icon.icns and b/branding/assets/riseup/icon.icns differ
diff --git a/branding/assets/riseup/riseupvpn.icns b/branding/assets/riseup/riseupvpn.icns
deleted file mode 100644
index b4c9a204a49ba840091896ad0b0e5e4cba331302..0000000000000000000000000000000000000000
Binary files a/branding/assets/riseup/riseupvpn.icns and /dev/null differ
diff --git a/branding/assets/riseup/riseupvpn.ico b/branding/assets/riseup/riseupvpn.ico
deleted file mode 100755
index c65c9e17938b3dae0ae392d3e853684dd8e0237d..0000000000000000000000000000000000000000
Binary files a/branding/assets/riseup/riseupvpn.ico and /dev/null differ
diff --git a/branding/templates/debian/app.desktop-template b/branding/templates/debian/app.desktop-template
index eb831f73e39375037da0eda8c8fbc89bc7b8b4ce..761e3a9310770fe71feb0664870f525036576481 100644
--- a/branding/templates/debian/app.desktop-template
+++ b/branding/templates/debian/app.desktop-template
@@ -7,7 +7,7 @@ Comment[es]=VPN Facil de ${name}
 Comment[de]=Easy VPN by ${name}
 Exec=${binaryName} %U
 Terminal=false
-Icon=riseupvpn
+Icon=icon
 Categories=Network;Application;
 StartupNotify=true
 X-AppInstall-Package=${binaryName}
diff --git a/branding/templates/osx/generate.py b/branding/templates/osx/generate.py
index 528605deec0739f036b3be415c55f1bc4d32cb13..440ee34b2f74e5d400ee37199a9f29ad1cd5c3f9 100644
--- a/branding/templates/osx/generate.py
+++ b/branding/templates/osx/generate.py
@@ -32,7 +32,7 @@ VERSION = data.get('version', 'unknown')
 APP_PATH = os.path.abspath(here + '/../dist/' + APPNAME + ".app")
 STAGING = os.path.abspath(here + '/../staging/')
 ASSETS = os.path.abspath(here + '/../assets/')
-ICON = os.path.join(ASSETS, APPNAME.lower() + '.icns')
+ICON = os.path.join(ASSETS, 'icon.icns')
 SCRIPTS = os.path.join(os.path.abspath(here), 'scripts')
 INFO_PLIST = APP_PATH + '/Contents/Info.plist'
 HELPER_PLIST = os.path.join(SCRIPTS, 'se.leap.bitmask-helper.plist')
diff --git a/branding/templates/windows/template.nsi b/branding/templates/windows/template.nsi
index 00118e1f1de63711483c6eda6f95687bde41c26b..3f049f95866374df3b19c4ef5fc3bf516bab0f8a 100755
--- a/branding/templates/windows/template.nsi
+++ b/branding/templates/windows/template.nsi
@@ -30,7 +30,7 @@ RequestExecutionLevel admin
 
 
 
-!define BITMAP_FILE riseupvpn.bmp
+!define BITMAP_FILE icon.bmp
 
 !define MUI_ICON "..\assets\$applicationNameLower.ico"
 !define MUI_UNICON "..\assets\$applicationNameLower.ico"
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 4f2ab38bcb74c2171c570adc59870c681e9ace17..dd13c8b19188ba26ea2667c62be00065d26ae40c 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -1,6 +1,6 @@
 // Code generated by go generate; DO NOT EDIT.
 // This file was generated by vendorize.py
-// At 2019-07-29 21:55:46
+// At 2019-07-30 21:50:50
 
 package config