diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index df8e529..9614aba 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -24,7 +24,7 @@ jobs:
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: cosmic-utils-enroll.flatpak
-          manifest-path: flatpak/org.cosmic_utils.Enroll.yml
+          manifest-path: flatpak/org.cosmic_utils.enroll.yml
           cache-key: flatpak-builder-${{ github.sha }}
 
       - name: Get version
diff --git a/CHANGES b/CHANGES
index fba90f5..f003108 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,3 +33,6 @@
   - Moved project to COSMIC utils
   - Renamed from Fprint to Enroll
   - Redesigned icon svg
+0.4.1: 
+  - Switched to snake case in ID
+  - Renamed icon.svg to enroll.svg
diff --git a/Cargo.lock b/Cargo.lock
index 7634b86..aa0508b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1018,24 +1018,6 @@ dependencies = [
  "syn 2.0.116",
 ]
 
-[[package]]
-name = "cosmic-utils-enroll"
-version = "0.4.0"
-dependencies = [
- "futures-util",
- "i18n-embed 0.15.4",
- "i18n-embed-fl 0.9.4",
- "libcosmic",
- "nix 0.31.1",
- "open",
- "rust-embed",
- "serde",
- "tokio",
- "tracing",
- "vergen",
- "zbus 5.13.2",
-]
-
 [[package]]
 name = "cosmic-freedesktop-icons"
 version = "0.4.0"
