diff --git a/roads.mss b/roads.mss
index 1c2149c0c9..8d513fd6d9 100644
--- a/roads.mss
+++ b/roads.mss
@@ -65,93 +65,130 @@
 
 #turning-circle-casing {
   [int_tc_type = 'tertiary'][zoom >= 15] {
-    point-file: url('symbols/turning_circle-tert-casing.18.png');
-    point-allow-overlap: true;
-    point-ignore-placement: true;
+    marker-width: 18;
+    marker-height: 18;
+    marker-allow-overlap: true;
+    marker-ignore-placement: true;
+    marker-line-width: 0;
+    marker-fill: @tertiary-casing;
     [zoom >= 17] {
-      point-file: url('symbols/turning_circle-tert-casing.24.png');
+      marker-width: 24;
+      marker-height: 24;
     }
   }
 
   [int_tc_type = 'residential'],
   [int_tc_type = 'unclassified'] {
     [zoom >= 15] {
-      point-file: url('symbols/turning_circle-uncl-casing.14.png');
-      point-allow-overlap: true;
-      point-ignore-placement: true;
+      marker-width: 14;
+      marker-height: 14;
+      marker-allow-overlap: true;
+      marker-ignore-placement: true;
+      marker-line-width: 0;
+      marker-fill: @residential-casing;
       [zoom >= 16] {
-        point-file: url('symbols/turning_circle-uncl-casing.18.png');
+        marker-width: 18;
+        marker-height: 18;
       }
       [zoom >= 17] {
-        point-file: url('symbols/turning_circle-uncl-casing.24.png');
+        marker-width: 24;
+        marker-height: 24;
       }
     }
   }
 
   [int_tc_type = 'living_street'][zoom >= 15] {
-    point-file: url('symbols/turning_circle-uncl-fill.14.png');
-    point-allow-overlap: true;
-    point-ignore-placement: true;
+    marker-width: 14;
+    marker-height: 14;
+    marker-allow-overlap: true;
+    marker-ignore-placement: true;
+    marker-line-width: 0;
+    marker-fill: @living-street-casing;
     [zoom >= 16] {
-      point-file: url('symbols/turning_circle-uncl-fill.18.png' );
+      marker-width: 18;
+      marker-height: 18;
     }
     [zoom >= 17] {
-      point-file: url('symbols/turning_circle-uncl-fill.24.png' );
+      marker-width: 24;
+      marker-height: 24;
     }
   }
 
   [int_tc_type = 'service'][zoom >= 16] {
-    point-file: url('symbols/turning_circle-uncl-casing.14.png');
-    point-allow-overlap: true;
-    point-ignore-placement: true;
+    marker-width: 14;
+    marker-height: 14;
+    marker-allow-overlap: true;
+    marker-ignore-placement: true;
+    marker-line-width: 0;
+    marker-fill: @service-casing;
     [zoom >= 17] {
-      point-file: url('symbols/turning_circle-uncl-casing.16.png');
+      marker-width: 16;
+      marker-height: 16;
     }
   }
 }
 
 #turning-circle-fill {
   [int_tc_type = 'tertiary'][zoom >= 15] {
-    point-file: url('symbols/turning_circle-tert-fill.16.png');
-    point-allow-overlap: true;
-    point-ignore-placement: true;
+    marker-width: 16;
+    marker-height: 16;
+    marker-allow-overlap: true;
+    marker-ignore-placement: true;
+    marker-line-width: 0;
+    marker-fill: @tertiary-fill;
     [zoom >= 17] {
-      point-file: url('symbols/turning_circle-tert-fill.22.png');
+      marker-width: 22;
+      marker-height: 22;
     }
   }
+
   [int_tc_type = 'residential'],
   [int_tc_type = 'unclassified'] {
     [zoom >= 15] {
-      point-file: url('symbols/turning_circle-uncl-fill.12.png');
-      point-allow-overlap: true;
-      point-ignore-placement: true;
+      marker-width: 12;
+      marker-height: 12;
+      marker-allow-overlap: true;
+      marker-ignore-placement: true;
+      marker-line-width: 0;
+      marker-fill: @residential-fill;
       [zoom >= 16] {
-        point-file: url('symbols/turning_circle-uncl-fill.16.png');
+        marker-width: 16;
+        marker-height: 16;
       }
       [zoom >= 17] {
-        point-file: url('symbols/turning_circle-uncl-fill.22.png');
+        marker-width: 22;
+        marker-height: 22;
       }
     }
   }
 
   [int_tc_type = 'living_street'][zoom >= 15] {
-    point-file: url('symbols/turning_circle-livs-fill.12.png');
-    point-allow-overlap: true;
-    point-ignore-placement: true;
+    marker-width: 12;
+    marker-height: 12;
+    marker-allow-overlap: true;
+    marker-ignore-placement: true;
+    marker-line-width: 0;
+    marker-fill: @living-street-fill;
     [zoom >= 16] {
-      point-file: url('symbols/turning_circle-livs-fill.16.png');
+      marker-width: 16;
+      marker-height: 16;
     }
     [zoom >= 17] {
-      point-file: url('symbols/turning_circle-livs-fill.22.png');
+      marker-width: 22;
+      marker-height: 22;
     }
   }
 
   [int_tc_type = 'service'][zoom >= 16] {
-    point-file: url('symbols/turning_circle-uncl-fill.12.png');
-    point-allow-overlap: true;
-    point-ignore-placement: true;
+    marker-width: 12;
+    marker-height: 12;
+    marker-allow-overlap: true;
+    marker-ignore-placement: true;
+    marker-line-width: 0;
+    marker-fill: @service-fill;
     [zoom >= 17] {
-      point-file: url('symbols/turning_circle-uncl-fill.14.png');
+      marker-width: 14;
+      marker-height: 14;
     }
   }
 }
