diff --git a/pkg/com.github.tsmetana.mpk3-settings.desktop b/pkg/io.github.tsmetana.mpk3-settings.desktop
similarity index 79%
rename from pkg/com.github.tsmetana.mpk3-settings.desktop
rename to pkg/io.github.tsmetana.mpk3-settings.desktop
index 35996bc..8017986 100644
--- a/pkg/com.github.tsmetana.mpk3-settings.desktop
+++ b/pkg/io.github.tsmetana.mpk3-settings.desktop
@@ -4,6 +4,6 @@ Version=1.0
 Name=MPK3 Settings
 Comment=AKAI MPK Mini MK3 settings
 Exec=mpk3-settings
-Icon=com.github.tsmetana.mpk3-settings
+Icon=io.github.tsmetana.mpk3-settings
 Terminal=false
 Categories=Settings;
diff --git a/pkg/com.github.tsmetana.mpk3-settings.metainfo.xml b/pkg/io.github.tsmetana.mpk3-settings.metainfo.xml
similarity index 87%
rename from pkg/com.github.tsmetana.mpk3-settings.metainfo.xml
rename to pkg/io.github.tsmetana.mpk3-settings.metainfo.xml
index 43905c1..3f35572 100644
--- a/pkg/com.github.tsmetana.mpk3-settings.metainfo.xml
+++ b/pkg/io.github.tsmetana.mpk3-settings.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-    <id>com.github.tsmetana.mpk3-settings</id>
-    <launchable type="desktop-id">com.github.tsmetana.mpk3-settings</launchable>
+    <id>io.github.tsmetana.mpk3-settings</id>
+    <launchable type="desktop-id">io.github.tsmetana.mpk3-settings.desktop</launchable>
     <name>MPK3 Settings</name>
     <summary>AKAI MPK Mini MK3 settings</summary>
     <description>
@@ -24,7 +24,7 @@
     <url type="bugtracker">https://github.com/tsmetana/mpk3-settings/issues</url>
     <screenshots>
         <screenshot type="default">
-            <image>https://github.com/tsmetana/mpk3-settings/raw/main/pkg/gui_screen_1.png</image>
+            <image>https://github.com/tsmetana/mpk3-settings/raw/master/pkg/gui_screen_1.png</image>
         </screenshot>
     </screenshots>
     <releases>
diff --git a/pkg/com.github.tsmetana.mpk3-settings.svg b/pkg/io.github.tsmetana.mpk3-settings.svg
similarity index 53%
rename from pkg/com.github.tsmetana.mpk3-settings.svg
rename to pkg/io.github.tsmetana.mpk3-settings.svg
index b141602..296a386 100644
--- a/pkg/com.github.tsmetana.mpk3-settings.svg
+++ b/pkg/io.github.tsmetana.mpk3-settings.svg
@@ -8,8 +8,8 @@
    version="1.1"
    id="svg1"
    inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
-   sodipodi:docname="logo.svg"
-   inkscape:export-filename="com.github.tsmetana.mpk3-settings.svg"
+   sodipodi:docname="io.github.tsmetana.mpk3-settings.svg"
+   inkscape:export-filename="io.github.tsmetana.mpk3-settings.svg"
    inkscape:export-xdpi="125.04616"
    inkscape:export-ydpi="125.04616"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -27,9 +27,9 @@
      inkscape:deskcolor="#505050"
      inkscape:document-units="mm"
      showgrid="false"
-     inkscape:zoom="1.4689925"
-     inkscape:cx="240.64112"
-     inkscape:cy="321.64902"
+     inkscape:zoom="2.7371462"
+     inkscape:cx="51.330835"
+     inkscape:cy="103.20969"
      inkscape:window-width="1440"
      inkscape:window-height="831"
      inkscape:window-x="0"
@@ -99,22 +99,25 @@
        rx="1" />
     <path
        style="-inkscape-font-specification:'Ginza Display';fill:#f9f9f9;stroke-width:0.543254"
