diff --git a/assets/layers/maproulette/license_info.json b/assets/layers/maproulette/license_info.json
new file mode 100644
index 0000000000..f59ad3208c
--- /dev/null
+++ b/assets/layers/maproulette/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "logomark.svg",
+    "license": "MIT",
+    "authors": [
+      "MapRoulette"
+    ],
+    "sources": [
+      "https://github.com/maproulette/docs/blob/master/src/assets/svg/logo.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/maproulette/logomark.svg b/assets/layers/maproulette/logomark.svg
new file mode 100644
index 0000000000..4ad7dd319e
--- /dev/null
+++ b/assets/layers/maproulette/logomark.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40" fill="currentColor">
+<g transform="translate(10 10)">
+      <polygon points="16 1 18 7 14 7" transform="rotate(45 16 4)" />
+      <polygon points="4 13 6 19 2 19" transform="rotate(-135 4 16)" />
+      <path d="M10,16 C6.68629149,16 4,13.3137085 4,10 C4,6.68629149 6.68629149,4 10,4 C13.3137085,4 16,6.68629149 16,10 C16,13.3137085 13.3137085,16 10,16 Z M9.99999996,14.6666666 C12.5773288,14.6666666 14.6666666,12.5773288 14.6666666,9.99999998 C14.6666666,7.42267116 12.5773288,5.33333333 9.99999996,5.33333333 C7.42267116,5.33333333 5.33333333,7.42267116 5.33333333,9.99999998 C5.33333333,12.5773288 7.42267116,14.6666666 9.99999996,14.6666666 Z" />
+    </g>
+  <path d="M19.8753324,0 C8.91610519,0 0,8.91610519 0,19.8753324 C0,30.8345597 8.91610519,39.7506649 19.8753324,39.7506649 C30.8345597,39.7506649 39.7506649,30.8345597 39.7506649,19.8753324 C39.7506649,8.91610519 30.8345597,0 19.8753324,0 Z M19.8753324,38.4256169 C9.64683421,38.4256169 1.32504804,30.1038307 1.32504804,19.8753324 C1.32504804,9.64683421 9.64683421,1.32504804 19.8753324,1.32504804 C30.1038307,1.32504804 38.4256169,9.64683421 38.4256169,19.8753324 C38.4256169,30.1038307 30.1038307,38.4256169 19.8753324,38.4256169 Z" />
+    <path d="M36.4380836,20.5378176 C36.8044574,20.5378176 37.1005688,20.2410075 37.1005688,19.8753324 C37.1005688,19.5096574 36.8044574,19.2128472 36.4380836,19.2128472 L34.4340135,19.2128472 C34.3955826,18.3701642 34.2842497,17.5466578 34.1087102,16.7469862 L36.0452352,16.2282089 C36.3983329,16.1341117 36.6083438,15.7703776 36.5136254,15.4172799 C36.4195281,15.0628623 36.055794,14.8541713 35.7026963,14.948191 L33.7674911,15.4669682 C33.51377,14.6693152 33.1918052,13.902795 32.8101367,13.1713673 L34.549927,12.1669643 C34.8672336,11.9841267 34.9759268,11.5793221 34.7930893,11.2620155 C34.6089319,10.9447089 34.2034286,10.8367145 33.8874418,11.019552 L32.1457105,12.0245761 C31.696497,11.32498 31.1923933,10.6644357 30.6331667,10.0529587 L32.0549517,8.63117367 C32.313331,8.37279435 32.313331,7.95339378 32.0549517,7.69439335 C31.7958736,7.43601403 31.3765507,7.43601403 31.1181714,7.69439335 L29.6963864,9.11617836 C29.0849093,8.55765046 28.4236663,8.05284808 27.7240702,7.60363451 L28.7290943,5.86252433 C28.9126306,5.54583886 28.8039374,5.14041313 28.4866308,4.95687686 C28.1706441,4.77403933 27.7645196,4.88265491 27.5816044,5.20003913 L26.5772014,6.93913072 C25.8457736,6.55816097 25.0792535,6.23619611 24.2816005,5.98247507 L24.8009988,4.04858969 C24.8957172,3.69479325 24.6864051,3.33175788 24.3326087,3.2370395 C23.9808308,3.14294222 23.6157768,3.35233195 23.5210585,3.70480855 L23.0016601,5.64133362 C22.2019886,5.46579406 21.3791808,5.35515989 20.5357991,5.31672907 L20.5364978,3.31265893 C20.5364978,2.94698386 20.2403864,2.65017372 19.8740126,2.65017372 C19.5083375,2.65017372 19.2115274,2.94698386 19.2115274,3.31265893 L19.2109063,5.31672907 C18.3688444,5.35515989 17.5453379,5.4664928 16.7456663,5.64203236 L16.2268891,3.70550729 C16.1321707,3.35240959 15.7697565,3.14170001 15.41596,3.23711713 C15.0621636,3.33121441 14.8521527,3.69494852 14.9475698,4.04804623 L15.4656483,5.98387255 C14.6679953,6.23759359 13.9014752,6.55955845 13.1700474,6.9405282 L12.1663432,5.20073787 C11.9835056,4.88343129 11.578701,4.77473807 11.2620155,4.9575756 C10.9447089,5.14041313 10.8360157,5.54591649 11.0188533,5.86260197 L12.0238774,7.60503199 C11.3242812,8.05486666 10.663737,8.55904795 10.0522599,9.11819695 L8.63117367,7.69579083 C8.37217324,7.43671277 7.95277267,7.43741151 7.69369461,7.69509209 C7.43531529,7.95409252 7.43531529,8.37349309 7.69369461,8.63257115 L9.11478088,10.0549773 C8.55695172,10.6664543 8.0520717,11.3276973 7.60355687,12.0272935 L5.86182559,11.0202507 C5.54514011,10.8367145 5.13971439,10.9454077 4.95679922,11.2627143 C4.77396169,11.5793997 4.88195617,11.9842044 5.19864164,12.1677406 L6.93905308,13.1734635 C6.55808333,13.9048913 6.23611847,14.6714114 5.98239743,15.4690644 L4.04719221,14.9483462 C3.69541435,14.8549477 3.3309815,15.0629399 3.23564201,15.4167364 C3.14092363,15.7698341 3.35023573,16.1335682 3.70341107,16.2282866 L5.64125598,16.7490048 C5.46571642,17.5486763 5.35508225,18.3714841 5.31665143,19.2142447 L3.31188254,19.2129249 L3.31126144,19.2129249 C2.94558638,19.2129249 2.64939734,19.5090363 2.64877624,19.874789 C2.64877624,20.2411628 2.94488764,20.5379729 3.31064034,20.5379729 L5.31672907,20.5392928 C5.35515989,21.3819758 5.4664928,22.2054823 5.64203236,23.0051538 L3.70488619,23.5219125 C3.35108974,23.6166309 3.14107891,23.9797439 3.23517618,24.3334627 C3.31467751,24.6295741 3.58229576,24.8250666 3.87514636,24.8250666 C3.93213267,24.8250666 3.98911897,24.8177686 4.04610528,24.8025516 L5.98395019,24.2850942 C6.23767123,25.0821261 6.55963609,25.8486462 6.94060584,26.580074 L5.2001944,27.5824584 C4.88288783,27.765296 4.7741946,28.1707993 4.95641103,28.4874072 C5.07900146,28.7000577 5.30158965,28.8193097 5.53147582,28.8193097 C5.64342984,28.8193097 5.75670371,28.7908165 5.8614374,28.7311905 L7.60518727,27.7261664 C8.05440084,28.4257626 8.55850448,29.0863068 9.11773112,29.6977839 L7.69462626,31.1181714 C7.4355482,31.3765507 7.4349271,31.7959513 7.69330642,32.0549517 C7.82319482,32.1848401 7.99275625,32.2497455 8.16239532,32.2497455 C8.33203439,32.2497455 8.50159582,32.1854612 8.63078548,32.0562715 L10.0545114,30.6351853 C10.6659885,31.1930144 11.3265327,31.6978168 12.0261289,32.1464093 L11.0190862,33.8875195 C10.8362486,34.2042049 10.9442431,34.6090096 11.2615497,34.7924682 C11.3655846,34.8527929 11.4794796,34.8812084 11.5921324,34.8812084 C11.8206987,34.8812084 12.0432869,34.7632763 12.1664984,34.5506258 L13.1722213,32.8108354 C13.9036491,33.1918052 14.6701692,33.51377 15.4678222,33.7674911 L14.9477251,35.7013765 C14.852308,36.0551729 15.0616977,36.4182083 15.4154942,36.5136254 C15.4724805,36.5288424 15.5307866,36.5361404 15.5877729,36.5361404 C15.8799248,36.5361404 16.1476207,36.3413466 16.227122,36.0458563 L16.7478402,34.1087102 C17.5475118,34.2849485 18.3710182,34.3955826 19.2130802,34.4340135 L19.2117603,36.4374625 C19.2117603,36.8038363 19.5078717,37.1006464 19.8736244,37.1006464 L19.8742455,37.1006464 C20.2399206,37.1006464 20.5367307,36.804535 20.5367307,36.4387823 L20.5380506,34.4340135 C21.3801125,34.3955826 22.2042401,34.2849485 23.0039116,34.1087102 L23.5212914,36.0452352 C23.6001716,36.3413466 23.8677899,36.5368392 24.1606405,36.5368392 C24.2176268,36.5368392 24.2752342,36.5295412 24.3322205,36.5143241 C24.6860169,36.4196058 24.895329,36.0564928 24.8013094,35.7027739 L24.283852,33.7675687 C25.0808839,33.5138477 25.8480251,33.1918828 26.5787541,32.8109131 L27.5817597,34.5507034 C27.7036514,34.7633539 27.9269383,34.8819848 28.1561257,34.8819848 C28.2680798,34.8819848 28.3820524,34.8534917 28.4860873,34.7938657 C28.8033939,34.6110281 28.9127082,34.2055248 28.7292496,33.8888393 L27.7255453,32.1464093 C28.4245204,31.6971957 29.0856857,31.1930921 29.6971627,30.6338654 L31.1169292,32.0556504 C31.2461188,32.1855388 31.416379,32.2504442 31.5860181,32.2504442 C31.7556571,32.2504442 31.9245975,32.1855388 32.0544082,32.0563492 C32.3127876,31.7979699 32.3127876,31.3785693 32.055107,31.1195689 L30.6340207,29.6971627 C31.1931697,29.0856857 31.697351,28.4251415 32.1465646,27.7255453 L33.8856561,28.7312682 C33.9910109,28.7915929 34.1049835,28.8200084 34.2169376,28.8200084 C34.4462026,28.8200084 34.6687908,28.7014552 34.7913036,28.488727 C34.9748399,28.1720415 34.8661467,27.7672369 34.5494612,27.5837006 L32.8110683,26.5786765 C33.1920381,25.8472487 33.514003,25.0801075 33.767724,24.2830756 L35.7009106,24.8024739 C35.758518,24.8183897 35.8168242,24.8256877 35.8731894,24.8256877 C36.1653413,24.8256877 36.4330371,24.6308939 36.5125385,24.3347825 C36.6079556,23.9816848 36.3979448,23.6179507 36.0447694,23.5232323 L34.1089431,23.0031353 C34.2851814,22.2034637 34.3958156,21.3799572 34.4342464,20.5378953 L36.4380836,20.5378953 L36.4380836,20.5378176 Z M19.8753324,33.12558 C12.5691292,33.12558 6.62508494,27.1815357 6.62508494,19.8753324 C6.62508494,12.5691292 12.5691292,6.62508494 19.8753324,6.62508494 C27.1815357,6.62508494 33.12558,12.5691292 33.12558,19.8753324 C33.12558,27.1815357 27.1815357,33.12558 19.8753324,33.12558 Z" />
+
+</svg>
\ No newline at end of file
diff --git a/assets/layers/maproulette/maproulette.json b/assets/layers/maproulette/maproulette.json
new file mode 100644
index 0000000000..3daf863895
--- /dev/null
+++ b/assets/layers/maproulette/maproulette.json
@@ -0,0 +1,191 @@
+{
+  "id": "maproulette",
+  "source": {
+    "geoJson": "https://maproulette.org/api/v2/tasks/box/{x_min}/{y_min}/{x_max}/{y_max}",
+    "geoJsonZoomLevel": 16,
+    "osmTags": "id~*"
+  },
+  "mapRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "icon": {
+        "render": "./assets/layers/maproulette/logomark.svg",
+        "mappings": [
+          {
+            "if": "status=0",
+            "then": "pin:#959DFF"
+          },
+          {
+            "if": "status=1",
+            "then": "pin:#65D2DA"
+          },
+          {
+            "if": "status=2",
+            "then": "pin:#F7BB59"
+          },
+          {
+            "if": "status=3",
+            "then": "pin:#F7BB59"
+          },
+          {
+            "if": "status=4",
+            "then": "pin:#737373"
+          },
+          {
+            "if": "status=5",
+            "then": "pin:#CCB186"
+          },
+          {
+            "if": "status=6",
+            "then": "pin:#FF5E63"
+          },
+          {
+            "if": "status=9",
+            "then": "pin:#FF349C"
+          }
+        ]
+      },
+      "iconSize": "40,40,center"
+    }
+  ],
+  "tagRenderings": [
+    {
+      "id": "link",
+      "render": "<a href='https://maproulette.org/challenge/{parentId}/task/{id}'>View this task</a>"
+    },
+    {
+      "id": "status",
+      "render": "Current status: {status}",
+      "mappings": [
+        {
+          "if": "status=0",
+          "then": {
+            "en": "Task is created"
+          }
+        },
+        {
+          "if": "status=1",
+          "then": {
+            "en": "Task is fixed"
+          }
+        },
+        {
+          "if": "status=2",
+          "then": {
+            "en": "Task is a false positive"
+          }
+        },
+        {
+          "if": "status=3",
+          "then": {
+            "en": "Task is skipped"
+          }
+        },
+        {
+          "if": "status=4",
+          "then": {
+            "en": "Task is deleted"
+          }
+        },
+        {
+          "if": "status=5",
+          "then": {
+            "en": "Task is already fixed"
+          }
+        },
+        {
+          "if": "status=6",
+          "then": {
+            "en": "Task is marked as too hard"
+          }
+        },
+        {
+          "if": "status=9",
+          "then": {
+            "en": "Task is disabled"
+          }
+        }
+      ]
+    },
+    {
+      "id": "blurb",
+      "condition": "blurb~*",
+      "render": "{blurb}"
+    }
+  ],
+  "description": {
+    "en": "Layer showing all tasks in MapRoulette"
+  },
+  "minzoom": 15,
+  "name": {
+    "en": "MapRoulette Tasks"
+  },
+  "title": {
+    "render": {
+      "en": "MapRoulette Item: {parentName}"
+    }
+  },
+  "filter": [
+    {
+      "id": "status",
+      "options": [
+        {
+          "question": {
+            "en": "Show tasks with all statuses"
+          }
+        },
+        {
+          "question": {
+            "en": "Show tasks that are created"
+          },
+          "osmTags": "status=0"
+        },
+        {
+          "question": {
+            "en": "Show tasks that are fixed"
+          },
+          "osmTags": "status=1"
+        },
+        {
+          "question": {
+            "en": "Show tasks that are false positives"
+          },
+          "osmTags": "status=2"
+        },
+        {
+          "question": {
+            "en": "Show tasks that are skipped"
+          },
+          "osmTags": "status=3"
+        },
+        {
+          "question": {
+            "en": "Show tasks that are deleted"
+          },
+          "osmTags": "status=4"
+        },
+        {
+          "question": {
+            "en": "Show tasks that are already fixed"
+          },
+          "osmTags": "status=5"
+        },
+        {
+          "question": {
+            "en": "Show tasks that are marked as too hard"
+          },
+          "osmTags": "status=6"
+        },
+        {
+          "question": {
+            "en": "Show tasks that are disabled"
+          },
+          "osmTags": "status=9"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 8fc630f67c..f02bc13de8 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -219,6 +219,10 @@
                 "if": "theme=mapcomplete-changes",
                 "then": "./assets/svg/logo.svg"
               },
+              {
+                "if": "theme=maproulette",
+                "then": "./assets/layers/maproulette/logomark.svg"
+              },
               {
                 "if": "theme=maps",
                 "then": "./assets/themes/maps/logo.svg"
diff --git a/assets/themes/maproulette/maproulette.json b/assets/themes/maproulette/maproulette.json
index 56b0c5ace1..3695f3edad 100644
--- a/assets/themes/maproulette/maproulette.json
+++ b/assets/themes/maproulette/maproulette.json
@@ -8,138 +8,12 @@
   },
   "version": "1.0.0",
   "hideFromOverview": true,
-  "icon": "./assets/svg/bug.svg",
+  "icon": "./assets/layers/maproulette/logomark.svg",
   "maintainer": "",
   "startLat": 0,
   "startLon": 0,
   "startZoom": 4,
   "layers": [
-    {
-      "id": "maproulette",
-      "source": {
-        "geoJson": "https://maproulette.org/api/v2/tasks/box/{x_min}/{y_min}/{x_max}/{y_max}",
-        "geoJsonZoomLevel": 16,
-        "osmTags": "id~*"
-      },
-      "mapRendering": [
-        {
-          "location": [
-            "point",
-            "centroid"
-          ],
-          "icon": {
-            "render": "pin:white",
-            "mappings": [
-              {
-                "if": "status=0",
-                "then": "pin:#959DFF"
-              },
-              {
-                "if": "status=1",
-                "then": "pin:#65D2DA"
-              },
-              {
-                "if": "status=2",
-                "then": "pin:#F7BB59"
-              },
-              {
-                "if": "status=3",
-                "then": "pin:#F7BB59"
-              },
-              {
-                "if": "status=4",
-                "then": "pin:#737373"
-              },
-              {
-                "if": "status=5",
-                "then": "pin:#CCB186"
-              },
-              {
-                "if": "status=6",
-                "then": "pin:#FF5E63"
-              },
-              {
-                "if": "status=9",
-                "then": "pin:#FF349C"
-              }
-            ]
-          },
-          "iconSize": "40,40,center"
-        }
-      ],
-      "tagRenderings": [
-        {
-          "id": "link",
-          "render": "<a href='https://maproulette.org/challenge/{parentId}/task/{id}'>View this task</a>"
-        },
-        {
-          "id": "status",
-          "render": "Current status: {status}",
-          "mappings": [
-            {
-              "if": "status=0",
-              "then": {
-                "en": "Task is created"
-              }
-            },
-            {
-              "if": "status=1",
-              "then": {
-                "en": "Task is fixed"
-              }
-            },
-            {
-              "if": "status=2",
-              "then": {
-                "en": "Task is a false positive"
-              }
-            },
-            {
-              "if": "status=3",
-              "then": {
-                "en": "Task is skipped"
-              }
-            },
-            {
-              "if": "status=4",
-              "then": {
-                "en": "Task is deleted"
-              }
-            },
-            {
-              "if": "status=5",
-              "then": {
-                "en": "Task is already fixed"
-              }
-            },
-            {
-              "if": "status=6",
-              "then": {
-                "en": "Task is marked as too hard"
-              }
-            },
-            {
-              "if": "status=9",
-              "then": {
-                "en": "Task is disabled"
-              }
-            }
-          ]
-        },
-        "all_tags"
-      ],
-      "description": {
-        "en": "Layer showing all tasks in MapRoulette"
-      },
-      "minzoom": 15,
-      "name": {
-        "en": "MapRoulette Tasks"
-      },
-      "title": {
-        "render": {
-          "en": "MapRoulette Item: {parentName}"
-        }
-      }
-    }
+    "maproulette"
   ]
 }
\ No newline at end of file