diff --git a/symbols/turning_circle-livs-fill.12.png b/symbols/turning_circle-livs-fill.12.png
deleted file mode 100644
index da6fcd6adf..0000000000
Binary files a/symbols/turning_circle-livs-fill.12.png and /dev/null differ
diff --git a/symbols/turning_circle-livs-fill.14.png b/symbols/turning_circle-livs-fill.14.png
deleted file mode 100644
index b6b3780241..0000000000
Binary files a/symbols/turning_circle-livs-fill.14.png and /dev/null differ
diff --git a/symbols/turning_circle-livs-fill.16.png b/symbols/turning_circle-livs-fill.16.png
deleted file mode 100644
index 85c8625a25..0000000000
Binary files a/symbols/turning_circle-livs-fill.16.png and /dev/null differ
diff --git a/symbols/turning_circle-livs-fill.22.png b/symbols/turning_circle-livs-fill.22.png
deleted file mode 100644
index 5fc368baf5..0000000000
Binary files a/symbols/turning_circle-livs-fill.22.png and /dev/null differ
diff --git a/symbols/turning_circle-tert-casing.18.png b/symbols/turning_circle-tert-casing.18.png
deleted file mode 100644
index c5b828caab..0000000000
Binary files a/symbols/turning_circle-tert-casing.18.png and /dev/null differ
diff --git a/symbols/turning_circle-tert-casing.24.png b/symbols/turning_circle-tert-casing.24.png
deleted file mode 100644
index d973c04a16..0000000000
Binary files a/symbols/turning_circle-tert-casing.24.png and /dev/null differ
diff --git a/symbols/turning_circle-tert-fill.16.png b/symbols/turning_circle-tert-fill.16.png
deleted file mode 100644
index 02c674e664..0000000000
Binary files a/symbols/turning_circle-tert-fill.16.png and /dev/null differ
diff --git a/symbols/turning_circle-tert-fill.22.png b/symbols/turning_circle-tert-fill.22.png
deleted file mode 100644
index b03b84edce..0000000000
Binary files a/symbols/turning_circle-tert-fill.22.png and /dev/null differ
diff --git a/symbols/turning_circle-uncl-casing.14.png b/symbols/turning_circle-uncl-casing.14.png
deleted file mode 100644
index a7b6f043de..0000000000
Binary files a/symbols/turning_circle-uncl-casing.14.png and /dev/null differ
diff --git a/symbols/turning_circle-uncl-casing.16.png b/symbols/turning_circle-uncl-casing.16.png
deleted file mode 100644
index 5eab235452..0000000000
Binary files a/symbols/turning_circle-uncl-casing.16.png and /dev/null differ
diff --git a/symbols/turning_circle-uncl-casing.18.png b/symbols/turning_circle-uncl-casing.18.png
deleted file mode 100644
index d9c38f6960..0000000000
Binary files a/symbols/turning_circle-uncl-casing.18.png and /dev/null differ
diff --git a/symbols/turning_circle-uncl-casing.24.png b/symbols/turning_circle-uncl-casing.24.png
deleted file mode 100644
index cddd1550c6..0000000000
Binary files a/symbols/turning_circle-uncl-casing.24.png and /dev/null differ
diff --git a/symbols/turning_circle-uncl-fill.12.png b/symbols/turning_circle-uncl-fill.12.png
deleted file mode 100644
index 89af2683a0..0000000000
Binary files a/symbols/turning_circle-uncl-fill.12.png and /dev/null differ
diff --git a/symbols/turning_circle-uncl-fill.14.png b/symbols/turning_circle-uncl-fill.14.png
deleted file mode 100644
index 03cd5affb9..0000000000
Binary files a/symbols/turning_circle-uncl-fill.14.png and /dev/null differ
diff --git a/symbols/turning_circle-uncl-fill.16.png b/symbols/turning_circle-uncl-fill.16.png
deleted file mode 100644
index 84386c53c1..0000000000
Binary files a/symbols/turning_circle-uncl-fill.16.png and /dev/null differ
diff --git a/symbols/turning_circle-uncl-fill.18.png b/symbols/turning_circle-uncl-fill.18.png
deleted file mode 100644
index 7c32a1c538..0000000000
Binary files a/symbols/turning_circle-uncl-fill.18.png and /dev/null differ
diff --git a/symbols/turning_circle-uncl-fill.22.png b/symbols/turning_circle-uncl-fill.22.png
deleted file mode 100644
index f337f47a18..0000000000
Binary files a/symbols/turning_circle-uncl-fill.22.png and /dev/null differ
diff --git a/symbols/turning_circle-uncl-fill.24.png b/symbols/turning_circle-uncl-fill.24.png
deleted file mode 100644
index 75ad0adfc2..0000000000
Binary files a/symbols/turning_circle-uncl-fill.24.png and /dev/null differ
diff --git a/symbols/turning_circle.13.png b/symbols/turning_circle.13.png
deleted file mode 100644
index 1317ef054f..0000000000
Binary files a/symbols/turning_circle.13.png and /dev/null differ
diff --git a/symbols/turning_circle.15.png b/symbols/turning_circle.15.png
deleted file mode 100644
index c4303a07ad..0000000000
Binary files a/symbols/turning_circle.15.png and /dev/null differ
diff --git a/symbols/turning_circle.17.png b/symbols/turning_circle.17.png
deleted file mode 100644
index 39e27af23e..0000000000
Binary files a/symbols/turning_circle.17.png and /dev/null differ
diff --git a/symbols/turning_circle.19.png b/symbols/turning_circle.19.png
deleted file mode 100644
index efc0451d36..0000000000
Binary files a/symbols/turning_circle.19.png and /dev/null differ