diff --git a/src/apps/activitymonitor/DataSource.cpp b/src/apps/activitymonitor/DataSource.cpp
index 42565a9def..347aa4d13f 100644
--- a/src/apps/activitymonitor/DataSource.cpp
+++ b/src/apps/activitymonitor/DataSource.cpp
@@ -290,7 +290,7 @@ void
 MemoryDataSource::Print(BString& text, int64 value) const
 {
 	char buffer[32];
-	snprintf(buffer, sizeof(buffer), "%.1f MB", value / 1048576.0);
+	snprintf(buffer, sizeof(buffer), B_TRANSLATE("%.1f MB"), value / 1048576.0);
 
 	text = buffer;
 }
@@ -299,7 +299,7 @@ MemoryDataSource::Print(BString& text, int64 value) const
 const char*
 MemoryDataSource::Unit() const
 {
-	return "MB";
+	return B_TRANSLATE("MB");
 }
 
 
@@ -872,12 +872,12 @@ void
 CPUUsageDataSource::_SetCPU(int32 cpu)
 {
 	fCPU = cpu;
-	fLabel = "CPU";
+	fLabel = B_TRANSLATE("CPU");
 	if (SystemInfo().CPUCount() > 1)
 		fLabel << " " << cpu + 1;
-
 	fShortLabel = fLabel;
-	fLabel << " usage";
+	
+	fLabel << " " << B_TRANSLATE("usage");
 
 	const rgb_color kColors[B_MAX_CPU_COUNT] = {
 		// TODO: find some better defaults...
@@ -1045,7 +1045,8 @@ void
 PageFaultsDataSource::Print(BString& text, int64 value) const
 {
 	char buffer[32];
-	snprintf(buffer, sizeof(buffer), "%.1f faults/s", value / 1024.0);
+	snprintf(buffer, sizeof(buffer), B_TRANSLATE("%.1f faults/s"),
+		value / 1024.0);
 
 	text = buffer;
 }
@@ -1146,7 +1147,7 @@ void
 NetworkUsageDataSource::Print(BString& text, int64 value) const
 {
 	char buffer[32];
-	snprintf(buffer, sizeof(buffer), "%.1f KB/s", value / 1024.0);
+	snprintf(buffer, sizeof(buffer), B_TRANSLATE("%.1f KB/s"), value / 1024.0);
 
 	text = buffer;
 }
@@ -1177,7 +1178,8 @@ NetworkUsageDataSource::Label() const
 const char*
 NetworkUsageDataSource::ShortLabel() const
 {
-	return fIn ? B_TRANSLATE("RX") : B_TRANSLATE("TX");
+	return fIn ? B_TRANSLATE_COMMENT("RX", "Shorter version for Receiving.") : 
+		B_TRANSLATE_COMMENT("TX", "Shorter version for Sending");
 }
 
 
diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp
index f58b7d62cf..6a622a8abd 100644
--- a/src/apps/expander/ExpanderWindow.cpp
+++ b/src/apps/expander/ExpanderWindow.cpp
@@ -585,8 +585,8 @@ ExpanderWindow::StartExpanding()
 
 	BEntry entry(&fSourceRef);
 	BPath path(&entry);
-	BString text(B_TRANSLATE("Expanding file "));
-	text.Append(path.Leaf());
+	BString text(B_TRANSLATE("Expanding '%s'"));
+	text.ReplaceFirst("%s", path.Leaf());
 	fStatusView->SetText(text.String());
 
 	fExpandingThread = new ExpanderThread(&message, new BMessenger(this));
diff --git a/src/apps/icon-o-matic/Jamfile b/src/apps/icon-o-matic/Jamfile
index a05878ec82..79883f1207 100644
--- a/src/apps/icon-o-matic/Jamfile
+++ b/src/apps/icon-o-matic/Jamfile
@@ -356,4 +356,5 @@ DoCatalogs Icon-O-Matic :
 	SetGradientCommand.cpp
 	ResetTransformationCommand.cpp
 	TransformBoxStates.cpp
+	TransformerFactory.cpp
 ;
diff --git a/src/apps/icon-o-matic/gui/PathListView.cpp b/src/apps/icon-o-matic/gui/PathListView.cpp
index abd83e9081..60ed29105a 100644
--- a/src/apps/icon-o-matic/gui/PathListView.cpp
+++ b/src/apps/icon-o-matic/gui/PathListView.cpp
@@ -749,9 +749,9 @@ PathListView::SetMenu(BMenu* menu)
 		new BMessage(MSG_REVERSE));
 	fCleanUpMI = new BMenuItem(B_TRANSLATE("Clean up"),
 		new BMessage(MSG_CLEAN_UP));
-	fRotateIndicesRightMI = new BMenuItem(B_TRANSLATE("Rotate indices right"),
+	fRotateIndicesRightMI = new BMenuItem(B_TRANSLATE("Rotate indices forwards"),
 		new BMessage(MSG_ROTATE_INDICES_CCW), 'R');
-	fRotateIndicesLeftMI = new BMenuItem(B_TRANSLATE("Rotate indices left"),
+	fRotateIndicesLeftMI = new BMenuItem(B_TRANSLATE("Rotate indices backwards"),
 		new BMessage(MSG_ROTATE_INDICES_CW), 'R', B_SHIFT_KEY);
 	fRemoveMI = new BMenuItem(B_TRANSLATE("Remove"),
 		new BMessage(MSG_REMOVE));
@@ -769,8 +769,8 @@ PathListView::SetMenu(BMenu* menu)
 
 	fMenu->AddSeparatorItem();
 
-	fMenu->AddItem(fRotateIndicesLeftMI);
 	fMenu->AddItem(fRotateIndicesRightMI);
+	fMenu->AddItem(fRotateIndicesLeftMI);
 
 	fMenu->AddSeparatorItem();
 
diff --git a/src/apps/text_search/GrepWindow.cpp b/src/apps/text_search/GrepWindow.cpp
index 2ab6d98937..32ea2c78fa 100644
--- a/src/apps/text_search/GrepWindow.cpp
+++ b/src/apps/text_search/GrepWindow.cpp
@@ -797,6 +797,11 @@ GrepWindow::_OnStartCancel()
 
 		fButton->MakeFocus(true);
 		fButton->SetLabel(B_TRANSLATE("Cancel"));
+		fButton->ResizeToPreferred();
+		fButton->MoveTo(
+			fMenuBar->Frame().Width() - fButton->Frame().Width() - 8,
+			8 + fSearchText->Frame().Height() + 8);
+		
 		fSearch->SetEnabled(false);
 
 		// We need to remember the search pattern, because during
@@ -847,6 +852,11 @@ GrepWindow::_OnSearchFinished()
 	fEncodingMenu->SetEnabled(true);
 
 	fButton->SetLabel(B_TRANSLATE("Search"));
+	fButton->ResizeToPreferred();
+	fButton->MoveTo(
+		fMenuBar->Frame().Width() - fButton->Frame().Width() - 8,
+		8 + fSearchText->Frame().Height() + 8);
+		
 	fButton->SetEnabled(true);
 	fSearch->SetEnabled(true);
 
diff --git a/src/preferences/filetypes/Jamfile b/src/preferences/filetypes/Jamfile
index 84be9f9882..ee9b562ee6 100644
--- a/src/preferences/filetypes/Jamfile
+++ b/src/preferences/filetypes/Jamfile
@@ -33,6 +33,7 @@ DoCatalogs FileTypes :
 	x-vnd.Haiku-FileTypes
 	:
 	ApplicationTypeWindow.cpp
+	ApplicationTypesWindow.cpp
 	AttributeWindow.cpp
 	ExtensionWindow.cpp
 	FileTypes.cpp