diff --git a/CHANGES b/CHANGES
index cacc0b286923cc..e2e72ace33b1aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@ Version 8.11 (Unreleased)
 - Cleaner install UI when creating a new project.
 - Added support for recording symbols separately in frames independent of the function.
 - Reduce noisy Postgres logs from inserting duplicate onboarding rows.
+- Added device icons for Apple Watch and Apple TV
 - Added export action to group tag details.
 - Improved display of user tags.
 - Added 'transaction' tag which automatically populates from explicit culprits.
diff --git a/src/sentry/static/sentry/images/icons/context/android-phone.svg b/src/sentry/static/sentry/images/icons/context/android-phone.svg
index 351ca04af0b4a2..5462ccc256cfd0 100644
--- a/src/sentry/static/sentry/images/icons/context/android-phone.svg
+++ b/src/sentry/static/sentry/images/icons/context/android-phone.svg
@@ -1,27 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="26px" height="48px" viewBox="0 0 26 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41.1 (35376) - http://www.bohemiancoding.com/sketch -->
     <title>android-phone</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="android-phone" transform="translate(-11.000000, 0.000000)">
-            <rect id="Rectangle-71" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
-            <g id="Group-5" transform="translate(11.000000, 0.000000)">
-                <rect id="Rectangle-200" fill="#6F7E94" x="0" y="0" width="26" height="48" rx="8"></rect>
-                <rect id="Rectangle-201" fill="#FFFFFF" x="2" y="8" width="22" height="32"></rect>
-                <g id="android" transform="translate(8.000000, 19.000000)" fill="#6F7E94">
-                    <g id="Group-2">
-                        <g id="Page-1">
-                            <path d="M6.08678431,8.0681395 L3.91324472,8.0681395 L3.91324472,10.3331166 C3.91324472,10.6933255 3.70876206,10.7499911 3.45662236,10.7499911 C3.20441852,10.7499911 3,10.6933255 3,10.3331166 L3,8.0681395 L2.35940403,8.0681395 C2.16103837,8.0681395 2.00002903,7.94964206 2.00002903,7.80348859 L2.00002903,4.33279041 C2.00002903,4.18663695 2.16103837,4.0681395 2.35940403,4.0681395 L7.64083363,4.0681395 C7.83919929,4.0681395 8.00002903,4.18663695 8.00002903,4.33279041 L8.00002903,7.80348859 C8.00002903,7.94964206 7.83919929,8.0681395 7.64083363,8.0681395 L7.00002903,8.0681395 L7.00002903,10.3331304 C7.00002903,10.6933393 6.79554637,10.7500049 6.54340667,10.7500049 C6.29120283,10.7500049 6.08678431,10.6933393 6.08678431,10.3331304 L6.08678431,8.0681395 Z M0.913273755,7.5570622 C0.913273755,7.93978368 0.708805451,8.24999054 0.456619325,8.24999054 C0.204433199,8.24999054 2.9032258e-05,7.93978368 2.9032258e-05,7.5570622 L2.9032258e-05,4.44302142 C2.9032258e-05,4.06029993 0.204433199,3.74999574 0.456619325,3.74999574 C0.708805451,3.74999574 0.913273755,4.06029993 0.913273755,4.44302142 L0.913273755,7.5570622 Z M10.000029,7.5570622 C10.000029,7.93978368 9.79556073,8.24999054 9.5433746,8.24999054 C9.29118848,8.24999054 9.08678431,7.93978368 9.08678431,7.5570622 L9.08678431,4.44302142 C9.08678431,4.06029993 9.29118848,3.74999574 9.5433746,3.74999574 C9.79556073,3.74999574 10.000029,4.06029993 10.000029,4.44302142 L10.000029,7.5570622 Z M2.00002903,3 C2.00002903,3 2.0668172,-0.0105984514 4.99998384,2.80652804e-05 C7.90558568,0.0105483168 8.00002903,3 8.00002903,3 L2.00002903,3 Z" id="Combined-Shape"></path>
-                        </g>
-                    </g>
-                </g>
-                <rect id="Rectangle-69" fill="#A8B1BE" x="10" y="18" width="1" height="1"></rect>
-                <rect id="Rectangle-69-Copy" fill="#A8B1BE" x="15" y="18" width="1" height="1"></rect>
-                <rect id="Rectangle-203-Copy-2" fill="#FFFFFF" x="10" y="43" width="6" height="1"></rect>
-                <rect id="Rectangle-203-Copy-3" fill="#FFFFFF" x="10" y="4" width="6" height="1"></rect>
-            </g>
+        <g id="android-phone">
+            <rect id="Bounding-box" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
+            <path d="M13,8.00709688 L13,39.9929031 C13,43.3091764 15.6860928,46 18.9952753,46 L29.0047247,46 C32.3100593,46 35,43.3080088 35,39.9929031 L35,8.00709688 C35,4.69082362 32.3139072,2 29.0047247,2 L18.9952753,2 C15.6899407,2 13,4.69199124 13,8.00709688 Z M11,8.00709688 C11,3.58489938 14.5878911,0 18.9952753,0 L29.0047247,0 C33.4203933,0 37,3.58817117 37,8.00709688 L37,39.9929031 C37,44.4151006 33.4121089,48 29.0047247,48 L18.9952753,48 C14.5796067,48 11,44.4118288 11,39.9929031 L11,8.00709688 Z" id="Rectangle-5" fill="#777088"></path>
+            <rect id="Rectangle-8" fill="#777088" x="14" y="7" width="20" height="34"></rect>
+            <path d="M25.0867553,27.0681395 L22.9132157,27.0681395 L22.9132157,29.3331166 C22.9132157,29.6933255 22.708733,29.7499911 22.4565933,29.7499911 C22.2043895,29.7499911 21.999971,29.6933255 21.999971,29.3331166 L21.999971,27.0681395 L21.359375,27.0681395 C21.1610093,27.0681395 21,26.9496421 21,26.8034886 L21,23.3327904 C21,23.186637 21.1610093,23.0681395 21.359375,23.0681395 L26.6408046,23.0681395 C26.8391703,23.0681395 27,23.186637 27,23.3327904 L27,26.8034886 C27,26.9496421 26.8391703,27.0681395 26.6408046,27.0681395 L26,27.0681395 L26,29.3331304 C26,29.6933393 25.7955173,29.7500049 25.5433776,29.7500049 C25.2911738,29.7500049 25.0867553,29.6933393 25.0867553,29.3331304 L25.0867553,27.0681395 Z M19.9132447,26.5570622 C19.9132447,26.9397837 19.7087764,27.2499905 19.4565903,27.2499905 C19.2044042,27.2499905 19,26.9397837 19,26.5570622 L19,23.4430214 C19,23.0602999 19.2044042,22.7499957 19.4565903,22.7499957 C19.7087764,22.7499957 19.9132447,23.0602999 19.9132447,23.4430214 L19.9132447,26.5570622 Z M29,26.5570622 C29,26.9397837 28.7955317,27.2499905 28.5433456,27.2499905 C28.2911594,27.2499905 28.0867553,26.9397837 28.0867553,26.5570622 L28.0867553,23.4430214 C28.0867553,23.0602999 28.2911594,22.7499957 28.5433456,22.7499957 C28.7955317,22.7499957 29,23.0602999 29,23.4430214 L29,26.5570622 Z M21,22 C21,22 21.0667882,18.9894015 23.9999548,19.0000281 C26.9055566,19.0105483 27,22 27,22 L21,22 Z M20.999971,18 L21.999971,18 L21.999971,19 L20.999971,19 L20.999971,18 Z M25.999971,18 L26.999971,18 L26.999971,19 L25.999971,19 L25.999971,18 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+            <rect id="Rectangle-9" fill="#777088" x="21" y="4" width="6" height="1"></rect>
+            <rect id="Rectangle-9-Copy" fill="#777088" x="21" y="43" width="6" height="1"></rect>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/sentry/static/sentry/images/icons/context/android-tablet.svg b/src/sentry/static/sentry/images/icons/context/android-tablet.svg
index c17bdb9ff12a3e..4ac70e57812ede 100644
--- a/src/sentry/static/sentry/images/icons/context/android-tablet.svg
+++ b/src/sentry/static/sentry/images/icons/context/android-tablet.svg
@@ -1,27 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="36px" height="48px" viewBox="0 0 36 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41.1 (35376) - http://www.bohemiancoding.com/sketch -->
     <title>android-tablet</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="android-tablet" transform="translate(-6.000000, 0.000000)">
