diff --git a/src/preferences/filetypes/AttributeWindow.cpp b/src/preferences/filetypes/AttributeWindow.cpp
index 17f136c5b4..e6d37266b8 100644
--- a/src/preferences/filetypes/AttributeWindow.cpp
+++ b/src/preferences/filetypes/AttributeWindow.cpp
@@ -48,15 +48,15 @@ compare_attributes(const void* _a, const void* _b)
 
 
 AttributeWindow::AttributeWindow(FileTypesWindow* target, BMimeType& mimeType,
-		AttributeItem* item)
+		AttributeItem* attributeItem)
 	: BWindow(BRect(100, 100, 350, 200), "Attribute", B_MODAL_WINDOW_LOOK,
 		B_MODAL_SUBSET_WINDOW_FEEL, B_NOT_ZOOMABLE | B_NOT_V_RESIZABLE
 			| B_ASYNCHRONOUS_CONTROLS),
 	fTarget(target),
 	fMimeType(mimeType.Type())
 {
-	if (item != NULL)
-		fAttribute = *item;
+	if (attributeItem != NULL)
+		fAttribute = *attributeItem;
 
 	BRect rect = Bounds();
 	BView* topView = new BView(rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW);
diff --git a/src/preferences/filetypes/MimeTypeListView.cpp b/src/preferences/filetypes/MimeTypeListView.cpp
index 283d69c355..87a6b6d420 100644
--- a/src/preferences/filetypes/MimeTypeListView.cpp
+++ b/src/preferences/filetypes/MimeTypeListView.cpp
@@ -480,12 +480,18 @@ MimeTypeListView::MessageReceived(BMessage* message)
 				{
 					// create new item
 					BMimeType created(type);
+					bool isApp = mimetype_is_application_signature(created);
+					if (fApplicationMode ^ isApp)
+						break;
+
 					BMimeType superType;
 					MimeTypeItem* superItem = NULL;
 					if (created.GetSupertype(&superType) == B_OK)
 						superItem = FindItem(superType.Type());
 
-					MimeTypeItem* item = new MimeTypeItem(created);
+					MimeTypeItem* item = new MimeTypeItem(created, fShowIcons,
+						fSupertype.Type() != NULL);
+					item->SetApplicationMode(isApp);
 
 					if (superItem != NULL) {
 						AddUnder(item, superItem);