@@ -1112,6 +1094,24 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
+[[package]]
+name = "cosmic-utils-enroll"
+version = "0.3.12"
+dependencies = [
+ "futures-util",
+ "i18n-embed 0.15.4",
+ "i18n-embed-fl 0.9.4",
+ "libcosmic",
+ "nix 0.31.1",
+ "open",
+ "rust-embed",
+ "serde",
+ "tokio",
+ "tracing",
+ "vergen",
+ "zbus 5.13.2",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
diff --git a/Cargo.toml b/Cargo.toml
index 3009acf..69bf179 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cosmic-utils-enroll"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2024"
 license = "MPL-2.0"
 description = "GUI for fprintd fingerprint enrolling"
diff --git a/flatpak/org.cosmic_utils.Enroll.yml b/flatpak/org.cosmic_utils.enroll.yml
similarity index 71%
rename from flatpak/org.cosmic_utils.Enroll.yml
rename to flatpak/org.cosmic_utils.enroll.yml
index 7a19098..59c7335 100644
--- a/flatpak/org.cosmic_utils.Enroll.yml
+++ b/flatpak/org.cosmic_utils.enroll.yml
@@ -33,13 +33,13 @@ modules:
       - install -Dm0755 target/release/cosmic-utils-enroll /app/bin/cosmic-utils-enroll
 
       # Install the desktop file
-      - install -Dm0644 resources/org.cosmic_utils.Enroll.desktop /app/share/applications/org.cosmic_utils.Enroll.desktop
+      - install -Dm0644 resources/org.cosmic_utils.enroll.desktop /app/share/applications/org.cosmic_utils.enroll.desktop
 
       # Install the AppStream metadata
-      - install -Dm0644 resources/org.cosmic_utils.Enroll.metainfo.xml /app/share/appdata/org.cosmic_utils.Enroll.metainfo.xml
+      - install -Dm0644 resources/org.cosmic_utils.enroll.metainfo.xml /app/share/appdata/org.cosmic_utils.enroll.metainfo.xml
 
       # Install the icon
-      - install -Dm0644 resources/icons/hicolor/scalable/apps/icon.svg /app/share/icons/hicolor/scalable/apps/org.cosmic_utils.Enroll.svg
+      - install -Dm0644 resources/icons/hicolor/scalable/apps/enroll.svg /app/share/icons/hicolor/scalable/apps/org.cosmic_utils.enroll.svg
 
     sources:
       - type: dir
diff --git a/justfile b/justfile
index 4be75cc..ee7e26a 100644
--- a/justfile
+++ b/justfile
@@ -20,7 +20,7 @@ appdata-dst := clean(rootdir / prefix) / 'share' / 'appdata' / appdata
 icons-src := 'resources' / 'icons' / 'hicolor'
 icons-dst := clean(rootdir / prefix) / 'share' / 'icons' / 'hicolor'
 
-icon-svg-src := icons-src / 'scalable' / 'apps' / 'icon.svg'
+icon-svg-src := icons-src / 'scalable' / 'apps' / 'enroll.svg'
 icon-svg-dst := icons-dst / 'scalable' / 'apps' / appid + '.svg'
 
 # Default recipe which runs `just build-release`
diff --git a/resources/icons/hicolor/scalable/apps/icon.svg b/resources/icons/hicolor/scalable/apps/enroll.svg
similarity index 100%
rename from resources/icons/hicolor/scalable/apps/icon.svg
rename to resources/icons/hicolor/scalable/apps/enroll.svg
diff --git a/resources/org.cosmic_utils.Enroll.metainfo.xml b/resources/org.cosmic_utils.Enroll.metainfo.xml
deleted file mode 100644
index aed3002..0000000
--- a/resources/org.cosmic_utils.Enroll.metainfo.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>org.cosmic_utils.Enroll</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>MPL-2.0</project_license>
-  <name>Enroll</name>
-  <summary>GUI built with COSMIC toolkit for fprintd fingerprint enrolling</summary>
-  <description>
-    <p>
-      Enroll is an application for enrolling fingerprints using the fprintd daemon. It allows you to register and delete fingerprints for authentication on your Linux system.
-    </p>
-  </description>
-  <icon type="remote" width="64" height="64" scale="1">
-    https://github.com/cosmic-utils/enroll/raw/main/resources/icons/hicolor/scalable/apps/icon.svg
-  </icon>
-  <url type="vcs-browser">https://github.com/cosmic-utils/enroll</url>
-  <launchable type="desktop-id">org.cosmic_utils.Enroll.desktop</launchable>
-  <provides>
-    <id>org.cosmic_utils.Enroll</id>
-    <binaries>
-      <binary>cosmic-utils-enroll</binary>
-    </binaries>
-  </provides>
-  <requires>
-    <display_length compare="ge">360</display_length>
-  </requires>
-  <supports>
-    <control>keyboard</control>
-    <control>pointing</control>
-    <control>touch</control>
-  </supports>
-  <categories>
-    <category>System</category>
-  </categories>
-  <keywords>
-    <keyword>Fingerprint</keyword>
-  </keywords>
-  <content_rating type="oars-1.1" />
-</component>
-
diff --git a/resources/org.cosmic_utils.Enroll.desktop b/resources/org.cosmic_utils.enroll.desktop
similarity index 70%
rename from resources/org.cosmic_utils.Enroll.desktop
rename to resources/org.cosmic_utils.enroll.desktop
index 7b40918..0eef472 100644
--- a/resources/org.cosmic_utils.Enroll.desktop
+++ b/resources/org.cosmic_utils.enroll.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=Enroll
-Comment=GUI for fprintd fingerprint enrolling
+Comment=Manage fingerprints
 Type=Application
 Icon=org.cosmic_utils.Enroll
 Exec=cosmic-utils-enroll %F
 Terminal=false
 StartupNotify=true
-Categories=Utility;System;
+Categories=Utility;COSMIC;
 Keywords=Fingerprint;Security;
 MimeType=
diff --git a/resources/org.cosmic_utils.enroll.metainfo.xml b/resources/org.cosmic_utils.enroll.metainfo.xml
new file mode 100644
index 0000000..862df9f
--- /dev/null
+++ b/resources/org.cosmic_utils.enroll.metainfo.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.cosmic_utils.enroll</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>MPL-2.0</project_license>
+  <name>Enroll</name>
+  <summary>GUI built with COSMIC toolkit for fprintd fingerprint enrolling</summary>
+  <developer id="org.cosmic-utils">
+    <name>Joonas Tuomi</name>
+  </developer>
+  <description>
+    <p>
+      Fingerprint management for multi-user systems using the fprintd daemon. It allows you to register and delete fingerprints for authentication on your Linux system.
+    </p>
+  </description>
+  <icon type="remote" width="64" height="64" scale="1">
+    https://github.com/cosmic-utils/enroll/raw/main/resources/icons/hicolor/scalable/apps/enroll.svg
+  </icon>
+  <launchable type="desktop-id">org.cosmic_utils.enroll.desktop</launchable>
+  <provides>
+    <id>org.cosmic_utils.enroll</id>
+    <binaries>
+      <binary>cosmic-utils-enroll</binary>
+    </binaries>
+  </provides>
+  <requires>
+    <display_length compare="ge">360</display_length>
+  </requires>
+  <supports>
+    <control>keyboard</control>
+    <control>pointing</control>
+    <control>touch</control>
+  </supports>
+  <categories>
+    <category>Utility</category>
+    <category>COSMIC</category>
+  </categories>
+  <keywords>
+    <keyword>Fingerprint</keyword>
+    <keyword>Authentication</keyword>
+  </keywords>
+  <branding>
+    <color type="primary" scheme_preference="light">#7ea5ae</color>
+    <color type="primary" scheme_preference="dark">#381a38</color>
+  </branding>
+  <content_rating type="oars-1.1" />
+  <url type="homepage">https://cosmic-utils.org</url>
+  <url type="vcs-browser">https://github.com/cosmic-utils/enroll</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://user.fm/files/v2-2f0daf05b0e66f25db2778188ab82373/enroll-main.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://user.fm/files/v2-808d13b70d649c6b65df2cce1849db2f/enroll-additional.png</image>
+    </screenshot>
+  </screenshots>
+</component>
+
diff --git a/src/app/mod.rs b/src/app/mod.rs
index 6c6970b..995ec1b 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -32,7 +32,7 @@ use fprint::{
 use error::AppError;
 
 const REPOSITORY: &str = env!("CARGO_PKG_REPOSITORY");
-const APP_ICON: &[u8] = include_bytes!("../../resources/icons/hicolor/scalable/apps/icon.svg");
+const APP_ICON: &[u8] = include_bytes!("../../resources/icons/hicolor/scalable/apps/enroll.svg");
 const FPRINT_ICON: &[u8] = include_bytes!("../../resources/icons/hicolor/scalable/apps/fprint.svg");
 
 const STATUS_TEXT_SIZE: u16 = 16;
@@ -123,7 +123,6 @@ impl cosmic::Application for AppModel {
             context_page: ContextPage::default(),
             nav,
             key_binds: HashMap::new(),
-            // Optional configuration file for an application.
             config: Config::default(),
             status: fl!("status-connecting"),
             device_path: None,