diff --git a/src/add-ons/translators/ico/ConfigView.cpp b/src/add-ons/translators/ico/ConfigView.cpp
index 9ef151cc11..ae95d3c5a5 100644
--- a/src/add-ons/translators/ico/ConfigView.cpp
+++ b/src/add-ons/translators/ico/ConfigView.cpp
@@ -44,7 +44,7 @@ ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
 	height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
 
 	rect.OffsetBy(0, height + 5);
-	stringView = new BStringView(rect, "copyright", B_UTF8_COPYRIGHT "2005 Haiku Inc.");
+	stringView = new BStringView(rect, "copyright", B_UTF8_COPYRIGHT "2005-2006 Haiku Inc.");
 	stringView->ResizeToPreferred();
 	AddChild(stringView);
 	
diff --git a/src/add-ons/translators/ico/ICOTranslator.cpp b/src/add-ons/translators/ico/ICOTranslator.cpp
index 6713387c75..209cd4477e 100644
--- a/src/add-ons/translators/ico/ICOTranslator.cpp
+++ b/src/add-ons/translators/ico/ICOTranslator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2005-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 
@@ -16,7 +16,7 @@
 const char *kDocumentCount = "/documentCount";
 const char *kDocumentIndex = "/documentIndex";
 
-#define kICOMimeType "image/x-icon"
+#define kICOMimeType "image/vnd.microsoft.icon"
 	// I'm lazy - structure initializers don't like const variables...
 
 
diff --git a/src/add-ons/translators/ico/main.cpp b/src/add-ons/translators/ico/main.cpp
index 7d0f2dddb3..09aff6e180 100644
--- a/src/add-ons/translators/ico/main.cpp
+++ b/src/add-ons/translators/ico/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2005-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 
@@ -9,12 +9,7 @@
 
 #include "TranslatorWindow.h"
 #include <Application.h>
-/*
-#include <TranslatorRoster.h>
 
-#include <stdio.h>
-#include <string.h>
-*/
 
 int
 main(int /*argc*/, char **/*argv*/)
diff --git a/src/data/beos_mime/image/x-icon b/src/data/beos_mime/image/vnd.microsoft.icon
similarity index 75%
rename from src/data/beos_mime/image/x-icon
rename to src/data/beos_mime/image/vnd.microsoft.icon
index e718e83614..07e87aea7f 100644
--- a/src/data/beos_mime/image/x-icon
+++ b/src/data/beos_mime/image/vnd.microsoft.icon
@@ -1,7 +1,7 @@
 
 resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
 
-resource(1, "META:TYPE") "image/x-icon";
+resource(1, "META:TYPE") "image/vnd.microsoft.icon";
 
 resource(2, "META:SNIFF_RULE") "0.50 (\"\\000\\000\\001\\000\" | \"\\000\\000\\002\\000\")";
 
@@ -9,5 +9,5 @@ resource(3, "META:S:DESC") #'MSDC' "Windows Icon";
 
 resource(4, "META:EXTENS") message(234) {
 	"extensions" = "ico",
-	"type" = "image/x-icon"
+	"type" = "image/vnd.microsoft.icon"
 };