-            <rect id="Rectangle-71" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
-            <g id="Group-5" transform="translate(6.000000, 0.000000)">
-                <rect id="Rectangle-200" fill="#6F7E94" x="0" y="0" width="36" height="48" rx="2"></rect>
-                <rect id="Rectangle-201" fill="#FFFFFF" x="2" y="7" width="32" height="34"></rect>
-                <g id="android" transform="translate(13.000000, 19.000000)" fill="#6F7E94">
-                    <g id="Group-2">
-                        <g id="Page-1">
-                            <path d="M6.08678431,8.0681395 L3.91324472,8.0681395 L3.91324472,10.3331166 C3.91324472,10.6933255 3.70876206,10.7499911 3.45662236,10.7499911 C3.20441852,10.7499911 3,10.6933255 3,10.3331166 L3,8.0681395 L2.35940403,8.0681395 C2.16103837,8.0681395 2.00002903,7.94964206 2.00002903,7.80348859 L2.00002903,4.33279041 C2.00002903,4.18663695 2.16103837,4.0681395 2.35940403,4.0681395 L7.64083363,4.0681395 C7.83919929,4.0681395 8.00002903,4.18663695 8.00002903,4.33279041 L8.00002903,7.80348859 C8.00002903,7.94964206 7.83919929,8.0681395 7.64083363,8.0681395 L7.00002903,8.0681395 L7.00002903,10.3331304 C7.00002903,10.6933393 6.79554637,10.7500049 6.54340667,10.7500049 C6.29120283,10.7500049 6.08678431,10.6933393 6.08678431,10.3331304 L6.08678431,8.0681395 Z M0.913273755,7.5570622 C0.913273755,7.93978368 0.708805451,8.24999054 0.456619325,8.24999054 C0.204433199,8.24999054 2.9032258e-05,7.93978368 2.9032258e-05,7.5570622 L2.9032258e-05,4.44302142 C2.9032258e-05,4.06029993 0.204433199,3.74999574 0.456619325,3.74999574 C0.708805451,3.74999574 0.913273755,4.06029993 0.913273755,4.44302142 L0.913273755,7.5570622 Z M10.000029,7.5570622 C10.000029,7.93978368 9.79556073,8.24999054 9.5433746,8.24999054 C9.29118848,8.24999054 9.08678431,7.93978368 9.08678431,7.5570622 L9.08678431,4.44302142 C9.08678431,4.06029993 9.29118848,3.74999574 9.5433746,3.74999574 C9.79556073,3.74999574 10.000029,4.06029993 10.000029,4.44302142 L10.000029,7.5570622 Z M2.00002903,3 C2.00002903,3 2.0668172,-0.0105984514 4.99998384,2.80652804e-05 C7.90558568,0.0105483168 8.00002903,3 8.00002903,3 L2.00002903,3 Z" id="Combined-Shape"></path>
-                        </g>
-                    </g>
-                </g>
-                <rect id="Rectangle-69" fill="#A8B1BE" x="15" y="18" width="1" height="1"></rect>
-                <rect id="Rectangle-69-Copy" fill="#A8B1BE" x="20" y="18" width="1" height="1"></rect>
-                <rect id="Rectangle-203-Copy-2" fill="#FFFFFF" x="15" y="44" width="6" height="1"></rect>
-                <rect id="Rectangle-203-Copy-3" fill="#FFFFFF" x="15" y="3" width="6" height="1"></rect>
-            </g>
+        <g id="android-tablet">
+            <rect id="Bounding-box" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
+            <path d="M40.0001566,46 C40.0000615,45.9996719 40,2.00138927 40,2.00138927 C40,2.00037245 7.99984339,2 7.99984339,2 C7.99993846,2.00032807 8,45.9986107 8,45.9986107 C8,45.9996275 40.0001566,46 40.0001566,46 Z M6,2.00138927 C6,0.896052496 6.88989258,0 7.99970728,0 L40.0002927,0 C41.1047006,0 42,0.894938439 42,2.00138927 L42,45.9986107 C42,47.1039475 41.1101074,48 40.0002927,48 L7.99970728,48 C6.89529944,48 6,47.1050616 6,45.9986107 L6,2.00138927 Z" id="Rectangle-5" fill="#777088"></path>
+            <rect id="Rectangle-8" fill="#777088" x="9" y="7" width="30" height="34"></rect>
+            <path d="M25.0867553,27.0681395 L22.9132157,27.0681395 L22.9132157,29.3331166 C22.9132157,29.6933255 22.708733,29.7499911 22.4565933,29.7499911 C22.2043895,29.7499911 21.999971,29.6933255 21.999971,29.3331166 L21.999971,27.0681395 L21.359375,27.0681395 C21.1610093,27.0681395 21,26.9496421 21,26.8034886 L21,23.3327904 C21,23.186637 21.1610093,23.0681395 21.359375,23.0681395 L26.6408046,23.0681395 C26.8391703,23.0681395 27,23.186637 27,23.3327904 L27,26.8034886 C27,26.9496421 26.8391703,27.0681395 26.6408046,27.0681395 L26,27.0681395 L26,29.3331304 C26,29.6933393 25.7955173,29.7500049 25.5433776,29.7500049 C25.2911738,29.7500049 25.0867553,29.6933393 25.0867553,29.3331304 L25.0867553,27.0681395 Z M19.9132447,26.5570622 C19.9132447,26.9397837 19.7087764,27.2499905 19.4565903,27.2499905 C19.2044042,27.2499905 19,26.9397837 19,26.5570622 L19,23.4430214 C19,23.0602999 19.2044042,22.7499957 19.4565903,22.7499957 C19.7087764,22.7499957 19.9132447,23.0602999 19.9132447,23.4430214 L19.9132447,26.5570622 Z M29,26.5570622 C29,26.9397837 28.7955317,27.2499905 28.5433456,27.2499905 C28.2911594,27.2499905 28.0867553,26.9397837 28.0867553,26.5570622 L28.0867553,23.4430214 C28.0867553,23.0602999 28.2911594,22.7499957 28.5433456,22.7499957 C28.7955317,22.7499957 29,23.0602999 29,23.4430214 L29,26.5570622 Z M21,22 C21,22 21.0667882,18.9894015 23.9999548,19.0000281 C26.9055566,19.0105483 27,22 27,22 L21,22 Z M20.999971,18 L21.999971,18 L21.999971,19 L20.999971,19 L20.999971,18 Z M25.999971,18 L26.999971,18 L26.999971,19 L25.999971,19 L25.999971,18 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+            <rect id="Rectangle-9" fill="#777088" x="21" y="4" width="6" height="1"></rect>
+            <rect id="Rectangle-9-Copy" fill="#777088" x="21" y="43" width="6" height="1"></rect>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/sentry/static/sentry/images/icons/context/android.svg b/src/sentry/static/sentry/images/icons/context/android.svg
index 7c0dbcb42ceb6e..b456d97b65f16f 100644
--- a/src/sentry/static/sentry/images/icons/context/android.svg
+++ b/src/sentry/static/sentry/images/icons/context/android.svg
@@ -1,19 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="40px" height="47px" viewBox="0 0 40 47" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>android</title>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41.1 (35376) - http://www.bohemiancoding.com/sketch -->
+    <title>Android</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="android" transform="translate(-4.000000, 0.000000)">
-            <rect id="Rectangle-49-Copy" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
-            <g id="Group-2" transform="translate(4.000000, 0.000000)">
-                <g id="Page-1">
-                    <path d="M22.0001161,37.9999552 L18,37.9999552 L18,45.3324665 C18,46.773302 16.6565529,46.9999645 15,46.9999645 C13.3430257,46.9999645 12,46.773302 12,45.3324665 L12,37.9999552 L8.55729167,37.9999552 C7.69770714,37.9999552 7,37.3185957 7,36.4782142 L7,16.5217228 C7,15.6813413 7.69770714,14.9999818 8.55729167,14.9999818 L31.4434866,14.9999818 C32.3030711,14.9999818 33,15.6813413 33,16.5217228 L33,36.4782142 C33,37.3185957 32.3030711,37.9999552 31.4434866,37.9999552 L28.0001161,37.9999552 L28.0001161,45.3325217 C28.0001161,46.7733572 26.656669,47.0000197 25.0001161,47.0000197 C23.3431418,47.0000197 22.0001161,46.7733572 22.0001161,45.3325217 L22.0001161,37.9999552 Z M26.2022543,4.16532315 C32.7391185,6.99535976 33.0006452,13.9999841 33.0006452,13.9999841 L7.00064516,13.9999841 C7.00064516,13.9999841 7.1784529,7.2180624 13.3760488,4.30454892 L11.00675,0.960559393 C10.9490191,0.878855659 11.0326799,0.72034063 11.1941306,0.605857554 C11.3536243,0.492842209 11.53122,0.46544455 11.5894401,0.547637528 L14.0458759,4.01461072 C15.6421072,3.38058739 17.599716,2.99274027 20.0004493,3.00009975 C22.1871087,3.00679891 24.0063561,3.3429388 25.519856,3.89388992 L28.049655,0.320144781 C28.1078276,0.237944573 28.2852785,0.265344643 28.4446422,0.378369928 C28.6059612,0.492863074 28.6895538,0.651392046 28.63187,0.733102967 L26.2022543,4.16532315 Z M6.00011613,30.2282488 C6.00011613,31.7591347 4.65676337,32.9999621 2.99990544,32.9999621 C1.34304751,32.9999621 0.000116129032,31.7591347 0.000116129032,30.2282488 L0.000116129032,17.7720857 C0.000116129032,16.2411997 1.34304751,14.999983 2.99990544,14.999983 C4.65676337,14.999983 6.00011613,16.2411997 6.00011613,17.7720857 L6.00011613,30.2282488 Z M40.0001161,30.2282488 C40.0001161,31.7591347 38.6567634,32.9999621 36.9999054,32.9999621 C35.3430475,32.9999621 34.0001161,31.7591347 34.0001161,30.2282488 L34.0001161,17.7720857 C34.0001161,16.2411997 35.3430475,14.999983 36.9999054,14.999983 C38.6567634,14.999983 40.0001161,16.2411997 40.0001161,17.7720857 L40.0001161,30.2282488 Z" id="Combined-Shape" fill="#6F7E94"></path>
-                    <path d="M14.5,10.0611226 C13.6715465,10.0611226 13,9.38957603 13,8.56112258 C13,7.73266913 13.6715465,7.06112258 14.5,7.06112258 C15.3280781,7.06112258 16,7.73266913 16,8.56112258 C16,9.38957603 15.3280781,10.0611226 14.5,10.0611226 Z" id="Fill-8" fill="#FFFFFF"></path>
-                    <path d="M25.5,10 C24.6715465,10 24,9.32845345 24,8.5 C24,7.67154655 24.6715465,7 25.5,7 C26.3277027,7 27,7.67154655 27,8.5 C27,9.32845345 26.3277027,10 25.5,10 Z" id="Fill-9" fill="#FFFFFF"></path>
-                </g>
-            </g>
+        <rect id="Bounding-box" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
+        <g id="Android">
+            <rect id="Rectangle-6" fill="#777088" x="11" y="17" width="26" height="21" rx="2"></rect>
+            <path d="M11.0843696,16 C11.4562078,12.9479729 13.4471102,3.96189045 23.9998042,4.00012162 C34.4457814,4.03794315 36.5070267,12.9609063 36.9061643,16 L11.0843696,16 Z" id="Combined-Shape" fill="#777088"></path>
+            <rect id="Rectangle-Copy" fill="#777088" x="38" y="17" width="5" height="16" rx="2.5"></rect>
+            <rect id="Rectangle-Copy-3" fill="#777088" x="26" y="28" width="5" height="19" rx="2.5"></rect>
+            <rect id="Rectangle" fill="#777088" x="5" y="17" width="5" height="16" rx="2.5"></rect>
+            <rect id="Rectangle-Copy-2" fill="#777088" x="17" y="28" width="5" height="19" rx="2.5"></rect>
+            <circle id="Oval" fill="#FFFFFF" cx="19" cy="10" r="1"></circle>
+            <circle id="Oval-Copy" fill="#FFFFFF" cx="29" cy="10" r="1"></circle>
+            <rect id="Rectangle-7" fill="#777088" transform="translate(30.388830, 4.510150) rotate(-335.000000) translate(-30.388830, -4.510150) " x="29.8888296" y="1.01014991" width="1" height="7" rx="0.5"></rect>
+            <rect id="Rectangle-7" fill="#777088" transform="translate(17.388830, 4.510150) rotate(-25.000000) translate(-17.388830, -4.510150) " x="16.8888296" y="1.01014991" width="1" height="7" rx="0.5"></rect>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/sentry/static/sentry/images/icons/context/apple-tv.svg b/src/sentry/static/sentry/images/icons/context/apple-tv.svg
new file mode 100644
index 00000000000000..c69f3e79ec3415
--- /dev/null
+++ b/src/sentry/static/sentry/images/icons/context/apple-tv.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41.1 (35376) - http://www.bohemiancoding.com/sketch -->
+    <title>apple-tv</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="48" height="48" rx="8"></rect>
+        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="48" height="48" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="apple-tv">
+            <rect id="Bounding-box" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
+            <use id="Rectangle-2" stroke="#777088" mask="url(#mask-2)" stroke-width="4" fill="#777088" xlink:href="#path-1"></use>
+            <path d="M16.1255146,16.2619329 C17.1663542,14.8639848 18.613396,14.8571429 18.613396,14.8571429 C18.613396,14.8571429 18.8285851,16.1714766 17.7946158,17.4375989 C16.6905388,18.7895365 15.4355771,18.5683152 15.4355771,18.5683152 C15.4355771,18.5683152 15.1999595,17.5050632 16.1255146,16.2619329 Z M15.5679643,19.4890118 C16.1034518,19.4890118 17.0972147,18.7389489 18.3907694,18.7389489 C20.6174,18.7389489 21.4933281,20.3535041 21.4933281,20.3535041 C21.4933281,20.3535041 19.780117,21.24608 19.780117,23.4119382 C19.780117,25.8552115 21.9142857,26.6972422 21.9142857,26.6972422 C21.9142857,26.6972422 20.4224052,30.976292 18.4073204,30.976292 C17.4817653,30.976292 16.762265,30.3406851 15.787057,30.3406851 C14.793294,30.3406851 13.807078,31 13.1647897,31 C11.3246875,31 9,26.9409251 9,23.6781357 C9,20.4679335 10.9677219,18.7839251 12.8133411,18.7839251 C14.0131328,18.7839251 14.9442048,19.4890118 15.5679643,19.4890118 Z" id="Apple" fill="#FFFFFF"></path>
+            <path d="M28.9931396,29.99065 C28.274475,29.99065 27.7206252,29.7866712 27.3315737,29.3787075 C26.9425222,28.9707438 26.7479994,28.4074381 26.7479994,27.6887735 L26.7479994,23.0444944 L25.9050587,23.0444944 C25.7969888,23.0444944 25.70378,23.0093722 25.6254293,22.9391268 C25.5470787,22.8688814 25.5079039,22.7635148 25.5079039,22.623024 L25.5079039,21.8287145 L26.8452618,21.6098741 L27.2667321,19.3404184 C27.2883461,19.2323485 27.3383277,19.1485956 27.4166783,19.0891572 C27.495029,19.0297188 27.5936412,19 27.7125181,19 L28.7499836,19 L28.7499836,21.6179793 L30.9383873,21.6179793 L30.9383873,23.0444944 L28.7499836,23.0444944 L28.7499836,27.5509851 C28.7499836,27.8103528 28.8148245,28.0129807 28.9445084,28.158875 C29.0741922,28.3047694 29.2471014,28.3777154 29.4632411,28.3777154 C29.5875214,28.3777154 29.6915371,28.362856 29.7752913,28.3331368 C29.8590454,28.3034176 29.9319915,28.272348 29.9941316,28.239927 C30.0562718,28.2075061 30.1116568,28.1764365 30.1602882,28.1467172 C30.2089197,28.116998 30.2575504,28.1021386 30.3061818,28.1021386 C30.3656202,28.1021386 30.4142509,28.116998 30.4520754,28.1467172 C30.4898999,28.1764365 30.5304254,28.2210146 30.5736534,28.280453 L31.1734381,29.2530769 C30.8816495,29.4962341 30.5466379,29.6799501 30.1683934,29.8042305 C29.7901489,29.9285108 29.3984015,29.99065 28.9931396,29.99065 Z M36.7011839,29.8609669 L34.8856193,29.8609669 L31.5786981,21.5450325 L33.2402639,21.5450325 C33.3861582,21.5450325 33.5090858,21.5801547 33.6090505,21.6504001 C33.7090151,21.7206455 33.7779086,21.8098018 33.815733,21.9178717 L35.4205625,26.3595208 C35.5124219,26.6188885 35.5894205,26.8728489 35.6515607,27.1214095 C35.7137008,27.3699702 35.7690858,27.6185272 35.8177172,27.8670879 C35.8663487,27.6185272 35.9217337,27.3699702 35.9838738,27.1214095 C36.046014,26.8728489 36.1257143,26.6188885 36.2229772,26.3595208 L37.8683326,21.9178717 C37.9061571,21.8098018 37.9736997,21.7206455 38.0709626,21.6504001 C38.1682255,21.5801547 38.2843988,21.5450325 38.4194862,21.5450325 L40,21.5450325 L36.7011839,29.8609669 Z" id="tv" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/sentry/static/sentry/images/icons/context/apple-watch.svg b/src/sentry/static/sentry/images/icons/context/apple-watch.svg
new file mode 100644
index 00000000000000..0e62359e32fac3
--- /dev/null
+++ b/src/sentry/static/sentry/images/icons/context/apple-watch.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41.1 (35376) - http://www.bohemiancoding.com/sketch -->
+    <title>apple-watch</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="apple-watch">
+            <rect id="Bounding-box" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
+            <path d="M13.1749766,2.88758194 C13.6306244,1.29281447 15.343312,0 16.9942021,0 L31.0057979,0 C32.6594501,0 34.3668308,1.28390789 34.8250234,2.88758194 L36,7 L12,7 L13.1749766,2.88758194 Z M12,41 L36,41 L34.8250234,45.1124181 C34.3693756,46.7071855 32.656688,48 31.0057979,48 L16.9942021,48 C15.3405499,48 13.6331692,46.7160921 13.1749766,45.1124181 L12,41 Z" id="Combined-Shape" fill="#777088"></path>
+            <path d="M9,10.0069123 L9,37.9930877 C9,39.6583411 10.3406135,41 11.9985481,41 L36.0014519,41 C37.6609572,41 39,39.6574009 39,37.9930877 L39,10.0069123 C39,8.34165891 37.6593865,7 36.0014519,7 L11.9985481,7 C10.3390428,7 9,8.34259911 9,10.0069123 Z M41,19 L41,23 C41.5522847,23 42,23.444837 42,23.9955775 L42,33.0044225 C42,33.5542648 41.5561352,34 41,34 L41,37.9930877 C41,40.758329 38.769165,43 36.0014519,43 L11.9985481,43 C9.2379262,43 7,40.7647948 7,37.9930877 L7,10.0069123 C7,7.24167097 9.23083496,5 11.9985481,5 L36.0014519,5 C38.7620738,5 41,7.23520515 41,10.0069123 L41,12 L41.5,12 C42.3284271,12 43,12.6711894 43,13.5016756 L43,17.4983244 C43,18.3276769 42.3342028,19 41.5,19 L41,19 Z" id="Combined-Shape" fill="#777088"></path>
+            <path d="M24.6210534,17.3053358 C25.5882052,16.0063575 26.9328016,16 26.9328016,16 C26.9328016,16 27.1327561,17.2212836 26.1719881,18.3977689 C25.1460759,19.6539941 23.979961,19.4484345 23.979961,19.4484345 C23.979961,19.4484345 23.7610243,18.4604569 24.6210534,17.3053358 Z M24.1029757,20.303949 C24.6005526,20.303949 25.5239606,19.6069879 26.7259362,19.6069879 C28.7949292,19.6069879 29.6088447,21.1072383 29.6088447,21.1072383 C29.6088447,21.1072383 28.0169228,21.936623 28.0169228,23.9491461 C28.0169228,26.2194443 30,27.0018622 30,27.0018622 C30,27.0018622 28.6137394,30.9779705 26.7413154,30.9779705 C25.8812864,30.9779705 25.2127242,30.3873622 24.3065574,30.3873622 C23.3831493,30.3873622 22.4667538,31 21.8699373,31 C20.1601078,31 18,27.2282933 18,24.1964978 C18,21.2135665 19.8284141,19.64878 21.54337,19.64878 C22.6582207,19.64878 23.5233762,20.303949 24.1029757,20.303949 Z" id="Apple" fill="#777088"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/sentry/static/sentry/images/icons/context/ios.svg b/src/sentry/static/sentry/images/icons/context/ios.svg
index 6ce134e4945a7c..d8b1f16e033ae6 100644
--- a/src/sentry/static/sentry/images/icons/context/ios.svg
+++ b/src/sentry/static/sentry/images/icons/context/ios.svg
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="39px" height="48px" viewBox="0 0 39 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>iOS</title>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41.1 (35376) - http://www.bohemiancoding.com/sketch -->
+    <title>ios</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="iOS" transform="translate(-5.000000, 0.000000)">
-            <rect id="Rectangle-49-Copy" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
-            <path d="M26.5184235,4.1770747 C29.6616669,0.0203440483 34.0316052,0 34.0316052,0 C34.0316052,0 34.6814572,3.90810746 31.5589613,7.67286034 C28.2247467,11.6927812 24.4348733,11.0349903 24.4348733,11.0349903 C24.4348733,11.0349903 23.723329,7.87346212 26.5184235,4.1770747 Z M24.834671,13.7726369 C26.4517958,13.7726369 29.4528718,11.5423614 33.3592925,11.5423614 C40.0835199,11.5423614 42.7287452,16.3431626 42.7287452,16.3431626 C42.7287452,16.3431626 37.5549992,18.9971935 37.5549992,25.4372676 C37.5549992,32.7022219 44,35.2059592 44,35.2059592 C44,35.2059592 39.4946529,47.9295055 33.4092751,47.9295055 C30.6141807,47.9295055 28.4413535,46.0395592 25.4963114,46.0395592 C22.4952353,46.0395592 19.51695,48 17.5772963,48 C12.0203505,48 5,35.9305385 5,26.228793 C5,16.6834128 10.9423459,11.6760959 16.5159525,11.6760959 C20.1392173,11.6760959 22.9509726,13.7726369 24.834671,13.7726369 Z" id="Apple" fill="#6F7E94"></path>
+        <g id="ios">
+            <rect id="Bounding-box" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
+            <path d="M26.5184235,4.1770747 C29.6616669,0.0203440483 34.0316052,0 34.0316052,0 C34.0316052,0 34.6814572,3.90810746 31.5589613,7.67286034 C28.2247467,11.6927812 24.4348733,11.0349903 24.4348733,11.0349903 C24.4348733,11.0349903 23.723329,7.87346212 26.5184235,4.1770747 Z M24.834671,13.7726369 C26.4517958,13.7726369 29.4528718,11.5423614 33.3592925,11.5423614 C40.0835199,11.5423614 42.7287452,16.3431626 42.7287452,16.3431626 C42.7287452,16.3431626 37.5549992,18.9971935 37.5549992,25.4372676 C37.5549992,32.7022219 44,35.2059592 44,35.2059592 C44,35.2059592 39.4946529,47.9295055 33.4092751,47.9295055 C30.6141807,47.9295055 28.4413535,46.0395592 25.4963114,46.0395592 C22.4952353,46.0395592 19.51695,48 17.5772963,48 C12.0203505,48 5,35.9305385 5,26.228793 C5,16.6834128 10.9423459,11.6760959 16.5159525,11.6760959 C20.1392173,11.6760959 22.9509726,13.7726369 24.834671,13.7726369 Z" id="Apple" fill="#777088"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/sentry/static/sentry/images/icons/context/ipad.svg b/src/sentry/static/sentry/images/icons/context/ipad.svg
index 0d9daff33ff79e..efece907500081 100644
--- a/src/sentry/static/sentry/images/icons/context/ipad.svg
+++ b/src/sentry/static/sentry/images/icons/context/ipad.svg
@@ -1,28 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="34px" height="48px" viewBox="0 0 34 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41.1 (35376) - http://www.bohemiancoding.com/sketch -->
     <title>ipad</title>
     <desc>Created with Sketch.</desc>
     <defs>