-       d="m 56.493719,60.766109 h -1.03923 l -8.689118,8.689118 -8.717985,-8.689118 h -1.010362 q -0.158772,0 -0.274242,0.101036 -0.101036,0.101037 -0.101036,0.245374 v 15.530715 h -0.866025 q -0.23094,0 -0.404145,-0.173205 -0.173205,-0.173205 -0.173205,-0.404145 V 61.112519 q 0,-0.736121 0.534049,-1.255736 0.534049,-0.534049 1.284604,-0.534049 h 1.03923 q 0.476313,0 1.096965,0.57735 l 7.592152,7.50555 7.592153,-7.50555 q 0.620651,-0.57735 1.096965,-0.57735 h 1.03923 q 0.750555,0 1.284604,0.534049 0.534048,0.519615 0.534048,1.255736 v 14.953365 q 0,0.23094 -0.173205,0.404145 -0.173205,0.173205 -0.404145,0.173205 H 56.868996 V 61.112519 q 0,-0.144337 -0.11547,-0.245374 -0.101036,-0.101036 -0.259807,-0.101036 z M 54.703934,76.065884 V 64.605487 l -6.293115,6.23538 q -0.620651,0.57735 -1.096965,0.57735 h -1.096965 q -0.476314,0 -1.096965,-0.57735 l -6.293115,-6.23538 v 11.460397 q 0,0.23094 -0.173205,0.404145 -0.173205,0.173205 -0.404145,0.173205 H 37.383434 V 61.141387 l 8.862322,8.833455 h 1.068098 l 8.833455,-8.833455 v 15.501847 h -0.866025 q -0.23094,0 -0.404145,-0.173205 -0.173205,-0.173205 -0.173205,-0.404145 z"
+       d="m 56.493719,60.766109 h -1.03923 L 46.765371,74.496216 38.047386,60.766109 h -1.010362 c -0.105848,0 -0.197262,0.03368 -0.274242,0.101036 -0.06736,0.06736 -0.101036,0.149149 -0.101036,0.245374 v 15.530715 h -0.866025 c -0.15396,0 -0.288675,-0.05774 -0.404145,-0.173205 -0.11547,-0.11547 -0.173205,-0.250185 -0.173205,-0.404145 V 61.112519 c 0,-0.490747 0.178016,-0.909326 0.534049,-1.255736 0.356033,-0.356033 0.784234,-0.534049 1.284604,-0.534049 h 1.03923 c 0.317542,0 0.683197,0.19245 1.096965,0.57735 l 7.592152,12.546539 7.592153,-12.546539 c 0.413767,-0.3849 0.779422,-0.57735 1.096965,-0.57735 h 1.03923 c 0.50037,0 0.928571,0.178016 1.284604,0.534049 0.356032,0.34641 0.534048,0.764989 0.534048,1.255736 v 14.953365 c 0,0.15396 -0.05774,0.288675 -0.173205,0.404145 -0.11547,0.11547 -0.250185,0.173205 -0.404145,0.173205 H 56.868996 V 61.112519 c 0,-0.09622 -0.03849,-0.178016 -0.11547,-0.245374 -0.06736,-0.06736 -0.15396,-0.101036 -0.259807,-0.101036 z M 54.703934,76.065884 V 64.605487 l -6.293115,11.276369 c -0.413767,0.3849 -0.779422,0.57735 -1.096965,0.57735 h -1.096965 c -0.317543,0 -0.683198,-0.19245 -1.096965,-0.57735 L 38.826809,64.605487 v 11.460397 c 0,0.15396 -0.05773,0.288675 -0.173205,0.404145 -0.11547,0.11547 -0.250185,0.173205 -0.404145,0.173205 H 37.383434 V 61.141387 l 8.862322,13.874444 h 1.068098 l 8.833455,-13.874444 v 15.501847 h -0.866025 c -0.15396,0 -0.288675,-0.05774 -0.404145,-0.173205 -0.11547,-0.11547 -0.173205,-0.250185 -0.173205,-0.404145 z"
        id="text2"
        transform="scale(0.86602528,1.1547007)"
