diff --git a/data/icons/meson.build b/data/icons/meson.build
index 5d5027f..9a6f7e7 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,13 +1,13 @@
 # Scalable icon
 install_data(
   '@0@.svg'.format(base_id),
-  install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps',
+  install_dir: datadir / 'icons' / 'hicolor' / 'scalable' / 'apps',
   rename: '@0@.svg'.format(application_id)
 )
 
 # Symbolic icon
 install_data(
   '@0@-symbolic.svg'.format(base_id),
-  install_dir: iconsdir / 'hicolor' / 'symbolic' / 'apps',
+  install_dir: datadir / 'icons' / 'hicolor' / 'symbolic' / 'apps',
   rename: '@0@-symbolic.svg'.format(application_id)
 )
diff --git a/data/io.github.lemmygtk.lemoa.metainfo.xml.in b/data/io.github.lemmygtk.lemoa.metainfo.xml.in
index f87b6fa..7ef1781 100644
--- a/data/io.github.lemmygtk.lemoa.metainfo.xml.in
+++ b/data/io.github.lemmygtk.lemoa.metainfo.xml.in
@@ -44,6 +44,6 @@
   </kudos>
   <developer_name>Bnyro</developer_name>
   <update_contact>bnyro@tutanota.com</update_contact>
-  <launchable type="desktop-id">@app-id@.desktop</launchable>
+  <launchable type="desktop-id">@APP_ID@.desktop</launchable>
   <platform>GTK 4</platform>
 </component>
diff --git a/data/meson.build b/data/meson.build
index ebbd145..be8aecf 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -11,7 +11,7 @@ configure_file(
   output: '@BASENAME@',
   install: true,
   configuration: desktop_conf,
-  install_dir: metainfodir
+  install_dir: datadir / 'applications'
 )
 
 # Metainfo file
@@ -20,7 +20,7 @@ configure_file(
   output: '@BASENAME@',
   install: true,
   configuration: desktop_conf,
-  install_dir: metainfodir
+  install_dir:  datadir / 'metainfo'
 )
 
 configure_file(
diff --git a/meson.build b/meson.build
index cc38790..3313174 100644
--- a/meson.build
+++ b/meson.build
@@ -26,9 +26,6 @@ cargo = find_program('cargo', required: true)
 prefix = get_option('prefix')
 bindir = prefix / get_option('bindir')
 datadir = prefix / get_option('datadir')
-iconsdir = datadir / 'icons'
-applicationsdir = datadir / 'applications'
-metainfodir = datadir / 'metainfo'
 pkgdatadir = datadir / meson.project_name()
 
 # Add a version suffix for devel builds
diff --git a/src/config.rs b/src/config.rs
index 014c0dc..2641486 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,4 +1,4 @@
 pub const NAME: &str = "lemoa";
 pub const APP_ID: &str = "io.github.lemmygtk.lemoa";
-pub const PKGDATADIR: &str = "/app/share/lemoa";
+pub const PKGDATADIR: &str = "/usr/local/share/lemoa";
 pub const VERSION: &str = "0.1.0";