Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java	(revision 20645)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java	(revision 20648)
@@ -26,5 +26,5 @@
 		for(TurnRestrictionType type: TurnRestrictionType.values()) {
 			try {
-				ImageIcon icon = new ImageIcon(ImageProvider.get("types", type.getTagValue()).getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH));
+				ImageIcon icon = new ImageIcon(ImageProvider.get("types/set-a", type.getTagValue()).getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH));
 				icons.put(type,icon);
 			} catch(Exception e){
Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java	(revision 20645)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java	(revision 20648)
@@ -80,5 +80,5 @@
 		cbPsv.addItemListener(changeHandler);
 		lbl = new JLabel();
-		lbl.setText(tr("Public Service Vehicle"));
+		lbl.setText(tr("Public Service Vehicles"));
 		lbl.setToolTipText(tr("Public service vehicles like buses, tramways, etc."));
 		lbl.setIcon(ImageProvider.get("vehicle", "psv"));
Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java	(revision 20645)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java	(revision 20648)
@@ -84,5 +84,5 @@
 	 */
 	protected String buildImageName(String restrictionType) {
-		return "types/" + restrictionType;
+		return "types/set-a/" + restrictionType;
 	}
 	
Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java	(revision 20645)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java	(revision 20648)
@@ -74,4 +74,5 @@
 		pnlTurnRestrictionsInSelection.registerAsListener();
 		MapView.addEditLayerChangeListener(actNew);
+		actNew.updateEnabledState();
 	}
 
@@ -318,5 +319,5 @@
         }
 
-        protected void updateEnabledState() {
+        public void updateEnabledState() {
             setEnabled(Main.main != null && Main.main.getEditLayer() != null);
         }