diff --git a/Makefile b/Makefile
index f72798d78..e77f6cf3b 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ export GO111MODULE=on
 export GOBIN ?= $(PWD)/bin
 
 # You can include assets this directory into the bundle. This can be e.g. used to include profile pictures.
-ASSETS_DIR ?= assets
+ASSETS_DIR ?= server/assets
 
 ## Define the default target (make all)
 .PHONY: default
diff --git a/plugin.json b/plugin.json
index 27417948b..ad21522c5 100644
--- a/plugin.json
+++ b/plugin.json
@@ -4,7 +4,7 @@
   "description": "Integrates real-time voice communication in Mattermost",
   "homepage_url": "https://github.com/mattermost/mattermost-plugin-calls/",
   "support_url": "https://github.com/mattermost/mattermost-plugin-calls/issues",
-  "icon_path": "server/assets/plugin_icon.svg",
+  "icon_path": "assets/plugin_icon.svg",
   "min_server_version": "9.5.0",
   "server": {
     "executables": {