diff --git a/draganddrop.json b/draganddrop.json
index 665dd2794..c5ec0b94e 100644
--- a/draganddrop.json
+++ b/draganddrop.json
@@ -7,5 +7,53 @@
 		name: "Pub",
 		icon: "pub.png",
 		tags: "amenity=pub"
+	}, {
+		name: "Bus stop",
+		icon: "bus_stop.png",
+		tags: "highway=bus_stop"
+	}, {
+		name: "Pub",
+		icon: "pub.png",
+		tags: "amenity=pub"
+	}, {
+		name: "Fast food",
+		icon: "fast_food.png",
+		tags: "amenity=fast_food"
+	}, {
+		name: "Gate",
+		icon: "gate.png",
+		tags: "barrier=gate"
+	}, {
+		name: "Cycle parking",
+		icon: "parking_cycle.png",
+		tags: "amenity=bicycle_parking"
+	}, {
+		name: "Parking",
+		icon: "parking.png",
+		tags: "amenity=parking"
+	}, {
+		name: "Post box",
+		icon: "post_box.png",
+		tags: "amenity=post_box"
+	}, {
+		name: "Recycling",
+		icon: "pub.png",
+		tags: "amenity=recycling"
+	}, {
+		name: "Restaurant",
+		icon: "pub.png",
+		tags: "amenity=restaurant"
+	}, {
+		name: "School",
+		icon: "school.png",
+		tags: "amenity=school"
+	}, {
+		name: "Station",
+		icon: "station.png",
+		tags: "railway=station"
+	}, {
+		name: "Telephone",
+		icon: "telephone.png",
+		tags: "amenity=telephone"
 	}
 ]