-        <rect id="path-1" x="16" y="44" width="2" height="2" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-1" y="-1" width="4" height="4">
-            <rect x="15" y="43" width="4" height="4" fill="white"></rect>
-            <use xlink:href="#path-1" fill="black"></use>
+        <rect id="path-1" x="0" y="0" width="36" height="48" rx="5"></rect>
+        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="36" height="48" fill="white">
+            <use xlink:href="#path-1"></use>
         </mask>
     </defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="ipad" transform="translate(-7.000000, 0.000000)">
-            <rect id="Rectangle-51" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
-            <g id="Group-5" transform="translate(7.000000, 0.000000)">
-                <rect id="Rectangle-200" fill="#6F7E94" x="0" y="0" width="34" height="48" rx="4"></rect>
-                <rect id="Rectangle-201" fill="#FFFFFF" x="1" y="6" width="32" height="36"></rect>
-                <g id="iOS" transform="translate(13.000000, 20.000000)">
-                    <rect id="Rectangle-49-Copy" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="8" height="8"></rect>
-                    <path d="M4.41973724,0.696179117 C4.94361116,0.00339067472 5.67193421,0 5.67193421,0 C5.67193421,0 5.78024287,0.651351243 5.25982688,1.27881006 C4.70412444,1.94879687 4.07247889,1.83916505 4.07247889,1.83916505 C4.07247889,1.83916505 3.95388817,1.31224369 4.41973724,0.696179117 Z M4.13911184,2.29543948 C4.40863263,2.29543948 4.90881197,1.9237269 5.55988209,1.9237269 C6.68058665,1.9237269 7.12145754,2.72386043 7.12145754,2.72386043 C7.12145754,2.72386043 6.25916653,3.16619892 6.25916653,4.2395446 C6.25916653,5.45037031 7.33333333,5.86765986 7.33333333,5.86765986 C7.33333333,5.86765986 6.58244215,7.98825092 5.56821252,7.98825092 C5.10236344,7.98825092 4.74022558,7.67325986 4.24938523,7.67325986 C3.74920588,7.67325986 3.252825,8 2.92954938,8 C2.00339175,8 0.833333333,5.98842308 0.833333333,4.3714655 C0.833333333,2.78056881 1.82372432,1.94601599 2.75265876,1.94601599 C3.35653622,1.94601599 3.8251621,2.29543948 4.13911184,2.29543948 Z" id="Apple" fill="#6F7E94"></path>
-                </g>
-                <use id="Rectangle-202" stroke="#FFFFFF" mask="url(#mask-2)" stroke-width="2" xlink:href="#path-1"></use>
-                <rect id="Rectangle-203" fill="#FFFFFF" x="15" y="3" width="7" height="1"></rect>
-                <rect id="Rectangle-203-Copy" fill="#FFFFFF" x="12" y="3" width="1" height="1" rx="0.5"></rect>
+        <g id="ipad">
+            <rect id="Bounding-box" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
+            <g id="iPhone" transform="translate(6.000000, 0.000000)">
+                <use id="Rectangle-2" stroke="#777088" mask="url(#mask-2)" stroke-width="4" fill="#FFFFFF" xlink:href="#path-1"></use>
+                <path d="M14.4140356,18.8702239 C15.0588035,18.0042383 15.9552011,18 15.9552011,18 C15.9552011,18 16.088504,18.8141891 15.4479921,19.5985126 C14.7640506,20.4359961 13.9866407,20.2989563 13.9866407,20.2989563 C13.9866407,20.2989563 13.8406829,19.6403046 14.4140356,18.8702239 Z M14.0686505,20.8692994 C14.4003684,20.8692994 15.0159737,20.4046586 15.8172908,20.4046586 C17.1966195,20.4046586 17.7392298,21.4048255 17.7392298,21.4048255 C17.7392298,21.4048255 16.6779486,21.9577487 16.6779486,23.2994308 C16.6779486,24.8129629 18,25.3345748 18,25.3345748 C18,25.3345748 17.0758262,27.9853136 15.8275436,27.9853136 C15.2541909,27.9853136 14.8084828,27.5915748 14.2043716,27.5915748 C13.5887662,27.5915748 12.9778359,28 12.5799582,28 C11.4400719,28 10,25.4855288 10,23.4643319 C10,21.475711 11.2189428,20.43252 12.3622467,20.43252 C13.1054805,20.43252 13.6822508,20.8692994 14.0686505,20.8692994 Z" id="Apple" fill="#777088"></path>
+                <rect id="Screen" fill="#777088" x="3" y="8" width="30" height="32"></rect>
+                <rect id="Home-btn-Copy" fill="#777088" x="16" y="41" width="4" height="4" rx="2"></rect>
+                <rect id="Mic" fill="#777088" x="17" y="4" width="5" height="2" rx="1"></rect>
+                <rect id="Camera" fill="#777088" x="14" y="4" width="2" height="2" rx="1"></rect>
+                <path d="M18.4140356,18.8702239 C19.0588035,18.0042383 19.9552011,18 19.9552011,18 C19.9552011,18 20.088504,18.8141891 19.4479921,19.5985126 C18.7640506,20.4359961 17.9866407,20.2989563 17.9866407,20.2989563 C17.9866407,20.2989563 17.8406829,19.6403046 18.4140356,18.8702239 Z M18.0686505,20.8692994 C18.4003684,20.8692994 19.0159737,20.4046586 19.8172908,20.4046586 C21.1966195,20.4046586 21.7392298,21.4048255 21.7392298,21.4048255 C21.7392298,21.4048255 20.6779486,21.9577487 20.6779486,23.2994308 C20.6779486,24.8129629 22,25.3345748 22,25.3345748 C22,25.3345748 21.0758262,27.9853136 19.8275436,27.9853136 C19.2541909,27.9853136 18.8084828,27.5915748 18.2043716,27.5915748 C17.5887662,27.5915748 16.9778359,28 16.5799582,28 C15.4400719,28 14,25.4855288 14,23.4643319 C14,21.475711 15.2189428,20.43252 16.3622467,20.43252 C17.1054805,20.43252 17.6822508,20.8692994 18.0686505,20.8692994 Z" id="Apple" fill="#FFFFFF"></path>
             </g>
         </g>
     </g>
