X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fgui%2Ficoncontroller.cpp;h=7022de055a6242d0e9e56ade65f99cf1ef02846b;hb=c07be1fae6bc70a806382ab21505c26ad5be74da;hp=6253bead4617f121bbaf21a0afe7d597bc527d78;hpb=bd0241c48977c248b945024a42e61a8cf96990c2;p=synfig.git

diff --git a/synfig-studio/src/gui/iconcontroller.cpp b/synfig-studio/src/gui/iconcontroller.cpp
index 6253bea..7022de0 100644
--- a/synfig-studio/src/gui/iconcontroller.cpp
+++ b/synfig-studio/src/gui/iconcontroller.cpp
@@ -154,7 +154,7 @@ IconController::IconController(const synfig::String& /*basepath*/)
 	INIT_STOCK_ICON(canvas_new,"canvas_icon."IMAGE_EXT,_("New Canvas"));
 	INIT_STOCK_ICON(saveall,"saveall_icon."IMAGE_EXT,_("Save All"));
 
-		// Layers
+	// Layers
 	INIT_STOCK_ICON(layer,"layer_icon."IMAGE_EXT,_("Layer"));
 	// Blur Layers
 	INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon."IMAGE_EXT,_("Blur Layer"));
@@ -299,7 +299,7 @@ IconController::IconController(const synfig::String& /*basepath*/)
 	INIT_STOCK_ICON(star,"star_icon."IMAGE_EXT,_("Star Tool"));
 
 #undef INIT_STOCK_ICON
-#undef INIT_STOCK_ICON
+#undef INIT_STOCK_ICON_CLONE
 
 	icon_factory->add_default();
 
@@ -530,7 +530,7 @@ studio::layer_icon(const synfig::String &layer)
 		return Gtk::StockID("synfig-layer_geometry_rectangle");
 	else if(layer=="region")
 		return Gtk::StockID("synfig-layer_geometry_region");
-	else if(layer=="solid_color")
+	else if(layer=="solid_color" || layer=="SolidColor")
 		return Gtk::StockID("synfig-layer_geometry_solidcolor");
 	else if(layer=="star")
 		return Gtk::StockID("synfig-layer_geometry_star");
@@ -550,7 +550,7 @@ studio::layer_icon(const synfig::String &layer)
 	// Other Layers
 	else if(layer=="duplicate")
 		return Gtk::StockID("synfig-layer_other_duplicate");
-	else if(layer=="importimage")
+	else if(layer=="importimage" || layer=="import")
 		return Gtk::StockID("synfig-layer_other_importimage");
 	else if(layer=="PasteCanvas" || layer=="pastecanvas" || layer=="paste_canvas")
 		return Gtk::StockID("synfig-layer_other_pastecanvas");