diff --git a/vscode-extensions/vscode-concourse/icon-white.svg b/vscode-extensions/vscode-concourse/icon-white.svg
new file mode 100644
index 0000000000..31baacd8e3
--- /dev/null
+++ b/vscode-extensions/vscode-concourse/icon-white.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="36px" height="35px" viewBox="0 0 36 35" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
+    <title>Concourse_logo_white</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="concourse.ci_start" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-82.000000, -214.000000)">
+        <g id="Concourse_logo_white" transform="translate(82.000000, 214.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="concourse_logo_sm_b" transform="translate(0.909091, 0.272727)">
+                <circle id="Oval" cx="19.7727273" cy="17.7272727" r="2.72727273"></circle>
+                <path d="M22.5795124,19.7727273 C22.0514361,20.364893 21.4060095,20.8238214 20.6725702,21.1199043 L20.6725702,21.1347084 C21.2299841,23.2813092 22.0954425,25.324281 23.2396078,27.2192113 C22.2274615,27.7521604 21.1419713,28.1074599 20.0124748,28.2555013 L19.8511181,28.2703054 L19.6604239,28.2851096 L19.2790355,28.3147179 C19.0443349,28.3147179 18.8096343,28.329522 18.5749337,28.3147179 C17.6067938,28.2999137 16.6533227,28.1370682 15.743858,27.8261811 C15.3184631,27.6929439 14.8930683,27.5152941 14.4970111,27.3228403 C14.1302915,27.1451906 13.7782406,26.9527367 13.4408585,26.7306746 C13.1474828,26.5382207 12.8687758,26.3457668 12.6047377,26.1237047 C12.3553683,25.9312508 12.1646741,25.738797 11.9886486,25.5907555 C11.6659353,25.2798685 11.4899099,25.0874147 11.4899099,25.0874147 C11.4899099,25.0874147 11.6365978,25.2946727 11.9153047,25.6499721 C12.0619926,25.8276218 12.238018,26.0348798 12.4580498,26.256942 C12.7074192,26.5234165 12.9567885,26.7602828 13.2354955,26.9971491 C13.5582088,27.2784278 13.8955909,27.5300983 14.2476417,27.7669646 C14.643699,28.0334391 15.054425,28.2703054 15.4798198,28.4775634 C15.9345522,28.6996256 16.4186221,28.8920795 16.9026921,29.054925 C17.4160996,29.2177706 17.9295071,29.3362037 18.4575834,29.4250286 C18.7216216,29.469441 19.0003285,29.4990493 19.2790355,29.5286576 L19.6604239,29.5582659 L19.8511181,29.57307 L20.0711499,29.57307 C20.5992263,29.57307 21.1273026,29.5434617 21.6553789,29.469441 C22.5501748,29.3510079 23.430302,29.1141416 24.2810916,28.7736463 C24.6038049,29.2177706 24.941187,29.6470908 25.2932379,30.0616068 C25.2785691,30.0764109 25.2639003,30.0764109 25.2492315,30.091215 L24.8238367,30.3576896 L24.7651616,30.3872979 L24.7504928,30.4021021 C24.6771489,30.4317103 24.8385055,30.3576896 24.8238367,30.3724938 L24.8091679,30.3724938 L24.7798304,30.3872979 C24.735824,30.4021021 24.6918177,30.4317103 24.6478113,30.4465145 L24.3837731,30.5797518 L24.2370853,30.6537725 L24.1637413,30.6981849 L24.1344038,30.7129891 L24.119735,30.7129891 C24.1050662,30.7129891 24.2077477,30.6685766 24.1637413,30.6981849 L24.1490726,30.7129891 C24.0463911,30.7574015 23.9437095,30.8018139 23.841028,30.8462263 C23.7383465,30.8906388 23.6209962,30.9350512 23.5183147,30.9942678 L23.4743084,31.0090719 C23.5476523,30.9794636 23.4889772,31.0090719 23.503646,30.9942678 L23.4889772,30.9942678 L23.4743084,31.0090719 L23.3862957,31.0386802 L23.2102702,31.1127009 C21.6113725,31.7344749 19.8951245,32.0305578 18.1642077,31.9713412 L17.9441759,31.9565371 L17.6948065,31.9417329 L17.181399,31.8973205 C16.8733545,31.8529081 16.5506412,31.8232998 16.2279279,31.7492791 C14.9517435,31.5124128 13.7195654,31.0978968 12.5607313,30.4909269 C12.2820244,30.3428855 12.0179862,30.194844 11.7539481,30.0468026 C11.4899099,29.8987612 11.2552093,29.7211115 11.0058399,29.5582659 C10.5657764,29.2473789 10.1257128,28.9068836 9.72965553,28.5515842 C9.37760466,28.2406972 9.05489136,27.915006 8.74684684,27.5745107 C8.45347112,27.2784278 8.24810811,26.982345 8.05741388,26.7454787 C7.86671966,26.5086124 7.74936937,26.3161585 7.64668786,26.1829213 L7.5,25.9756633 C7.5,25.9756633 7.54400636,26.049684 7.61735029,26.1829213 C7.70536301,26.3161585 7.80804451,26.5382207 7.96940116,26.7898911 C8.13075781,27.0415616 8.32145204,27.3524486 8.58549019,27.6929439 C8.86419713,28.0778516 9.17224165,28.4479552 9.48028616,28.7884504 C9.86167461,29.2029665 10.2577318,29.6026783 10.6831266,29.9579778 C10.9178272,30.1504316 11.1525278,30.3576896 11.4018972,30.5353393 C11.6512665,30.7277932 11.9153047,30.9202471 12.1940116,31.0978968 C12.7660943,31.4680004 13.3528458,31.7936915 13.9689348,32.0897744 C14.6143614,32.3858572 15.2744568,32.6375277 15.949221,32.8299815 C16.2866031,32.9336105 16.6533227,33.0076312 17.0053736,33.0964561 L17.5041123,33.185281 L17.7534817,33.2296934 L18.0321886,33.2741058 C18.7216216,33.3629307 19.4110546,33.4073431 20.1004875,33.4073431 C21.3473344,33.392539 22.5795124,33.2148892 23.7823529,32.8891981 L23.9583783,32.8447857 L24.0463911,32.8151774 L24.1784101,32.770765 C24.2957604,32.7263525 24.4131107,32.6967442 24.5157922,32.6523318 L24.8385055,32.5487028 L25.1905564,32.4154655 C25.2932379,32.3710531 25.3812506,32.3414448 25.4692633,32.3118365 C25.5132697,32.2970324 25.5572761,32.2822282 25.6012824,32.2526199 L25.63062,32.2378158 L25.6452888,32.2378158 L25.7333015,32.1934034 L25.7479703,32.1785992 L25.8066454,32.1489909 L26.246709,31.9269288 C26.4814096,31.8084957 26.657435,31.7196708 26.8041229,31.6604542 C27.1855113,32.0305578 27.5668998,32.3858572 27.9776258,32.7115484 C27.9776258,32.7115484 29.8992368,34.7101077 30.9553894,33.8958798 C31.9528669,33.1260644 30.8087016,30.6981849 30.8087016,30.6981849 C29.2831478,26.3161585 26.3933969,22.4670813 22.5795124,19.7727273 Z" id="Shape"></path>
+                <path d="M16.1885647,16.9647194 C14.0924271,16.3465943 11.9229979,16.0447192 9.75356876,16.0590942 C9.81220198,14.8947189 10.1053681,13.7590936 10.6037505,12.7097183 L10.677042,12.5659683 L10.7649918,12.3934682 L10.9408915,12.0628432 C11.0581579,11.8615931 11.160766,11.6603431 11.3073491,11.473468 C11.8350481,10.6828428 12.4800135,9.97846762 13.2129288,9.37471746 C13.5500698,9.08721739 13.9165274,8.82846732 14.2976433,8.59846726 C14.6347843,8.3828422 15.001242,8.19596716 15.3676996,8.02346711 C15.675524,7.87971707 15.9980067,7.75034204 16.3204894,7.63534201 C16.6136555,7.52034198 16.877505,7.46284196 17.0827213,7.40534195 C17.5078121,7.30471692 17.7716616,7.24721691 17.7716616,7.24721691 C17.7716616,7.24721691 17.5224704,7.26159191 17.068063,7.31909193 C16.8481884,7.34784193 16.5696806,7.37659194 16.2618562,7.44846696 C15.9100569,7.52034198 15.5729159,7.606592 15.2357749,7.70721703 C14.8400006,7.83659206 14.4442264,7.9803421 14.0484521,8.15284214 C13.608703,8.33971719 13.1982705,8.56971725 12.8024962,8.81409232 C12.3627471,9.08721739 11.9523145,9.37471746 11.5565403,9.70534255 C11.1461077,10.0503426 10.7649918,10.4097177 10.4131925,10.8122178 C10.2372928,10.9990929 10.0613932,11.2290929 9.88549351,11.444718 L9.66561893,11.7465931 L9.56301079,11.9047181 L9.44574435,12.0772182 C9.16723656,12.5084683 8.90338707,12.9684684 8.69817079,13.4428435 C8.30239656,14.2909687 8.02388876,15.196594 7.87730571,16.1165942 L7.87730571,16.1597192 C7.34960673,16.2028442 6.82190775,16.2747193 6.29420876,16.3609693 C6.29420876,16.2747193 6.29420876,16.1884692 6.29420876,16.0878442 C6.29420876,15.9440942 6.29420876,15.7859691 6.29420876,15.5990941 L6.29420876,15.5272191 L6.29420876,15.5128441 C6.30886707,15.440969 6.27955046,15.6134691 6.27955046,15.5990941 L6.27955046,15.5847191 L6.27955046,15.5559691 C6.27955046,15.5128441 6.29420876,15.469719 6.29420876,15.412219 C6.30886707,15.311594 6.30886707,15.225344 6.32352537,15.124719 C6.32352537,15.0672189 6.33818368,15.0240939 6.33818368,14.9665939 L6.33818368,14.8947189 L6.33818368,14.8515939 L6.33818368,14.8372189 C6.33818368,14.8228439 6.32352537,14.9378439 6.32352537,14.8803439 L6.32352537,14.8659689 C6.33818368,14.7653439 6.35284198,14.6503438 6.36750029,14.5353438 C6.38215859,14.4203438 6.3968169,14.3053437 6.42613351,14.1903437 L6.42613351,14.1472187 C6.4114752,14.2190937 6.42613351,14.1615937 6.4114752,14.1759687 L6.4114752,14.1615937 L6.4114752,14.1328437 L6.42613351,14.0465937 L6.45545012,13.8597186 C6.82190775,12.2065932 7.48153147,10.6253428 8.4343213,9.23096742 L8.56624605,9.04409238 L8.7128291,8.84284232 L9.02065351,8.44034222 C9.22586978,8.21034216 9.41642774,7.95159209 9.65096062,7.72159203 C10.5158006,6.78721679 11.5272237,5.96784158 12.6412549,5.32096641 C12.9051044,5.16284137 13.1689538,5.01909133 13.4474616,4.88971629 C13.7113111,4.74596626 13.9898189,4.63096623 14.2390101,4.5159662 C14.7373925,4.30034114 15.2504332,4.1278411 15.7634738,3.96971606 C16.203223,3.84034102 16.6576304,3.739716 17.1120379,3.65346597 C17.5224704,3.56721595 17.8742698,3.53846594 18.1674359,3.49534093 C18.460602,3.46659092 18.6951349,3.45221592 18.8563762,3.43784092 L19.0909091,3.43784092 L18.8417179,3.42346591 C18.6804765,3.42346591 18.4459437,3.40909091 18.1527776,3.40909091 C17.8596115,3.42346591 17.4931538,3.40909091 17.068063,3.45221592 C16.5989972,3.49534093 16.1299315,3.55284095 15.675524,3.63909097 C15.1185084,3.739716 14.5761511,3.86909103 14.0484521,4.04159107 C13.7699443,4.1278411 13.4767782,4.22846612 13.1836121,4.34346615 C12.890446,4.44409118 12.5972799,4.57346621 12.3041138,4.71721625 C11.688465,5.00471632 11.1021328,5.32096641 10.5304589,5.6803415 C9.94412673,6.0540916 9.38711113,6.48534171 8.85941215,6.94534183 C8.59556266,7.16096689 8.33171317,7.43409196 8.08252198,7.67846702 L7.74538096,8.05221712 L7.5694813,8.23909217 L7.39358164,8.45471722 C6.95383249,8.97221736 6.54339995,9.5328425 6.19160063,10.1078427 C5.5466352,11.1428429 5.03359453,12.2640932 4.6817952,13.4284685 L4.62316198,13.6009686 L4.59384537,13.6872186 L4.56452876,13.8165936 C4.53521215,13.9315936 4.50589554,14.0465937 4.47657893,14.1615937 C4.44726232,14.2765937 4.41794571,14.3772188 4.3886291,14.4922188 C4.35931249,14.6215938 4.34465419,14.7365939 4.31533758,14.8515939 C4.30067927,14.9522189 4.27136266,15.0528439 4.25670436,15.139094 C4.24204605,15.182219 4.24204605,15.225344 4.22738775,15.282844 L4.22738775,15.311594 L4.22738775,15.325969 L4.21272944,15.412219 L4.21272944,15.426594 L4.21272944,15.4984691 C4.19807114,15.6709691 4.18341283,15.8290941 4.15409622,15.9872192 C4.11012131,16.4328443 4.0808047,16.7203444 4.06614639,16.8497194 C3.55310571,16.9790944 3.04006504,17.1372195 2.54168266,17.3097195 C2.54168266,17.3097195 -0.140787164,17.9278447 0.00579588653,19.221595 C0.152378937,20.4434703 2.79087385,20.6878454 2.79087385,20.6878454 C7.34960673,21.6078456 12.0842393,21.1047205 16.3351477,19.250345 C16.1152732,18.5028448 16.0566399,17.7265946 16.1885647,16.9647194 Z" id="Shape"></path>
+                <path d="M34.7262153,15.9517617 C34.6669348,15.2478415 34.548374,14.5585863 34.3853528,13.869331 C34.3112523,13.5173709 34.1926914,13.1800758 34.1037708,12.8281157 L33.9407496,12.3441705 L33.851829,12.1095304 L33.7480882,11.8455604 C33.4961464,11.2003001 33.1849241,10.5843699 32.8292416,9.98310474 C32.2067971,8.91255939 31.4361515,7.91533906 30.5469451,7.03543877 L30.4135641,6.90345373 L30.3542837,6.8301287 L30.2505429,6.74213867 C30.1616223,6.65414864 30.0727017,6.58082362 29.983781,6.49283359 C29.8948604,6.41950857 29.8059397,6.33151854 29.7318392,6.25819351 C29.6280985,6.17020348 29.5391778,6.09687846 29.4354371,6.02355343 L29.1983153,5.83290837 L29.0797545,5.74491834 L29.0501143,5.71558833 L28.9760137,5.65692831 L28.9611936,5.64226331 L28.9019132,5.59826829 C28.7537121,5.49561326 28.6203312,5.40762323 28.4869502,5.3196332 C28.2498285,5.15831815 28.0719872,5.02633311 27.9386063,4.93834308 C28.0868073,4.38107289 28.2053682,3.8091377 28.2942888,3.23720252 C28.4424899,2.37196723 29.0501143,0.58283664 27.8052253,0.0695614705 C26.6344368,-0.414383689 25.1079658,1.78536704 25.1079658,1.78536704 C22.0402036,5.3196332 20.1876903,9.71913465 19.7727273,14.3532762 C20.5433728,14.5145912 21.2843782,14.8518863 21.9068227,15.3358315 L21.9216428,15.3358315 C23.4481138,13.840001 24.7522832,12.1388605 25.7896907,10.2910698 C26.7826379,10.907 27.6570242,11.6989103 28.3535692,12.6374706 L28.45731,12.7694557 L28.5610507,12.9307707 L28.7685322,13.2534008 C28.8870931,13.4587109 29.0204741,13.649356 29.1242148,13.869331 C29.5836381,14.7199013 29.9096805,15.6291316 30.1023419,16.5676919 C30.1912625,17.0076421 30.2505429,17.4475922 30.2801832,17.9022074 C30.3098234,18.3128275 30.3098234,18.7087826 30.2801832,19.1194028 C30.2653631,19.4566979 30.2209027,19.808658 30.1616223,20.1459531 C30.117162,20.4539182 30.0578816,20.7178883 29.9986011,20.9378634 C29.8800403,21.3631485 29.8059397,21.6124536 29.8059397,21.6124536 C29.8059397,21.6124536 29.9096805,21.3778135 30.0875218,20.9671934 C30.1616223,20.7618833 30.2653631,20.4979132 30.3542837,20.1899481 C30.4580244,19.852653 30.5469451,19.5006929 30.6062255,19.1633978 C30.6803261,18.7527776 30.7396065,18.3274925 30.7692467,17.9022074 C30.7988869,17.4329272 30.7988869,16.948982 30.7692467,16.4797019 C30.7396065,15.9664267 30.6655059,15.4531515 30.5617652,14.9545414 C30.4432043,14.4266012 30.2950033,13.913326 30.117162,13.4147159 C30.0282413,13.1654108 29.9096805,12.9014407 29.7911196,12.6521356 L29.6280985,12.3148405 L29.5391778,12.1388605 L29.4947175,11.9482154 C29.2427757,11.4789352 28.9463735,11.0389851 28.6203312,10.6136999 C28.0571671,9.8657847 27.3902623,9.20585948 26.6492569,8.61925929 C26.8715585,8.12064913 27.0938601,7.60737396 27.2717014,7.07943378 L27.3606221,7.1234288 L27.8052253,7.35806888 L27.8645057,7.38739888 L27.8793258,7.40206389 C27.9386063,7.4460589 27.7904052,7.34340387 27.8052253,7.35806888 L27.8348655,7.37273388 L27.9534264,7.4460589 L28.2053682,7.60737396 L28.3387491,7.69536399 L28.4128497,7.739359 L28.4424899,7.76868901 L28.45731,7.76868901 C28.4721301,7.78335402 28.3832095,7.71002899 28.4128497,7.739359 L28.4276698,7.75402401 C28.5165904,7.82734903 28.6055111,7.88600905 28.7092518,7.95933407 L29.005654,8.17930915 L29.0501143,8.20863916 C28.9908339,8.16464414 29.0352942,8.19397415 29.0204741,8.17930915 L29.0352942,8.17930915 L29.0501143,8.19397415 L29.1242148,8.25263417 L29.2724159,8.36995421 C30.6210456,9.46982957 31.7177335,10.81901 32.5180193,12.3441705 L32.6217601,12.5494806 L32.7255008,12.7841207 L32.9478024,13.2387358 C33.0663633,13.5320359 33.1997442,13.825336 33.2886649,14.1333011 C33.718448,15.3504965 33.9703898,16.6410169 34.0148501,17.9315374 C34.0296702,18.2395025 34.0296702,18.5474676 34.0296702,18.8554327 C34.0296702,19.1633978 34.00003,19.4566979 33.9852099,19.735333 C33.9407496,20.2779381 33.851829,20.8058783 33.7332681,21.3484835 C33.6295274,21.8030986 33.5109665,22.2430488 33.3627654,22.6829989 C33.2442046,23.0789541 33.0960035,23.4162492 32.9922628,23.6948843 C32.8737019,23.9735194 32.7699611,24.1788294 32.7106807,24.3254795 C32.6365802,24.4721295 32.60694,24.5454545 32.60694,24.5454545 C32.60694,24.5454545 32.6514003,24.4721295 32.7403209,24.3401445 C32.8144215,24.2081594 32.9478024,24.0028494 33.0960035,23.7388793 C33.2293845,23.4749092 33.4072257,23.1522791 33.5702469,22.770989 C33.7629083,22.3457038 33.9407496,21.9057537 34.0741306,21.4511385 C34.2519718,20.9231984 34.3853528,20.3805932 34.5039137,19.823323 C34.5631941,19.5300229 34.6224745,19.2220578 34.6521147,18.9140927 C34.6965751,18.6061276 34.7262153,18.2834975 34.7410354,17.9608674 C34.7854957,17.3009422 34.7854957,16.6263519 34.7262153,15.9517617 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json
index 6896acd2da..60e3b6b547 100644
--- a/vscode-extensions/vscode-concourse/package.json
+++ b/vscode-extensions/vscode-concourse/package.json
@@ -73,7 +73,11 @@
           "**/pipeline/*.yml"
         ],
         "firstLine": "^#(\\s)*pipeline(\\s)*",
-        "configuration": "./yaml-support/language-configuration.json"
+        "configuration": "./yaml-support/language-configuration.json",
+        "icon": {
+          "light": "./icon.png",
+          "dark": "./icon-white.svg"
+        }
       },
       {
         "id": "concourse-task-yaml",
@@ -87,7 +91,11 @@
           "**/concourse/**/tasks/*.yml"
         ],
         "firstLine": "^#(\\s)*task(\\s)*",
-        "configuration": "./yaml-support/language-configuration.json"
+        "configuration": "./yaml-support/language-configuration.json",
+        "icon": {
+          "light": "./icon.png",
+          "dark": "./icon-white.svg"
+        }
       }
     ],
     "grammars": [