-       aria-label="M" />
+       aria-label="M"
+       sodipodi:nodetypes="scccscscsssscsscccsscsssscscssccssccsssccccccsss" />
     <path
        style="-inkscape-font-specification:'Ginza Display';fill:#f9f9f9;stroke-width:0.580764"
-       d="m 64.421661,65.702361 h 16.973386 v 8.517553 H 64.421661 Z m 1.543035,10.801245 v 4.814269 q 0,0.246886 -0.185164,0.43205 -0.185164,0.185164 -0.43205,0.185164 h -0.925821 v -6.974518 h 16.047565 q 0.709796,0 1.188137,-0.462911 0.509201,-0.493771 0.509201,-1.141846 V 66.56646 q 0,-0.663505 -0.509201,-1.126415 -0.478341,-0.478341 -1.188137,-0.478341 H 63.650144 v 16.973385 h -0.925821 q -0.246886,0 -0.43205,-0.185164 -0.185164,-0.185164 -0.185164,-0.43205 V 64.035883 q 0,-0.246886 0.185164,-0.43205 0.185164,-0.185164 0.43205,-0.185164 h 17.744903 q 1.32701,0 2.283691,0.925821 0.956682,0.925821 0.956682,2.22197 v 6.789354 q 0,1.29615 -0.956682,2.221971 -0.956681,0.925821 -2.283691,0.925821 z m 0,-3.826727 H 79.852012 V 67.245396 H 65.964696 Z"
+       d="m 64.421661,65.702361 h 16.973386 v 6.557901 H 64.421661 Z m 1.543035,8.841593 v 6.773921 c 0,0.164591 -0.06172,0.308607 -0.185164,0.43205 -0.123443,0.123443 -0.267459,0.185164 -0.43205,0.185164 h -0.925821 v -8.93417 h 16.047565 c 0.473197,0 0.869243,-0.154304 1.188137,-0.462911 0.339467,-0.329181 0.509201,-0.709796 0.509201,-1.141846 V 66.56646 c 0,-0.442337 -0.169734,-0.817808 -0.509201,-1.126415 -0.318894,-0.318894 -0.71494,-0.478341 -1.188137,-0.478341 H 63.650144 v 16.973385 h -0.925821 c -0.164591,0 -0.308607,-0.06172 -0.43205,-0.185164 -0.123443,-0.123443 -0.185164,-0.267459 -0.185164,-0.43205 V 64.035883 c 0,-0.164591 0.06172,-0.308607 0.185164,-0.43205 0.123443,-0.123443 0.267459,-0.185164 0.43205,-0.185164 h 17.744903 c 0.884673,0 1.645904,0.308607 2.283691,0.925821 0.637788,0.617214 0.956682,1.357871 0.956682,2.22197 v 4.829702 c 0,0.8641 -0.318894,1.604757 -0.956682,2.221971 -0.637787,0.617214 -1.399018,0.925821 -2.283691,0.925821 z m 0,-3.826727 H 79.852012 V 67.245396 H 65.964696 Z"
        id="text2-6"
        transform="scale(0.92581997,1.0801236)"
-       aria-label="P" />
+       aria-label="P"
+       sodipodi:nodetypes="ccccccsssccscsscsccsssssssssssscccccc" />
     <path
        style="-inkscape-font-specification:'Ginza Display';fill:#f9f9f9;stroke-width:0.592461"