diff --git a/icons/bus_stop.png b/icons/bus_stop.png
new file mode 100755
index 000000000..989e9c382
Binary files /dev/null and b/icons/bus_stop.png differ
diff --git a/icons/fire_station.png b/icons/fire_station.png
new file mode 100755
index 000000000..897c526fc
Binary files /dev/null and b/icons/fire_station.png differ
diff --git a/icons/gate.png b/icons/gate.png
new file mode 100644
index 000000000..b33e55625
Binary files /dev/null and b/icons/gate.png differ
diff --git a/icons/parking.png b/icons/parking.png
new file mode 100755
index 000000000..a2675d018
Binary files /dev/null and b/icons/parking.png differ
diff --git a/icons/place.png b/icons/place.png
new file mode 100644
index 000000000..488218c07
Binary files /dev/null and b/icons/place.png differ
diff --git a/icons/post_box.png b/icons/post_box.png
new file mode 100755
index 000000000..8690ebb6e
Binary files /dev/null and b/icons/post_box.png differ
diff --git a/icons/recycling.png b/icons/recycling.png
new file mode 100755
index 000000000..aa613d510
Binary files /dev/null and b/icons/recycling.png differ
diff --git a/icons/station.png b/icons/station.png
new file mode 100755
index 000000000..1e198259e
Binary files /dev/null and b/icons/station.png differ
diff --git a/icons/telephone.png b/icons/telephone.png
new file mode 100755
index 000000000..c2a2d6242
Binary files /dev/null and b/icons/telephone.png differ
diff --git a/js/iD/ui/DragAndDrop.js b/js/iD/ui/DragAndDrop.js
index 2c20cb240..34d68ae90 100644
--- a/js/iD/ui/DragAndDrop.js
+++ b/js/iD/ui/DragAndDrop.js
@@ -44,7 +44,7 @@ declare("iD.ui.DragAndDrop", null, {
 		var row;
 		for (var i=0; i<obj.length; i++) {
 			var item=obj[i];
-			if (!row || row.length==this.ITEMSPERROW) {
+			if (!row || row.cells.length==this.ITEMSPERROW) {
 				row=document.createElement('tr');
 				this.grid.appendChild(row);
 			}
diff --git a/potlatch.css b/potlatch.css
index ac8ddf93c..4c3cffadc 100755
--- a/potlatch.css
+++ b/potlatch.css
@@ -70,32 +70,32 @@ way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
 
 /* POIs, too, can have bitmap icons - they can even be transparent */
 
-node[amenity=pub] { icon-image: icons/pub.png; text-offset: 15; font-family: DejaVu; text: name; font-size: 9; }
+node[amenity=pub] { icon-image: icons/pub.png; text-offset: 15; font-family: DejaVu; text: name; font-size: 9; icon-width: 16; }
 node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; }
-node[railway=station] { icon-image: icons/station.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; }
-node[aeroway=aerodrome] { icon-image: icons/airport.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 10; }
-node[amenity=atm] { icon-image: icons/atm.png; }
-node[amenity=bank] { icon-image: icons/bank.png; text-offset: 15; text: name; }
-node[highway=bus_stop] { icon-image: icons/bus_stop.png; }
+node[railway=station] { icon-image: icons/station.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; icon-width: 16; }
+node[aeroway=aerodrome] { icon-image: icons/airport.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 10; icon-width: 16; }
+node[amenity=atm] { icon-image: icons/atm.png; icon-width: 16; }
+node[amenity=bank] { icon-image: icons/bank.png; text-offset: 15; text: name; icon-width: 16; }
+node[highway=bus_stop] { icon-image: icons/bus_stop.png; icon-width: 16; }
 node[amenity=cafe] { icon-image: icons/cafe.png; text-offset: 15; text: name; icon-width: 16; }
-node[shop=convenience] { icon-image: icons/convenience.png; text-offset:15; text:name; }
-node[shop=supermarket] { icon-image: icons/supermarket.png; text-offset:15; text:name; }
-node[amenity=fast_food] { icon-image: icons/fast_food.png; text-offset:15; text: name; }
-node[amenity=fire_station] { icon-image: icons/fire_station.png; }
-node[amenity=hospital] { icon-image: icons/hospital.png; }
-node[tourism=hotel] { icon-image: icons/hotel.png; }
-node[amenity=parking] { icon-image: icons/parking.png; }
-node[amenity=bicycle_parking] { icon-image: icons/parking_cycle.png; text-offset: 15; text: capacity; }
-node[amenity=pharmacy] { icon-image: icons/pharmacy.png; }
-node[amenity=pharmacy][dispensing=yes] { icon-image: icons/pharmacy_dispensing.png; }
-node[amenity=police] { icon-image: icons/police.png; }
-node[amenity=post_box] { icon-image: icons/post_box.png; }
-node[amenity=recycling] { icon-image: icons/recycling.png; }
+node[shop=convenience] { icon-image: icons/convenience.png; text-offset:15; text:name; icon-width: 16; }
+node[shop=supermarket] { icon-image: icons/supermarket.png; text-offset:15; text:name; icon-width: 16; }
+node[amenity=fast_food] { icon-image: icons/fast_food.png; text-offset:15; text: name; icon-width: 16; }
+node[amenity=fire_station] { icon-image: icons/fire_station.png; icon-width: 16; }
+node[amenity=hospital] { icon-image: icons/hospital.png; icon-width: 16; }
+node[tourism=hotel] { icon-image: icons/hotel.png; icon-width: 16; }
+node[amenity=parking] { icon-image: icons/parking.png; icon-width: 16; }
+node[amenity=bicycle_parking] { icon-image: icons/parking_cycle.png; text-offset: 15; text: capacity; icon-width: 16; }
+node[amenity=pharmacy] { icon-image: icons/pharmacy.png; icon-width: 16; }
+node[amenity=pharmacy][dispensing=yes] { icon-image: icons/pharmacy_dispensing.png; icon-width: 16; }
+node[amenity=police] { icon-image: icons/police.png; icon-width: 16; }
+node[amenity=post_box] { icon-image: icons/post_box.png; icon-width: 16; }
+node[amenity=recycling] { icon-image: icons/recycling.png; icon-width: 16; }
 node[amenity=restaurant] { icon-image: icons/restaurant.png; icon-width: 16; }
 node[amenity=school] { icon-image: icons/school.png; icon-width: 16; }
-node[amenity=taxi] { icon-image: icons/taxi.png; }
-node[amenity=telephone] { icon-image: icons/telephone.png; }
-way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; }
+node[amenity=taxi] { icon-image: icons/taxi.png; icon-width: 16; }
+node[amenity=telephone] { icon-image: icons/telephone.png; icon-width: 16; }
+way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; icon-width: 16; }
 	
 /* We can stack styles at different z-index (depth) */