diff --git a/src/sentry/static/sentry/images/icons/context/iphone.svg b/src/sentry/static/sentry/images/icons/context/iphone.svg
index a3407c5c023512..876103da9a2aeb 100644
--- a/src/sentry/static/sentry/images/icons/context/iphone.svg
+++ b/src/sentry/static/sentry/images/icons/context/iphone.svg
@@ -1,29 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="26px" height="48px" viewBox="0 0 26 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41.1 (35376) - http://www.bohemiancoding.com/sketch -->
     <title>iphone</title>
     <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="23" y="43" width="2" height="2" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-1" y="-1" width="4" height="4">
-            <rect x="22" y="42" width="4" height="4" fill="white"></rect>
-            <use xlink:href="#path-1" fill="black"></use>
-        </mask>
-    </defs>
+    <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="iphone" transform="translate(-11.000000, 0.000000)">
-            <rect id="Rectangle-51" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
-            <g id="Group-5" transform="translate(11.000000, 0.000000)">
-                <rect id="Rectangle-200" fill="#6F7E94" x="0" y="0" width="26" height="48" rx="4"></rect>
-                <rect id="Rectangle-201" fill="#FFFFFF" x="1" y="8" width="24" height="32"></rect>
-                <g id="iOS" transform="translate(9.000000, 20.000000)">
-                    <rect id="Rectangle-49-Copy" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="8" height="8"></rect>
-                    <path d="M4.41973724,0.696179117 C4.94361116,0.00339067472 5.67193421,0 5.67193421,0 C5.67193421,0 5.78024287,0.651351243 5.25982688,1.27881006 C4.70412444,1.94879687 4.07247889,1.83916505 4.07247889,1.83916505 C4.07247889,1.83916505 3.95388817,1.31224369 4.41973724,0.696179117 Z M4.13911184,2.29543948 C4.40863263,2.29543948 4.90881197,1.9237269 5.55988209,1.9237269 C6.68058665,1.9237269 7.12145754,2.72386043 7.12145754,2.72386043 C7.12145754,2.72386043 6.25916653,3.16619892 6.25916653,4.2395446 C6.25916653,5.45037031 7.33333333,5.86765986 7.33333333,5.86765986 C7.33333333,5.86765986 6.58244215,7.98825092 5.56821252,7.98825092 C5.10236344,7.98825092 4.74022558,7.67325986 4.24938523,7.67325986 C3.74920588,7.67325986 3.252825,8 2.92954938,8 C2.00339175,8 0.833333333,5.98842308 0.833333333,4.3714655 C0.833333333,2.78056881 1.82372432,1.94601599 2.75265876,1.94601599 C3.35653622,1.94601599 3.8251621,2.29543948 4.13911184,2.29543948 Z" id="Apple" fill="#6F7E94"></path>
-                </g>
-                <rect id="Rectangle-203" fill="#FFFFFF" x="11" y="4" width="7" height="1"></rect>
-                <rect id="Rectangle-203-Copy" fill="#FFFFFF" x="8" y="4" width="1" height="1" rx="0.5"></rect>
+        <g id="iphone">
+            <rect id="Bounding-box" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="48" height="48"></rect>
+            <g id="iPhone" transform="translate(10.000000, 0.000000)">
+                <path d="M2,5.0010033 L2,42.9989967 C2,44.6584823 3.34360083,46 5.00583887,46 L22.9941611,46 C24.6529911,46 26,44.6548187 26,42.9989967 L26,5.0010033 C26,3.34151772 24.6563992,2 22.9941611,2 L5.00583887,2 C3.34700892,2 2,3.34518135 2,5.0010033 Z M0,5.0010033 C0,2.23902544 2.24402624,0 5.00583887,0 L22.9941611,0 C25.7588096,0 28,2.23479023 28,5.0010033 L28,42.9989967 C28,45.7609746 25.7559738,48 22.9941611,48 L5.00583887,48 C2.2411904,48 0,45.7652098 0,42.9989967 L0,5.0010033 Z" id="Rectangle-2" fill="#777088"></path>
+                <path d="M14.4140356,18.8702239 C15.0588035,18.0042383 15.9552011,18 15.9552011,18 C15.9552011,18 16.088504,18.8141891 15.4479921,19.5985126 C14.7640506,20.4359961 13.9866407,20.2989563 13.9866407,20.2989563 C13.9866407,20.2989563 13.8406829,19.6403046 14.4140356,18.8702239 Z M14.0686505,20.8692994 C14.4003684,20.8692994 15.0159737,20.4046586 15.8172908,20.4046586 C17.1966195,20.4046586 17.7392298,21.4048255 17.7392298,21.4048255 C17.7392298,21.4048255 16.6779486,21.9577487 16.6779486,23.2994308 C16.6779486,24.8129629 18,25.3345748 18,25.3345748 C18,25.3345748 17.0758262,27.9853136 15.8275436,27.9853136 C15.2541909,27.9853136 14.8084828,27.5915748 14.2043716,27.5915748 C13.5887662,27.5915748 12.9778359,28 12.5799582,28 C11.4400719,28 10,25.4855289 10,23.4643319 C10,21.475711 11.2189428,20.43252 12.3622467,20.43252 C13.1054805,20.43252 13.6822508,20.8692994 14.0686505,20.8692994 Z" id="Apple" fill="#777088"></path>
+                <rect id="Screen" fill="#777088" x="3" y="8" width="22" height="32"></rect>
+                <rect id="Home-btn-Copy" fill="#777088" x="12" y="41" width="4" height="4" rx="2"></rect>
+                <rect id="Mic" fill="#777088" x="13" y="4" width="5" height="2" rx="1"></rect>
+                <rect id="Camera" fill="#777088" x="10" y="4" width="2" height="2" rx="1"></rect>
+                <path d="M14.4140356,18.8702239 C15.0588035,18.0042383 15.9552011,18 15.9552011,18 C15.9552011,18 16.088504,18.8141891 15.4479921,19.5985126 C14.7640506,20.4359961 13.9866407,20.2989563 13.9866407,20.2989563 C13.9866407,20.2989563 13.8406829,19.6403046 14.4140356,18.8702239 Z M14.0686505,20.8692994 C14.4003684,20.8692994 15.0159737,20.4046586 15.8172908,20.4046586 C17.1966195,20.4046586 17.7392298,21.4048255 17.7392298,21.4048255 C17.7392298,21.4048255 16.6779486,21.9577487 16.6779486,23.2994308 C16.6779486,24.8129629 18,25.3345748 18,25.3345748 C18,25.3345748 17.0758262,27.9853136 15.8275436,27.9853136 C15.2541909,27.9853136 14.8084828,27.5915748 14.2043716,27.5915748 C13.5887662,27.5915748 12.9778359,28 12.5799582,28 C11.4400719,28 10,25.4855289 10,23.4643319 C10,21.475711 11.2189428,20.43252 12.3622467,20.43252 C13.1054805,20.43252 13.6822508,20.8692994 14.0686505,20.8692994 Z" id="Apple" fill="#FFFFFF"></path>
             </g>
