diff --git a/tools/models/16x16/project.conf b/tools/models/16x16/project.conf
index 2219800..818c731 100644
--- a/tools/models/16x16/project.conf
+++ b/tools/models/16x16/project.conf
@@ -1,8 +1,11 @@
-dist=Makefile,simulator-jolla-jolla.png,simulator-nokia-n9.png,simulator-nokia-n900.png,simulator-openmoko-freerunner.png
+dist=Makefile,simulator-jolla-jolla.png,simulator-nokia-n800.png,simulator-nokia-n9.png,simulator-nokia-n900.png,simulator-openmoko-freerunner.png
 
 [simulator-jolla-jolla.png]
 install=$(PREFIX)/share/icons/hicolor/16x16/apps
 
+[simulator-nokia-n800.png]
+install=$(PREFIX)/share/icons/hicolor/16x16/apps
+
 [simulator-nokia-n9.png]
 install=$(PREFIX)/share/icons/hicolor/16x16/apps
 
diff --git a/tools/models/16x16/simulator-nokia-n800.png b/tools/models/16x16/simulator-nokia-n800.png
new file mode 100644
index 0000000..de971bb
Binary files /dev/null and b/tools/models/16x16/simulator-nokia-n800.png differ
diff --git a/tools/models/24x24/project.conf b/tools/models/24x24/project.conf
index d5c01ae..177af22 100644
--- a/tools/models/24x24/project.conf
+++ b/tools/models/24x24/project.conf
@@ -1,8 +1,11 @@
-dist=Makefile,simulator-jolla-jolla.png,simulator-nokia-n9.png,simulator-nokia-n900.png,simulator-openmoko-freerunner.png
+dist=Makefile,simulator-jolla-jolla.png,simulator-nokia-n800.png,simulator-nokia-n9.png,simulator-nokia-n900.png,simulator-openmoko-freerunner.png
 
 [simulator-jolla-jolla.png]
 install=$(PREFIX)/share/icons/hicolor/24x24/apps
 
+[simulator-nokia-n800.png]
+install=$(PREFIX)/share/icons/hicolor/24x24/apps
+
 [simulator-nokia-n9.png]
 install=$(PREFIX)/share/icons/hicolor/24x24/apps
 
diff --git a/tools/models/24x24/simulator-nokia-n800.png b/tools/models/24x24/simulator-nokia-n800.png
new file mode 100644
index 0000000..d085686
Binary files /dev/null and b/tools/models/24x24/simulator-nokia-n800.png differ
diff --git a/tools/models/32x32/project.conf b/tools/models/32x32/project.conf
index 08aaf96..fadaf94 100644
--- a/tools/models/32x32/project.conf
+++ b/tools/models/32x32/project.conf
@@ -1,8 +1,11 @@
-dist=Makefile,simulator-jolla-jolla.png,simulator-nokia-n9.png,simulator-nokia-n900.png,simulator-openmoko-freerunner.png
+dist=Makefile,simulator-jolla-jolla.png,simulator-nokia-n800.png,simulator-nokia-n9.png,simulator-nokia-n900.png,simulator-openmoko-freerunner.png
 
 [simulator-jolla-jolla.png]
 install=$(PREFIX)/share/icons/hicolor/32x32/apps
 
+[simulator-nokia-n800.png]
+install=$(PREFIX)/share/icons/hicolor/32x32/apps
+
 [simulator-nokia-n9.png]
 install=$(PREFIX)/share/icons/hicolor/32x32/apps
 
diff --git a/tools/models/32x32/simulator-nokia-n800.png b/tools/models/32x32/simulator-nokia-n800.png
new file mode 100644
index 0000000..511cf13
Binary files /dev/null and b/tools/models/32x32/simulator-nokia-n800.png differ
diff --git a/tools/models/48x48/project.conf b/tools/models/48x48/project.conf
index 6d84f6f..93b0d09 100644
--- a/tools/models/48x48/project.conf
+++ b/tools/models/48x48/project.conf
@@ -1,8 +1,11 @@
-dist=Makefile,simulator-jolla-jolla.png,simulator-nokia-n9.png,simulator-nokia-n900.png,simulator-openmoko-freerunner.png
+dist=Makefile,simulator-jolla-jolla.png,simulator-nokia-n800.png,simulator-nokia-n9.png,simulator-nokia-n900.png,simulator-openmoko-freerunner.png
 
 [simulator-jolla-jolla.png]
 install=$(PREFIX)/share/icons/hicolor/48x48/apps
 
+[simulator-nokia-n800.png]
+install=$(PREFIX)/share/icons/hicolor/48x48/apps
+
 [simulator-nokia-n9.png]
 install=$(PREFIX)/share/icons/hicolor/48x48/apps
 
diff --git a/tools/models/48x48/simulator-nokia-n800.png b/tools/models/48x48/simulator-nokia-n800.png
new file mode 100644
index 0000000..415ddca
Binary files /dev/null and b/tools/models/48x48/simulator-nokia-n800.png differ
diff --git a/tools/models/nokia-n800.conf b/tools/models/nokia-n800.conf
index 209f636..27bb8d2 100644
--- a/tools/models/nokia-n800.conf
+++ b/tools/models/nokia-n800.conf
@@ -1,4 +1,5 @@
 title=Nokia N800
+icon=simulator-nokia-n800
 dpi=225
 width=800
 height=480