--- a/src/gui.cpp	Sun Jul 07 03:36:30 2013 +0300
+++ b/src/gui.cpp	Sun Jul 07 15:08:38 2013 +0300
@@ -651,7 +651,7 @@
 			break;
 		
 		default:
-			descr = g_saObjTypeNames[obj->getType ()];
+			descr = obj->typeName();
 			break;
 		}
 		
@@ -661,7 +661,7 @@
 		}
 		
 		QListWidgetItem* item = new QListWidgetItem (descr);
-		item->setIcon (getIcon (g_saObjTypeIcons[obj->getType ()]));
+		item->setIcon( getIcon( obj->typeName() ));
 		
 		// Color gibberish orange on red so it stands out.
 		if (obj->getType() == LDObject::Gibberish) {