-            <use id="Rectangle-202" stroke="#FFFFFF" mask="url(#mask-2)" stroke-width="2" xlink:href="#path-1"></use>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/sentry/static/sentry/images/icons/context/unknown.svg b/src/sentry/static/sentry/images/icons/context/unknown.svg
index 6aafb474dafa89..5d22aeccc64852 100644
--- a/src/sentry/static/sentry/images/icons/context/unknown.svg
+++ b/src/sentry/static/sentry/images/icons/context/unknown.svg
@@ -1,20 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>unknown</title>
+    <!-- Generator: Sketch 41.1 (35376) - http://www.bohemiancoding.com/sketch -->
+    <title>Generic</title>
     <desc>Created with Sketch.</desc>
     <defs>
-        <rect id="path-1" x="0" y="0" width="48" height="48" rx="10"></rect>
+        <path d="M0,10.0039454 C0,4.47891891 4.47261992,0 10.0039454,0 L37.9960546,0 C43.5210811,0 48,4.47832784 48,10.0016641 L48,32.4526361 L48,37.9997457 C48,43.5227337 43.5273801,48 37.9960546,48 L10.0039454,48 C4.47891891,48 0,43.5273801 0,37.9960546 L0,10.0039454 Z" id="path-1"></path>
         <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="48" height="48" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
     </defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="unknown">
