diff --git a/ReadMe.txt b/ReadMe.txt
index 3b8f185..d979dbf 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -158,6 +158,8 @@ The Eric's Real scripts ("real*.kml" and "real*.bmp/png") are embedded in this a
 
 TODO
 
+- Add the name of the file in the toast "State saved".
+- Add the KML icon in the navigation menu header.
 - Add the possibility to load and save the flash in another file.
 - Add the possibility to deactivate the zoom.
 - Sometimes, the calculator seems to lag and finally freeze.
diff --git a/app/src/main/assets/calculators/38g.ico b/app/src/main/assets/calculators/38g.ico
new file mode 100644
index 0000000..4e9dffd
Binary files /dev/null and b/app/src/main/assets/calculators/38g.ico differ
diff --git a/app/src/main/assets/calculators/39g.ico b/app/src/main/assets/calculators/39g.ico
new file mode 100644
index 0000000..446cb87
Binary files /dev/null and b/app/src/main/assets/calculators/39g.ico differ
diff --git a/app/src/main/assets/calculators/39gp.ico b/app/src/main/assets/calculators/39gp.ico
new file mode 100644
index 0000000..70b8fd9
Binary files /dev/null and b/app/src/main/assets/calculators/39gp.ico differ
diff --git a/app/src/main/assets/calculators/39gs.ico b/app/src/main/assets/calculators/39gs.ico
new file mode 100644
index 0000000..77b4c90
Binary files /dev/null and b/app/src/main/assets/calculators/39gs.ico differ
diff --git a/app/src/main/assets/calculators/40gs.ico b/app/src/main/assets/calculators/40gs.ico
new file mode 100644
index 0000000..c7dfc65
Binary files /dev/null and b/app/src/main/assets/calculators/40gs.ico differ
diff --git a/app/src/main/assets/calculators/48gii.ico b/app/src/main/assets/calculators/48gii.ico
new file mode 100644
index 0000000..359ac12
Binary files /dev/null and b/app/src/main/assets/calculators/48gii.ico differ
diff --git a/app/src/main/assets/calculators/48gx.ico b/app/src/main/assets/calculators/48gx.ico
new file mode 100644
index 0000000..1776dab
Binary files /dev/null and b/app/src/main/assets/calculators/48gx.ico differ
diff --git a/app/src/main/assets/calculators/48sx.ico b/app/src/main/assets/calculators/48sx.ico
new file mode 100644
index 0000000..3cf173f
Binary files /dev/null and b/app/src/main/assets/calculators/48sx.ico differ
diff --git a/app/src/main/assets/calculators/49g.ico b/app/src/main/assets/calculators/49g.ico
new file mode 100644
index 0000000..4f10015
Binary files /dev/null and b/app/src/main/assets/calculators/49g.ico differ
diff --git a/app/src/main/assets/calculators/49gp.ico b/app/src/main/assets/calculators/49gp.ico
new file mode 100644
index 0000000..89bd25f
Binary files /dev/null and b/app/src/main/assets/calculators/49gp.ico differ
diff --git a/app/src/main/assets/calculators/50g.ico b/app/src/main/assets/calculators/50g.ico
new file mode 100644
index 0000000..6ce4154
Binary files /dev/null and b/app/src/main/assets/calculators/50g.ico differ
diff --git a/app/src/main/cpp/win32-layer.c b/app/src/main/cpp/win32-layer.c
index e7b4447..60fcc46 100644
--- a/app/src/main/cpp/win32-layer.c
+++ b/app/src/main/cpp/win32-layer.c
@@ -870,6 +870,9 @@ LRESULT SendMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) {
         } else if (Msg == LB_GETSEL && wParam < itemDataCount && wParam < MAX_ITEMDATA) {
             return selItemDataIndex[wParam];
         }
+    }
+    if(Msg == WM_SETICON) {
+
     }
     return NULL;
 }