-       d="m 32.922936,90.196764 h 0.944469 v 18.889376 h -0.944469 q -0.251858,0 -0.440752,-0.18889 -0.188894,-0.18889 -0.188894,-0.44075 V 90.82641 q 0,-0.251859 0.188894,-0.440753 0.188894,-0.188893 0.440752,-0.188893 z m 2.675996,18.889376 h -0.944469 v -9.255793 h 6.989071 l 9.255796,9.255793 h -1.542633 q -0.629646,0 -1.259292,-0.62964 L 40.6361,100.99519 h -4.407522 v 7.46131 q 0,0.25186 -0.188894,0.44075 -0.188894,0.18889 -0.440752,0.18889 z M 48.915945,90.196764 h 1.51115 l -8.815044,8.846526 h -6.957588 v -8.846526 h 0.944469 q 0.251858,0 0.440752,0.188893 0.188894,0.188894 0.188894,0.440753 v 7.052035 h 4.37604 l 7.052035,-7.052035 q 0.629646,-0.629646 1.259292,-0.629646 z m -6.737212,9.224313 9.192831,-9.224313 h 0.912987 q 0.472234,0 0.645387,0.204635 0.188894,0.204635 0.01574,0.425011 l -8.594668,8.594667 9.03542,9.035423 q 0.173153,0.22037 -0.01574,0.42501 -0.173152,0.20463 -0.645387,0.20463 h -0.881504 z"
+       d="m 32.922936,90.196764 h 0.944469 v 18.889376 h -0.944469 c -0.167905,0 -0.314823,-0.063 -0.440752,-0.18889 -0.125929,-0.12593 -0.188894,-0.27284 -0.188894,-0.44075 V 90.82641 c 0,-0.167906 0.06296,-0.314824 0.188894,-0.440753 0.125929,-0.125929 0.272847,-0.188893 0.440752,-0.188893 z m 2.675996,18.889376 h -0.944469 v -9.255793 h 5.308232 l 10.936635,9.255793 h -1.542633 c -0.419764,0 -0.839528,-0.20988 -1.259292,-0.62964 l -9.142144,-7.46131 h -2.726683 v 7.46131 c 0,0.16791 -0.06296,0.31482 -0.188894,0.44075 -0.125929,0.12593 -0.272847,0.18889 -0.440752,0.18889 z M 48.915945,90.196764 h 1.51115 L 39.931212,99.04329 h -5.276749 v -8.846526 h 0.944469 c 0.167905,0 0.314823,0.06296 0.440752,0.188893 0.125929,0.125929 0.188894,0.272847 0.188894,0.440753 v 7.052035 h 2.695201 l 8.732874,-7.052035 c 0.467485,-0.377507 0.839528,-0.629646 1.259292,-0.629646 z m -8.418051,9.224313 10.87367,-9.224313 h 0.912987 c 0.314823,0 0.529952,0.06821 0.645387,0.204635 0.125929,0.136423 0.131176,0.278094 0.01574,0.425011 L 42.670171,99.421077 53.38643,108.4565 c 0.115435,0.14691 0.110189,0.28858 -0.01574,0.42501 -0.115435,0.13642 -0.330564,0.20463 -0.645387,0.20463 h -0.881504 z"
        id="text3"
        transform="scale(0.94446865,1.0587964)"