-            <g id="Group-3" stroke="#9FA7B6" stroke-width="2" fill="#FFFFFF" stroke-dasharray="4,4">
-                <use id="Rectangle-79" mask="url(#mask-2)" xlink:href="#path-1"></use>
-            </g>
-            <path d="M24.576,28.392 L22.896,28.392 L22.896,26.952 C22.896,26.5039978 22.9479995,26.1000018 23.052,25.74 C23.1560005,25.3799982 23.2999991,25.0560014 23.484,24.768 C23.6680009,24.4799986 23.8759988,24.2200012 24.108,23.988 C24.3400012,23.7559988 24.5759988,23.5280011 24.816,23.304 L25.488,22.704 C25.888002,22.3839984 26.2199987,22.0160021 26.484,21.6 C26.7480013,21.1839979 26.88,20.6640031 26.88,20.04 C26.88,19.5919978 26.8000008,19.1920018 26.64,18.84 C26.4799992,18.4879982 26.2640014,18.1920012 25.992,17.952 C25.7199986,17.7119988 25.4040018,17.5280006 25.044,17.4 C24.6839982,17.2719994 24.2960021,17.208 23.88,17.208 C23.0159957,17.208 22.3160027,17.4719974 21.78,18 C21.2439973,18.5280026 20.9120006,19.1999959 20.784,20.016 L19.152,19.728 C19.3920012,18.4799938 19.9399957,17.5000036 20.796,16.788 C21.6520043,16.0759964 22.7039938,15.72 23.952,15.72 C24.5920032,15.72 25.1959972,15.8119991 25.764,15.996 C26.3320028,16.1800009 26.8239979,16.4519982 27.24,16.812 C27.6560021,17.1720018 27.9879988,17.6159974 28.236,18.144 C28.4840012,18.6720026 28.608,19.2719966 28.608,19.944 C28.608,20.4560026 28.5520006,20.9039981 28.44,21.288 C28.3279994,21.6720019 28.172001,22.0159985 27.972,22.32 C27.771999,22.6240015 27.5360014,22.8999988 27.264,23.148 C26.9919986,23.3960012 26.7040015,23.6479987 26.4,23.904 C26.0639983,24.1760014 25.7800012,24.4239989 25.548,24.648 C25.3159988,24.8720011 25.1280007,25.1079988 24.984,25.356 C24.8399993,25.6040012 24.7360003,25.8799985 24.672,26.184 C24.6079997,26.4880015 24.576,26.8559978 24.576,27.288 L24.576,28.392 Z M25.2,31.848 C25.2,32.1840017 25.0800012,32.4839987 24.84,32.748 C24.5999988,33.0120013 24.2880019,33.144 23.904,33.144 C23.5199981,33.144 23.2080012,33.0120013 22.968,32.748 C22.7279988,32.4839987 22.608,32.1840017 22.608,31.848 C22.608,31.5119983 22.7279988,31.2120013 22.968,30.948 C23.2080012,30.6839987 23.5199981,30.552 23.904,30.552 C24.2880019,30.552 24.5999988,30.6839987 24.84,30.948 C25.0800012,31.2120013 25.2,31.5119983 25.2,31.848 L25.2,31.848 Z" id="?" fill="#7F8FA5"></path>
+        <g id="Generic">
+            <use id="border" stroke="#777088" mask="url(#mask-2)" stroke-width="4" stroke-dasharray="4,4" xlink:href="#path-1"></use>
+            <path d="M24.7645399,29.4647273 L22.6294435,29.4647273 L22.6294435,27.6346446 C22.6294435,27.0652828 22.6955292,26.551848 22.8277025,26.0943251 C22.9598758,25.6368021 23.1428822,25.2250376 23.3767273,24.8590193 C23.6105723,24.493001 23.8749149,24.1625727 24.1697631,23.8677245 C24.4646113,23.5728763 24.7645384,23.2831162 25.0695537,22.9984353 L25.9235923,22.2359008 C26.4319511,21.8292138 26.8538826,21.3615307 27.1893994,20.8328375 C27.5249163,20.3041443 27.6926722,19.6432877 27.6926722,18.8502479 C27.6926722,18.2808861 27.5910019,17.7725349 27.3876584,17.3251791 C27.1843149,16.8778232 26.9098053,16.5016434 26.5641212,16.1966281 C26.2184372,15.8916128 25.8168398,15.6577712 25.3593168,15.4950964 C24.9017939,15.3324216 24.4086932,15.2510854 23.88,15.2510854 C22.7819449,15.2510854 21.8923303,15.5865972 21.2111295,16.2576309 C20.5299286,16.9286645 20.1079971,17.7826945 19.9453223,18.8197466 L17.8712287,18.45373 C18.1762439,16.8676505 18.8726851,15.6221901 19.960573,14.7173113 C21.0484609,13.8124325 22.3854246,13.36 23.9715041,13.36 C24.7848783,13.36 25.5524886,13.4769208 26.2743581,13.7107658 C26.9962276,13.9446109 27.6214996,14.2902897 28.1501928,14.7478127 C28.678886,15.2053356 29.1008176,15.7696055 29.416,16.4406391 C29.7311824,17.1116727 29.8887713,17.8741995 29.8887713,18.7282424 C29.8887713,19.3789418 29.8176022,19.9482951 29.6752617,20.4363196 C29.5329212,20.924344 29.3346643,21.3615261 29.0804848,21.7478788 C28.8263054,22.1342315 28.5263783,22.4849939 28.1806942,22.8001763 C27.8350102,23.1153587 27.4689973,23.43562 27.0826446,23.7609697 C26.6556232,24.1066538 26.2946939,24.4218315 25.9998457,24.7065124 C25.7049976,24.9911933 25.4660725,25.2911206 25.2830634,25.606303 C25.1000542,25.9214855 24.9678828,26.2722479 24.8865455,26.6586006 C24.8052081,27.0449532 24.7645399,27.5126363 24.7645399,28.0616639 L24.7645399,29.4647273 Z M25.5575758,33.8569256 C25.5575758,34.2839471 25.4050704,34.6652105 25.1000551,35.0007273 C24.7950398,35.3362441 24.3985258,35.504 23.9105014,35.504 C23.4224769,35.504 23.025963,35.3362441 22.7209477,35.0007273 C22.4159324,34.6652105 22.263427,34.2839471 22.263427,33.8569256 C22.263427,33.4299042 22.4159324,33.0486408 22.7209477,32.713124 C23.025963,32.3776072 23.4224769,32.2098512 23.9105014,32.2098512 C24.3985258,32.2098512 24.7950398,32.3776072 25.1000551,32.713124 C25.4050704,33.0486408 25.5575758,33.4299042 25.5575758,33.8569256 L25.5575758,33.8569256 Z" id="?" fill="#777088"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/sentry/static/sentry/less/group-detail.less b/src/sentry/static/sentry/less/group-detail.less
index 07b77500fa3e37..47adec53199b19 100644
--- a/src/sentry/static/sentry/less/group-detail.less
+++ b/src/sentry/static/sentry/less/group-detail.less
@@ -956,6 +956,14 @@
       }
     }
 
+    &.tv .context-item-icon {
+      background-image: url(../images/icons/context/apple-tv.svg);
+    }
+
+    &.watch .context-item-icon {
+      background-image: url(../images/icons/context/apple-watch.svg);
+    }
+
     &.android-phone {
       .context-item-icon {
         background-image: url(../images/icons/context/android-phone.svg);