diff --git a/data/presets.yaml b/data/presets.yaml
index b45b90ac0..f2a2861fc 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3670,11 +3670,16 @@ en:
         name: Power Generator
         # 'terms: hydro,solar,turbine,wind'
         terms: '<translate with synonyms or related terms for ''Power Generator'', separated by commas>'
+      power/generator/source_nuclear:
+        # 'power=generator, generator:source=nuclear, generator:method=fission'
+        name: Nuclear Reactor
+        # 'terms: fission,generator,nuclear,nuke,reactor'
+        terms: '<translate with synonyms or related terms for ''Nuclear Reactor'', separated by commas>'
       power/generator/source_wind:
         # 'power=generator, generator:source=wind, generator:method=wind_turbine'
-        name: Wind Generator
+        name: Wind Turbine
         # 'terms: generator,turbine,windmill,wind'
-        terms: '<translate with synonyms or related terms for ''Wind Generator'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Wind Turbine'', separated by commas>'
       power/line:
         # power=line
         name: Power Line
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 148496de5..2118ed00c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -10046,8 +10046,40 @@
             },
             "name": "Power Generator"
         },
+        "power/generator/source_nuclear": {
+            "icon": "poi-nuclear",
+            "fields": [
+                "operator",
+                "generator/source",
+                "generator/method",
+                "generator/type",
+                "generator/output/electricity"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [
+                "fission",
+                "generator",
+                "nuclear",
+                "nuke",
+                "reactor"
+            ],
+            "tags": {
+                "power": "generator",
+                "generator:source": "nuclear",
+                "generator:method": "fission"
+            },
+            "reference": {
+                "key": "generator:source",
+                "value": "nuclear"
+            },
+            "name": "Nuclear Reactor"
+        },
         "power/generator/source_wind": {
-            "icon": "poi-wind-generator",
+            "icon": "poi-wind",
             "fields": [
                 "operator",
                 "generator/source",
@@ -10076,7 +10108,7 @@
                 "key": "generator:source",
                 "value": "wind"
             },
-            "name": "Wind Generator"
+            "name": "Wind Turbine"
         },
         "power/line": {
             "icon": "power-line",
diff --git a/data/presets/presets/power/generator/source_nuclear.json b/data/presets/presets/power/generator/source_nuclear.json
new file mode 100644
index 000000000..753a3eda4
--- /dev/null
+++ b/data/presets/presets/power/generator/source_nuclear.json
@@ -0,0 +1,32 @@
+{
+    "icon": "poi-nuclear",
+    "fields": [
+        "operator",
+        "generator/source",
+        "generator/method",
+        "generator/type",
+        "generator/output/electricity"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "fission",
+        "generator",
+        "nuclear",
+        "nuke",
+        "reactor"
+    ],
+    "tags": {
+        "power": "generator",
+        "generator:source": "nuclear",
+        "generator:method": "fission"
+    },
+    "reference": {
+        "key": "generator:source",
+        "value": "nuclear"
+    },
+    "name": "Nuclear Reactor"
+}
diff --git a/data/presets/presets/power/generator/source_wind.json b/data/presets/presets/power/generator/source_wind.json
index 6200bcdc5..1c62b7e1b 100644
--- a/data/presets/presets/power/generator/source_wind.json
+++ b/data/presets/presets/power/generator/source_wind.json
@@ -1,5 +1,5 @@
 {
-    "icon": "poi-wind-generator",
+    "icon": "poi-wind",
     "fields": [
         "operator",
         "generator/source",
@@ -28,5 +28,5 @@
         "key": "generator:source",
         "value": "wind"
     },
-    "name": "Wind Generator"
+    "name": "Wind Turbine"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index aa09de36d..613d3c122 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2077,6 +2077,10 @@
             "key": "power",
             "value": "generator"
         },
+        {
+            "key": "generator:method",
+            "value": "fission"
+        },
         {
             "key": "generator:method",
             "value": "wind_turbine"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 317f6a363..d7e12c6f5 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4326,8 +4326,12 @@
                     "name": "Power Generator",
                     "terms": "hydro,solar,turbine,wind"
                 },
+                "power/generator/source_nuclear": {
+                    "name": "Nuclear Reactor",
+                    "terms": "fission,generator,nuclear,nuke,reactor"
+                },
                 "power/generator/source_wind": {
-                    "name": "Wind Generator",
+                    "name": "Wind Turbine",
                     "terms": "generator,turbine,windmill,wind"
                 },
                 "power/line": {
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index 15e9a92b6..e20458558 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -305,7 +305,8 @@
     "poi-chimney":              { "viewBox": "550 335 15 15" },
     "poi-bowling":              { "viewBox": "565 335 15 15" },
     "poi-binoculars":           { "viewBox": "580 335 15 15" },
-    "poi-wind-generator":       { "viewBox": "595 335 15 15" },
+    "poi-wind":                 { "viewBox": "595 335 15 15" },
+    "poi-nuclear":              { "viewBox": "610 335 15 15" },
     "poi-sikhist":              { "viewBox": "625 335 15 15" },
     "poi-taoist":               { "viewBox": "640 335 15 15" },
 
@@ -322,7 +323,8 @@
     "poi-chimney-shape":           { "fill": "currentColor" },
     "poi-bowling-shape":           { "fill": "currentColor" },
     "poi-binoculars-shape":        { "fill": "currentColor" },
-    "poi-wind-generator-shape":    { "fill": "currentColor" },
+    "poi-wind-shape":              { "fill": "currentColor" },
+    "poi-nuclear-shape":           { "fill": "currentColor" },
     "poi-sikhist-shape":           { "fill": "currentColor" },
     "poi-taoist-shape":            { "fill": "currentColor" },
 
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index 0d5f34c54..51fbb2e4c 100644
Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ
diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg
index bb6249851..de6432c3a 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -321,8 +321,11 @@
     <g id="poi-sikhist">
       <path d="M632.483,335 L631.397,336.071 C631.465,336.539 631.482,336.902 631.533,337.31 C630.206,337.717 629.225,338.915 629.225,340.357 C629.225,341.811 630.224,343.007 631.567,343.404 C631.511,343.807 631.474,344.186 631.397,344.643 L631.94,345.179 L631.94,345.614 C630.942,344.949 629.88,344.209 629.225,343.571 C627.022,341.429 627.604,337.679 630.311,336.071 C628.145,336.607 626,338.545 626,341.429 C626,344.643 629.225,345.714 629.225,346.786 L630.311,345.714 L631.702,346.484 C631.037,346.891 630.311,347.321 630.311,347.321 L630.854,347.857 L632.008,347.221 L632.008,347.991 C631.655,348.168 631.397,348.512 631.397,348.929 C631.397,349.52 631.883,350 632.483,350 C633.083,350 633.569,349.52 633.569,348.929 C633.569,348.512 633.345,348.168 632.992,347.991 L632.992,347.221 L634.112,347.857 L634.655,347.321 C634.655,347.321 633.89,346.847 633.298,346.484 L634.655,345.714 L635.742,346.786 C635.742,345.714 639,344.643 639,341.429 C639,338.545 636.828,336.607 634.655,336.071 C637.371,337.679 637.951,341.429 635.742,343.571 C635.076,344.217 634.039,344.976 633.026,345.647 L633.026,345.179 L633.569,344.643 C633.494,344.199 633.454,343.813 633.399,343.404 C634.742,343.007 635.742,341.811 635.742,340.357 C635.742,338.904 634.742,337.708 633.399,337.31 C633.454,336.902 633.494,336.515 633.569,336.071 L632.483,335 z M633.264,338.348 C634.08,338.657 634.655,339.444 634.655,340.357 C634.655,341.271 634.08,342.058 633.264,342.366 C633.132,340.985 633.132,339.729 633.264,338.348 z M631.634,338.382 C631.644,338.378 631.659,338.386 631.668,338.382 C631.815,339.871 631.832,341.042 631.702,342.366 C630.886,342.058 630.311,341.271 630.311,340.357 C630.311,339.47 630.855,338.707 631.634,338.382 z M629.768,347.857 C629.468,347.857 629.225,348.097 629.225,348.393 C629.225,348.689 629.468,348.929 629.768,348.929 C630.068,348.929 630.311,348.689 630.311,348.393 C630.311,348.097 630.068,347.857 629.768,347.857 z M635.198,347.857 C634.898,347.857 634.655,348.097 634.655,348.393 C634.655,348.689 634.898,348.929 635.198,348.929 C635.498,348.929 635.742,348.689 635.742,348.393 C635.742,348.097 635.498,347.857 635.198,347.857 z" fill="#000000" id="poi-sikhist-shape"/>
     </g>
-    <g id="poi-wind-generator">
-      <path d="M603,341.25 L603,349.5 C603,349.845 602.845,350 602.5,350 C602.155,350 602,349.845 602,349.5 L602,343 L603,341.25 z M598.5,335.5 C598.68,335.771 601.75,339.5 601.75,339.5 L600,343.75 C599.841,344.142 600,344.981 600.25,344.75 C600.664,344.368 603,340 603,340 L607,338.8 C607.524,338.655 607.882,338 607.5,338 C606.946,338 602.854,338.456 602.854,338.456 L599.5,335.5 C599.123,335.154 598.302,335.202 598.5,335.5 z" fill="#000000" id="poi-wind-generator-shape"/>
+    <g id="poi-nuclear">
+      <path d="M618.747,344.066 L621.384,348.417 C619.987,349.263 618.348,349.635 616.688,349.456 C615.673,349.345 614.704,349.033 613.829,348.542 L616.321,344.107 C616.6,344.264 616.91,344.363 617.237,344.399 C617.776,344.457 618.298,344.339 618.747,344.066 z M621.321,335.549 L618.727,339.925 C619.47,340.365 619.927,341.167 619.912,342.044 L624.999,342.133 C625.046,339.41 623.622,336.913 621.321,335.549 z M613.765,335.5 C611.636,336.724 610.221,338.918 610.024,341.411 C610.007,341.626 609.999,341.833 610,342.04 L615.088,342.018 C615.088,341.95 615.09,341.883 615.096,341.809 C615.159,341.009 615.613,340.305 616.301,339.909 L613.765,335.5 z M619.019,342.022 C619.019,341.22 618.368,340.569 617.565,340.569 C616.763,340.569 616.112,341.22 616.112,342.022 C616.112,342.825 616.763,343.476 617.565,343.476 C618.368,343.476 619.019,342.825 619.019,342.022 z" fill="#000000" id="poi-nuclear-shape"/>
+    </g>
+    <g id="poi-wind">
+      <path d="M603,341.25 L603,349.5 C603,349.845 602.845,350 602.5,350 C602.155,350 602,349.845 602,349.5 L602,343 L603,341.25 z M598.5,335.5 C598.68,335.771 601.75,339.5 601.75,339.5 L600,343.75 C599.841,344.142 600,344.981 600.25,344.75 C600.664,344.368 603,340 603,340 L607,338.8 C607.524,338.655 607.882,338 607.5,338 C606.946,338 602.854,338.456 602.854,338.456 L599.5,335.5 C599.123,335.154 598.302,335.202 598.5,335.5 z" fill="#000000" id="poi-wind-shape"/>
     </g>
     <g id="poi-binoculars">
       <path d="M591,337.5 C592,339 592,339 592.5,340.344 C593,341.344 593,344.5 593,345.5 C593,346 589,346 589,345.5 C589,344.5 589,344.844 589,344.344 C589,343.844 588.5,343.5 588.5,343 L588.5,342.5 L586.5,342.5 L586.5,343 C586.5,343.5 586,343.844 586,344.344 L586,345.5 C586,346 582,346 582,345.5 C582,344.5 582,341.344 582.5,340.344 C583,339 583,339 584,337.5 C584,337 586,337 586,337.5 L586,338.5 L589,338.5 C589,338.5 589,338 589,337.5 C589,337 591,337 591,337.5 z M582.5,346.5 C581.948,346.5 581.5,347.06 581.5,347.75 L581.5,347.75 C581.5,348.44 581.948,349 582.5,349 L585.5,349 C586.052,349 586.5,348.44 586.5,347.75 L586.5,347.75 C586.5,347.06 586.052,346.5 585.5,346.5 L582.5,346.5 z M589.5,346.5 C588.948,346.5 588.5,347.06 588.5,347.75 L588.5,347.75 C588.5,348.44 588.948,349 589.5,349 L592.5,349 C593.052,349 593.5,348.44 593.5,347.75 L593.5,347.75 C593.5,347.06 593.052,346.5 592.5,346.5 L589.5,346.5 z M584.5,336 C584.224,336 584,336.224 584,336.5 L584,336.5 C584,336.776 584.224,337 584.5,337 L585.5,337 C585.776,337 586,336.776 586,336.5 L586,336.5 C586,336.224 585.776,336 585.5,336 L584.5,336 z M589.5,336 C589.224,336 589,336.224 589,336.5 L589,336.5 C589,336.776 589.224,337 589.5,337 L590.5,337 C590.776,337 591,336.776 591,336.5 L591,336.5 C591,336.224 590.776,336 590.5,336 L589.5,336 z" fill="#000000" id="poi-binoculars-shape"/>