-       aria-label="K" />
+       aria-label="K"
+       sodipodi:nodetypes="sccsssssssccccscccssssccccsssccssccscccccscc" />
     <path
        style="-inkscape-font-specification:'Ginza Display';fill:#f9f9f9;stroke-width:0.627297"
        d="m 75.833371,112.9667 v -5.00001 q 0,-0.66667 -1.000002,-1.5 -0.966669,-0.83334 -2.233338,-0.96667 1.266669,-0.13334 2.233338,-0.96667 1.000002,-0.86667 1.000002,-1.53334 v -4.966674 q 0,-0.350001 -0.266668,-0.600001 -0.266667,-0.266667 -0.633334,-0.266667 H 57.5 v -1.000002 q 0,-0.266667 0.200001,-0.466668 0.2,-0.2 0.466667,-0.2 H 75.43337 q 0.850001,0 1.450003,0.616668 0.616668,0.616668 0.616668,1.483336 v 5.666678 q 0,0.86667 -0.616668,1.48334 -0.600002,0.61666 -1.450003,0.61666 v 0.13334 q 0.850001,0 1.450003,0.61667 0.616668,0.61666 0.616668,1.48333 v 5.80001 q 0,0.86667 -0.616668,1.48334 -0.600002,0.61667 -1.450003,0.61667 H 58.166668 q -0.266667,0 -0.466667,-0.2 Q 57.5,115.10004 57.5,114.83337 v -1 h 17.433369 q 0.383334,0 0.633334,-0.25 0.266668,-0.25 0.266668,-0.61667 z m -2.466672,-5.43334 H 59.500004 q -0.266667,0 -0.466667,-0.20001 -0.200001,-0.2 -0.200001,-0.46666 v -0.96667 h 13.833361 q 0.766669,0 1.550004,0.75 0.783335,0.73334 0.783335,1.31667 v 5.06668 H 57.5 v -1.03334 q 0,-0.26667 0.200001,-0.46667 0.2,-0.2 0.466667,-0.2 h 15.200031 z m 0,-7.866687 H 58.166668 q -0.266667,0 -0.466667,-0.200001 Q 57.5,99.266672 57.5,99.000005 v -1.033336 h 17.500036 v 5.033341 q 0,0.61667 -0.783335,1.35001 -0.766669,0.71666 -1.550004,0.71666 H 58.833336 v -1.03333 q 0,-0.26667 0.200001,-0.46667 0.2,-0.2 0.466667,-0.2 h 13.866695 z"
diff --git a/src/app_win.c b/src/app_win.c
index a8fd73a..6d67d52 100644
--- a/src/app_win.c
+++ b/src/app_win.c
@@ -60,7 +60,7 @@ typedef enum _file_dialog_e file_dialog_t;
 
 static gchar *file_choose_dialog(GtkWidget *app_win, file_dialog_t dlg_type)
 {
-	GtkWidget *dialog;
+	GtkFileChooserNative *dialog;
 	GtkFileChooserAction action;
 	const gchar *title;
 	const gchar *btn_label;
@@ -77,8 +77,8 @@ static gchar *file_choose_dialog(GtkWidget *app_win, file_dialog_t dlg_type)
 		title = "Save File";
 		btn_label = "Save";
 	}
-	dialog = gtk_file_chooser_dialog_new(title, GTK_WINDOW(app_win), action,
-			"Cancel", GTK_RESPONSE_CANCEL, btn_label, GTK_RESPONSE_ACCEPT, NULL);
+	dialog = gtk_file_chooser_native_new(title, GTK_WINDOW(app_win), action,
+			btn_label, "Cancel");
 	if (dlg_type == FILE_SAVE_DIALOG)
 		gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE);
 	else
@@ -91,9 +91,9 @@ static gchar *file_choose_dialog(GtkWidget *app_win, file_dialog_t dlg_type)
 	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter_mpk);
 	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter_all);
 
-	if ((gtk_dialog_run(GTK_DIALOG (dialog))) == GTK_RESPONSE_ACCEPT)
+	if ((gtk_native_dialog_run(GTK_NATIVE_DIALOG(dialog))) == GTK_RESPONSE_ACCEPT)
 		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-	gtk_widget_destroy(dialog);
+	g_object_unref(dialog);
 
 	return filename;
 }
diff --git a/src/main.c b/src/main.c
index 5ec46e9..f35318e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,7 +46,7 @@ int main(int argc, char ** argv)
 		show_error();
 		return -1;
 	}
-	app = gtk_application_new("com.github.tsmetana.mpk3-settings", G_APPLICATION_DEFAULT_FLAGS);
+	app = gtk_application_new("io.github.tsmetana.mpk3-settings", G_APPLICATION_DEFAULT_FLAGS);
 	g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
 	status = g_application_run(G_APPLICATION(app), argc, argv);
 	g_object_unref(app);