diff --git a/src/apps/icon-o-matic/generic/property/view/PropertyItemView.cpp b/src/apps/icon-o-matic/generic/property/view/PropertyItemView.cpp
index 13ea27b718..5f9277602a 100644
--- a/src/apps/icon-o-matic/generic/property/view/PropertyItemView.cpp
+++ b/src/apps/icon-o-matic/generic/property/view/PropertyItemView.cpp
@@ -59,11 +59,11 @@ PropertyItemView::Draw(BRect updateRect)
 			labelColor = tint_color(labelColor, B_DARKEN_MAX_TINT);
 		else
 			labelColor = tint_color(labelColor, B_DISABLED_LABEL_TINT);
-		
+
 		SetHighColor(labelColor);
 		BFont font;
 		GetFont(&font);
-		
+
 		BString truncated(name_for_id(property->Identifier()));
 		font.TruncateString(&truncated, B_TRUNCATE_MIDDLE, fLabelWidth - 10.0);
 
@@ -114,11 +114,12 @@ PropertyItemView::MouseDown(BPoint where)
 
 		if (BMessage* message = Window()->CurrentMessage()) {
 			int32 clicks;
-			if (message->FindInt32("clicks", &clicks) >= B_OK)
+			if (message->FindInt32("clicks", &clicks) >= B_OK) {
 				if (clicks >= 2)
 					fParent->DoubleClicked(this);
 				else
 					fParent->Clicked(this);
+			}
 		}
 	}
 }
diff --git a/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.cpp b/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.cpp
index f80da23df8..10ac43fbde 100644
--- a/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.cpp
+++ b/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.cpp
@@ -451,8 +451,7 @@ _WriteTransformer(LittleEndianBuffer& buffer, Transformer* t)
 			|| !buffer.Write(miterLimit))
 			return false;
 
-	} else if (PerspectiveTransformer* perspective
-		= dynamic_cast<PerspectiveTransformer*>(t)) {
+	} else if (dynamic_cast<PerspectiveTransformer*>(t)) {
 		// perspective
 		if (!buffer.Write((uint8)TRANSFORMER_TYPE_PERSPECTIVE))
 			return false;