diff --git a/apps/mesh/public/empty-state-error.svg b/apps/mesh/public/empty-state-error.svg
new file mode 100644
index 0000000000..0bd63f8695
--- /dev/null
+++ b/apps/mesh/public/empty-state-error.svg
@@ -0,0 +1,19 @@
+<svg width="220" height="200" viewBox="0 0 220 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M136.512 52.5108L163.512 37.0853M136.512 52.5108L163.512 67.9363M136.512 52.5108L109.512 67.9363M163.512 37.0853L190.512 52.5108M163.512 37.0853L190.512 21.6599L217.512 37.0853M163.512 37.0853L136.512 21.5L109.512 37.0853M190.512 52.5108L163.512 67.9363M190.512 52.5108L217.512 37.0853M190.512 52.5108L217.512 67.9363L190.512 83.3618M163.512 67.9363L136.512 83.3618M163.512 67.9363L190.512 83.3618M163.512 67.9363L109.512 98.7873M163.512 67.9363L217.512 98.7873M163.512 67.9363L217.512 37.0853M163.512 67.9363L109.512 37.0853M1.51172 98.7873L28.5117 83.3618M1.51172 98.7873L28.5117 114.213M1.51172 98.7873L55.5117 67.9363M1.51172 98.7873L55.5117 129.638M1.51172 98.7873L109.512 37.0853M1.51172 98.7873L109.512 160.489M28.5117 83.3618L55.5117 98.7873M28.5117 83.3618L55.5117 67.9363M28.5117 83.3618L1.51172 67.9363L28.5117 52.5108M55.5117 98.7873L28.5117 114.213M55.5117 98.7873L82.5117 114.213M55.5117 98.7873L82.5117 83.3618M28.5117 114.213L55.5117 129.638M28.5117 114.213L1.51172 129.638L28.5117 145.064M109.512 98.7873L136.512 83.3618M109.512 98.7873L136.512 114.213M109.512 98.7873L82.5117 83.3618M109.512 98.7873L82.5117 114.213M109.512 98.7873L55.5117 67.9363M109.512 98.7873L55.5117 129.638M109.512 98.7873L163.512 129.638M136.512 83.3618L163.512 98.7873M136.512 83.3618L109.512 67.9363M163.512 98.7873L136.512 114.213M163.512 98.7873L190.512 114.213M163.512 98.7873L190.512 83.3618M136.512 114.213L163.512 129.638M136.512 114.213L109.512 129.638M55.5117 67.9363L82.5117 52.5108M55.5117 67.9363L82.5117 83.3618M55.5117 67.9363L28.5117 52.5108M55.5117 67.9363L1.51172 37.0853M55.5117 67.9363L109.512 37.0853M82.5117 52.5108L109.512 67.9363M82.5117 52.5108L109.512 37.0853M82.5117 52.5108L55.5117 37.0853M109.512 67.9363L82.5117 83.3618M82.5117 114.213L55.5117 129.638M82.5117 114.213L109.512 129.638M55.5117 129.638L28.5117 145.064M55.5117 129.638L82.5117 145.064M55.5117 129.638L1.51172 160.489M55.5117 129.638L109.512 160.489M190.512 114.213L163.512 129.638M190.512 114.213L217.512 98.7873M190.512 114.213L217.512 129.638L190.512 145.064M163.512 129.638L190.512 145.064M163.512 129.638L136.512 145.064M163.512 129.638L217.512 98.7873M163.512 129.638L217.512 160.489M163.512 129.638L109.512 160.489M190.512 83.3618L217.512 98.7873M217.512 98.7873L109.512 37.0853M217.512 98.7873L109.512 160.489M190.512 145.064L163.512 160.489M190.512 145.064L217.512 160.489M136.512 145.064L163.512 160.489M136.512 145.064L109.512 129.638M136.512 145.064L109.512 160.489M163.512 160.489L136.512 175.915M163.512 160.489L190.512 175.915L217.512 160.489M28.5117 145.064L55.5117 160.489M28.5117 145.064L1.51172 160.489M82.5117 145.064L55.5117 160.489M82.5117 145.064L109.512 129.638M82.5117 145.064L109.512 160.489M55.5117 160.489L28.5117 175.915L1.51172 160.489M55.5117 160.489L82.5117 175.915M28.5117 52.5108L55.5117 37.0853M28.5117 52.5108L1.51172 37.0853M1.51172 37.0853L28.5117 21.6599L55.5117 37.0853M55.5117 37.0853L82.5117 21.6599L109.512 37.0853M109.512 160.489L136.512 175.915M109.512 160.489L82.5117 175.915M136.512 175.915L163.512 191.34L217.512 160.489M136.512 175.915L109.512 191.5L82.5117 175.915M82.5117 175.915L55.5117 191.34L1.51172 160.489" stroke="url(#paint0_radial_3924_18414)" stroke-width="1.5"/>
+<path d="M63.8511 94.3505L63.5117 107.039C67.1675 140.643 150.153 142.264 155.271 107.769L155.512 94.2546C155.454 87.5326 150.98 80.8208 142.089 75.6921C124.191 65.3676 95.1725 65.3676 77.2745 75.6921C68.3413 80.8453 63.8668 87.5965 63.8511 94.3505Z" fill="white" stroke="black" stroke-width="3"/>
+<path d="M155.54 93.0736C155.766 100.041 151.274 107.051 142.065 112.368C124.086 122.748 94.9373 122.748 76.9588 112.368C67.7494 107.051 63.2575 100.041 63.483 93.0736" stroke="black"/>
+<path d="M76.9848 75.2607C94.9489 64.9118 124.075 64.9118 142.039 75.2607C160.003 85.6096 160.003 102.388 142.039 112.737C124.075 123.086 94.9489 123.086 76.9848 112.737C59.0207 102.388 59.0207 85.6096 76.9848 75.2607Z" fill="#DC2626" stroke="#6E6E6A"/>
+<g clip-path="url(#clip0_3924_18414)">
+<path d="M123.202 93.121H96.3253M109.764 85.3623V100.88" stroke="#FEF2F2" stroke-width="3.795" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<path d="M63.8511 94.3505L63.5117 107.039C67.1675 140.643 150.153 142.264 155.271 107.769L155.512 94.2546C155.454 87.5326 150.98 80.8208 142.089 75.6921C124.191 65.3676 95.1725 65.3676 77.2745 75.6921C68.3413 80.8453 63.8668 87.5965 63.8511 94.3505Z" stroke="black" stroke-width="3"/>
+<defs>
+<radialGradient id="paint0_radial_3924_18414" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(109.512 106.5) rotate(92.6943) scale(85.0941 108.12)">
+<stop stop-color="#D9D9D7"/>
+<stop offset="1" stop-color="#D9D9D7" stop-opacity="0"/>
+</radialGradient>
+<clipPath id="clip0_3924_18414">
+<rect width="37.2416" height="37.2416" fill="white" transform="matrix(0.866025 0.5 -0.866025 0.5 109.764 74.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/apps/mesh/public/empty-state-logs.svg b/apps/mesh/public/empty-state-logs.svg
new file mode 100644
index 0000000000..5881981308
--- /dev/null
+++ b/apps/mesh/public/empty-state-logs.svg
@@ -0,0 +1,80 @@
+<svg width="336" height="320" viewBox="0 0 336 320" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g opacity="0.4">
+<path d="M41 263.955V246.976C41 244.827 42.1501 242.841 44.0148 241.772L267.591 113.538C269.399 112.501 271.615 112.476 273.445 113.473L327.301 142.796C329.23 143.846 330.432 145.868 330.432 148.065V165.393C330.432 167.543 329.282 169.529 327.417 170.598L103.857 298.823C102.04 299.865 99.812 299.884 97.9776 298.874L44.106 269.211C42.1901 268.156 41 266.142 41 263.955Z" fill="white"/>
+<path d="M41 263.955V246.976C41 244.827 42.1501 242.841 44.0148 241.772L267.591 113.538C269.399 112.501 271.615 112.476 273.445 113.473L327.301 142.796C329.23 143.846 330.432 145.868 330.432 148.065V165.393C330.432 167.543 329.282 169.529 327.417 170.598L103.857 298.823C102.04 299.865 99.812 299.884 97.9776 298.874L44.106 269.211C42.1901 268.156 41 266.142 41 263.955Z" fill="url(#pattern0_3926_18897)" fill-opacity="0.2"/>
+<path d="M41 263.955V246.976C41 244.827 42.1501 242.841 44.0148 241.772L267.591 113.538C269.399 112.501 271.615 112.476 273.445 113.473L327.301 142.796C329.23 143.846 330.432 145.868 330.432 148.065V165.393C330.432 167.543 329.282 169.529 327.417 170.598L103.857 298.823C102.04 299.865 99.812 299.884 97.9776 298.874L44.106 269.211C42.1901 268.156 41 266.142 41 263.955Z" stroke="#D9D9D7" stroke-width="3"/>
+<path d="M41 243.5L101 277.395M101 277.395L330.5 144.405M101 277.395V299.895" stroke="#D9D9D7"/>
+<rect x="1.29904" width="44.8013" height="44.8013" rx="5.25" transform="matrix(0.866025 -0.5 0.866025 0.5 65.174 243.301)" stroke="#D9D9D7" stroke-width="1.5"/>
+<rect x="1.29904" width="124.39" height="16.2599" rx="5.25" transform="matrix(0.866025 -0.5 0.866025 0.5 125.174 220.095)" stroke="#D9D9D7" stroke-width="1.5"/>
+<rect width="33.4399" height="17.7599" rx="6" transform="matrix(0.866025 -0.5 0.866025 0.5 242 150.702)" fill="#16A34A"/>
+</g>
+<path d="M28 232.586V215.607C28 213.458 29.1501 211.472 31.0148 210.403L254.591 82.1685C256.399 81.1317 258.615 81.1071 260.445 82.1036L314.301 111.427C316.23 112.477 317.432 114.499 317.432 116.696V134.024C317.432 136.174 316.282 138.159 314.417 139.229L90.8568 267.454C89.0403 268.495 86.812 268.515 84.9776 267.505L31.106 237.842C29.1901 236.787 28 234.773 28 232.586Z" fill="white"/>
+<path d="M28 232.586V215.607C28 213.458 29.1501 211.472 31.0148 210.403L254.591 82.1685C256.399 81.1317 258.615 81.1071 260.445 82.1036L314.301 111.427C316.23 112.477 317.432 114.499 317.432 116.696V134.024C317.432 136.174 316.282 138.159 314.417 139.229L90.8568 267.454C89.0403 268.495 86.812 268.515 84.9776 267.505L31.106 237.842C29.1901 236.787 28 234.773 28 232.586Z" fill="url(#pattern1_3926_18897)" fill-opacity="0.25"/>
+<path d="M28 232.586V215.607C28 213.458 29.1501 211.472 31.0148 210.403L254.591 82.1685C256.399 81.1317 258.615 81.1071 260.445 82.1036L314.301 111.427C316.23 112.477 317.432 114.499 317.432 116.696V134.024C317.432 136.174 316.282 138.159 314.417 139.229L90.8568 267.454C89.0403 268.495 86.812 268.515 84.9776 267.505L31.106 237.842C29.1901 236.787 28 234.773 28 232.586Z" stroke="#D9D9D7" stroke-width="3"/>
+<path d="M28 212.131L88 246.026M88 246.026L317.5 113.036M88 246.026V268.526" stroke="#D9D9D7"/>
+<rect x="1.29904" width="44.8013" height="44.8013" rx="5.25" transform="matrix(0.866025 -0.5 0.866025 0.5 52.174 211.932)" stroke="#D9D9D7" stroke-width="1.5"/>
+<rect x="1.29904" width="124.39" height="16.2599" rx="5.25" transform="matrix(0.866025 -0.5 0.866025 0.5 112.174 188.726)" stroke="#D9D9D7" stroke-width="1.5"/>
+<rect width="33.4399" height="17.7599" rx="6" transform="matrix(0.866025 -0.5 0.866025 0.5 229 119.333)" fill="#16A34A"/>
+<path d="M17 201.586V184.607C17 182.458 18.1501 180.472 20.0148 179.403L243.591 51.1685C245.399 50.1317 247.615 50.1071 249.445 51.1036L303.301 80.4266C305.23 81.4774 306.432 83.4989 306.432 85.6962V103.024C306.432 105.174 305.282 107.159 303.417 108.229L79.8568 236.454C78.0403 237.495 75.812 237.515 73.9776 236.505L20.106 206.842C18.1901 205.787 17 203.773 17 201.586Z" fill="white"/>
+<path d="M17 201.586V184.607C17 182.458 18.1501 180.472 20.0148 179.403L243.591 51.1685C245.399 50.1317 247.615 50.1071 249.445 51.1036L303.301 80.4266C305.23 81.4774 306.432 83.4989 306.432 85.6962V103.024C306.432 105.174 305.282 107.159 303.417 108.229L79.8568 236.454C78.0403 237.495 75.812 237.515 73.9776 236.505L20.106 206.842C18.1901 205.787 17 203.773 17 201.586Z" fill="url(#pattern2_3926_18897)" fill-opacity="0.25"/>
+<path d="M17 201.586V184.607C17 182.458 18.1501 180.472 20.0148 179.403L243.591 51.1685C245.399 50.1317 247.615 50.1071 249.445 51.1036L303.301 80.4266C305.23 81.4774 306.432 83.4989 306.432 85.6962V103.024C306.432 105.174 305.282 107.159 303.417 108.229L79.8568 236.454C78.0403 237.495 75.812 237.515 73.9776 236.505L20.106 206.842C18.1901 205.787 17 203.773 17 201.586Z" stroke="#6E6E6A" stroke-width="3"/>
+<path d="M17 181.131L77 215.026M77 215.026L306.5 82.0356M77 215.026V237.526" stroke="#6E6E6A"/>
+<rect x="1.29904" width="44.8013" height="44.8013" rx="5.25" transform="matrix(0.866025 -0.5 0.866025 0.5 41.174 180.932)" stroke="#6E6E6A" stroke-width="1.5"/>
+<rect x="1.29904" width="124.39" height="16.2599" rx="5.25" transform="matrix(0.866025 -0.5 0.866025 0.5 101.174 157.726)" stroke="#6E6E6A" stroke-width="1.5"/>
+<rect width="33.4399" height="17.7599" rx="6" transform="matrix(0.866025 -0.5 0.866025 0.5 218 88.333)" fill="#16A34A"/>
+<path d="M6 170.586V153.607C6 151.458 7.15007 149.472 9.01481 148.403L232.591 20.1685C234.399 19.1317 236.615 19.1071 238.445 20.1036L292.301 49.4266C294.23 50.4774 295.432 52.4989 295.432 54.6962V72.0243C295.432 74.174 294.282 76.1594 292.417 77.229L68.8568 205.454C67.0403 206.495 64.812 206.515 62.9776 205.505L9.10598 175.842C7.19009 174.787 6 172.773 6 170.586Z" fill="white" stroke="#131310" stroke-width="3"/>
+<path d="M6 150.131L66 184.026M66 184.026L295.5 51.0356M66 184.026V206.526" stroke="#6E6E6A"/>
+<rect x="0.866025" width="45.3013" height="45.3013" rx="5.5" transform="matrix(0.866025 -0.5 0.866025 0.5 27.116 149.716)" stroke="#6E6E6A"/>
+<rect x="0.866025" width="125.748" height="16.7599" rx="5.5" transform="matrix(0.866025 -0.5 0.866025 0.5 88.116 128.51)" stroke="#6E6E6A"/>
+<rect width="33.4399" height="17.7599" rx="8.87993" transform="matrix(0.866025 -0.5 0.866025 0.5 218 53.2197)" fill="#16A34A"/>
+<defs>
+<pattern id="pattern0_3926_18897" patternUnits="userSpaceOnUse" patternTransform="matrix(16 0 0 16 177.716 198.18)" preserveAspectRatio="none" viewBox="0 0 64 64" width="1" height="1">
+<g id="pattern0_3926_18897_inner">
+<g clip-path="url(#clip0_3926_18897)">
+<path d="M4 96V-32" stroke="#6E6E6A"/>
+<path d="M12 96V-32" stroke="#6E6E6A"/>
+<path d="M20 96V-32" stroke="#6E6E6A"/>
+<path d="M28 96V-32" stroke="#6E6E6A"/>
+<path d="M36 96V-32" stroke="#6E6E6A"/>
+<path d="M44 96V-32" stroke="#6E6E6A"/>
+<path d="M52 96V-32" stroke="#6E6E6A"/>
+<path d="M60 96V-32" stroke="#6E6E6A"/>
+</g>
+</g>
+</pattern><pattern id="pattern1_3926_18897" patternUnits="userSpaceOnUse" patternTransform="matrix(16 0 0 16 164.716 166.811)" preserveAspectRatio="none" viewBox="0 0 64 64" width="1" height="1">
+<g id="pattern1_3926_18897_inner">
+<g clip-path="url(#clip1_3926_18897)">
+<path d="M4 96V-32" stroke="#6E6E6A"/>
+<path d="M12 96V-32" stroke="#6E6E6A"/>
+<path d="M20 96V-32" stroke="#6E6E6A"/>
+<path d="M28 96V-32" stroke="#6E6E6A"/>
+<path d="M36 96V-32" stroke="#6E6E6A"/>
+<path d="M44 96V-32" stroke="#6E6E6A"/>
+<path d="M52 96V-32" stroke="#6E6E6A"/>
+<path d="M60 96V-32" stroke="#6E6E6A"/>
+</g>
+</g>
+</pattern><pattern id="pattern2_3926_18897" patternUnits="userSpaceOnUse" patternTransform="matrix(16 0 0 16 153.716 135.811)" preserveAspectRatio="none" viewBox="0 0 64 64" width="1" height="1">
+<g id="pattern2_3926_18897_inner">
+<g clip-path="url(#clip2_3926_18897)">
+<path d="M4 96V-32" stroke="#6E6E6A"/>
+<path d="M12 96V-32" stroke="#6E6E6A"/>
+<path d="M20 96V-32" stroke="#6E6E6A"/>
+<path d="M28 96V-32" stroke="#6E6E6A"/>
+<path d="M36 96V-32" stroke="#6E6E6A"/>
+<path d="M44 96V-32" stroke="#6E6E6A"/>
+<path d="M52 96V-32" stroke="#6E6E6A"/>
+<path d="M60 96V-32" stroke="#6E6E6A"/>
+</g>
+</g>
+</pattern><clipPath id="clip0_3926_18897">
+<rect width="64" height="64" fill="white"/>
+</clipPath>
+<clipPath id="clip1_3926_18897">
+<rect width="64" height="64" fill="white"/>
+</clipPath>
+<clipPath id="clip2_3926_18897">
+<rect width="64" height="64" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/apps/mesh/public/empty-state-success-muted.svg b/apps/mesh/public/empty-state-success-muted.svg
new file mode 100644
index 0000000000..2e7596d56c
--- /dev/null
+++ b/apps/mesh/public/empty-state-success-muted.svg
@@ -0,0 +1,19 @@
+<svg width="220" height="200" viewBox="0 0 220 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M136.512 52.5108L163.512 37.0853M136.512 52.5108L163.512 67.9363M136.512 52.5108L109.512 67.9363M163.512 37.0853L190.512 52.5108M163.512 37.0853L190.512 21.6599L217.512 37.0853M163.512 37.0853L136.512 21.5L109.512 37.0853M190.512 52.5108L163.512 67.9363M190.512 52.5108L217.512 37.0853M190.512 52.5108L217.512 67.9363L190.512 83.3618M163.512 67.9363L136.512 83.3618M163.512 67.9363L190.512 83.3618M163.512 67.9363L109.512 98.7873M163.512 67.9363L217.512 98.7873M163.512 67.9363L217.512 37.0853M163.512 67.9363L109.512 37.0853M1.51172 98.7873L28.5117 83.3618M1.51172 98.7873L28.5117 114.213M1.51172 98.7873L55.5117 67.9363M1.51172 98.7873L55.5117 129.638M1.51172 98.7873L109.512 37.0853M1.51172 98.7873L109.512 160.489M28.5117 83.3618L55.5117 98.7873M28.5117 83.3618L55.5117 67.9363M28.5117 83.3618L1.51172 67.9363L28.5117 52.5108M55.5117 98.7873L28.5117 114.213M55.5117 98.7873L82.5117 114.213M55.5117 98.7873L82.5117 83.3618M28.5117 114.213L55.5117 129.638M28.5117 114.213L1.51172 129.638L28.5117 145.064M109.512 98.7873L136.512 83.3618M109.512 98.7873L136.512 114.213M109.512 98.7873L82.5117 83.3618M109.512 98.7873L82.5117 114.213M109.512 98.7873L55.5117 67.9363M109.512 98.7873L55.5117 129.638M109.512 98.7873L163.512 129.638M136.512 83.3618L163.512 98.7873M136.512 83.3618L109.512 67.9363M163.512 98.7873L136.512 114.213M163.512 98.7873L190.512 114.213M163.512 98.7873L190.512 83.3618M136.512 114.213L163.512 129.638M136.512 114.213L109.512 129.638M55.5117 67.9363L82.5117 52.5108M55.5117 67.9363L82.5117 83.3618M55.5117 67.9363L28.5117 52.5108M55.5117 67.9363L1.51172 37.0853M55.5117 67.9363L109.512 37.0853M82.5117 52.5108L109.512 67.9363M82.5117 52.5108L109.512 37.0853M82.5117 52.5108L55.5117 37.0853M109.512 67.9363L82.5117 83.3618M82.5117 114.213L55.5117 129.638M82.5117 114.213L109.512 129.638M55.5117 129.638L28.5117 145.064M55.5117 129.638L82.5117 145.064M55.5117 129.638L1.51172 160.489M55.5117 129.638L109.512 160.489M190.512 114.213L163.512 129.638M190.512 114.213L217.512 98.7873M190.512 114.213L217.512 129.638L190.512 145.064M163.512 129.638L190.512 145.064M163.512 129.638L136.512 145.064M163.512 129.638L217.512 98.7873M163.512 129.638L217.512 160.489M163.512 129.638L109.512 160.489M190.512 83.3618L217.512 98.7873M217.512 98.7873L109.512 37.0853M217.512 98.7873L109.512 160.489M190.512 145.064L163.512 160.489M190.512 145.064L217.512 160.489M136.512 145.064L163.512 160.489M136.512 145.064L109.512 129.638M136.512 145.064L109.512 160.489M163.512 160.489L136.512 175.915M163.512 160.489L190.512 175.915L217.512 160.489M28.5117 145.064L55.5117 160.489M28.5117 145.064L1.51172 160.489M82.5117 145.064L55.5117 160.489M82.5117 145.064L109.512 129.638M82.5117 145.064L109.512 160.489M55.5117 160.489L28.5117 175.915L1.51172 160.489M55.5117 160.489L82.5117 175.915M28.5117 52.5108L55.5117 37.0853M28.5117 52.5108L1.51172 37.0853M1.51172 37.0853L28.5117 21.6599L55.5117 37.0853M55.5117 37.0853L82.5117 21.6599L109.512 37.0853M109.512 160.489L136.512 175.915M109.512 160.489L82.5117 175.915M136.512 175.915L163.512 191.34L217.512 160.489M136.512 175.915L109.512 191.5L82.5117 175.915M82.5117 175.915L55.5117 191.34L1.51172 160.489" stroke="url(#paint0_radial_3916_19896)" stroke-width="1.5"/>
+<path d="M63.8511 94.3505L63.5117 107.039C67.1675 140.643 150.153 142.264 155.271 107.769L155.512 94.2546C155.454 87.5326 150.98 80.8208 142.089 75.6921C124.191 65.3676 95.1725 65.3676 77.2745 75.6921C68.3413 80.8453 63.8668 87.5965 63.8511 94.3505Z" fill="white" stroke="black" stroke-width="3"/>
+<path d="M155.54 93.0736C155.766 100.041 151.274 107.051 142.065 112.368C124.086 122.748 94.9373 122.748 76.9588 112.368C67.7494 107.051 63.2575 100.041 63.483 93.0736" stroke="black"/>
+<path d="M76.9848 75.2607C94.9489 64.9118 124.075 64.9118 142.039 75.2607C160.003 85.6096 160.003 102.388 142.039 112.737C124.075 123.086 94.9489 123.086 76.9848 112.737C59.0207 102.388 59.0207 85.6096 76.9848 75.2607Z" stroke="#6E6E6A"/>
+<g clip-path="url(#clip0_3916_19896)">
+<path d="M105.732 90.7932V93.8967H117.827M127.103 92.2672C126.71 92.8133 126.709 93.4271 127.101 93.9736L128.474 95.8885C128.866 96.435 128.866 97.049 128.474 97.5955C128.082 98.142 127.33 98.5762 126.384 98.8026L123.069 99.5952C122.122 99.8217 121.369 100.256 120.978 100.803L119.604 102.716C119.41 102.986 119.126 103.232 118.767 103.44C118.408 103.647 117.982 103.811 117.513 103.923C117.044 104.035 116.542 104.093 116.034 104.093C115.527 104.093 115.024 104.035 114.556 103.923L111.241 103.13C110.295 102.904 109.232 102.903 108.286 103.129L104.969 103.922C104.022 104.149 102.959 104.149 102.012 103.922C101.066 103.696 100.314 103.262 99.9215 102.715L98.5487 100.802C98.156 100.256 97.4037 99.8221 96.4572 99.5962L93.1419 98.8022C92.1964 98.5757 91.4452 98.1418 91.0535 97.5958C90.6618 97.0497 90.6615 96.4362 91.0526 95.8901L92.427 93.9745C92.8195 93.4284 92.8203 92.8146 92.4292 92.2681L91.0555 90.3532C90.6636 89.8069 90.6634 89.1932 91.055 88.6469C91.4466 88.1005 92.1979 87.6663 93.1438 87.4397L96.4582 86.647C97.4041 86.4203 98.1553 85.9859 98.5467 85.4394L99.9243 83.5247C100.118 83.254 100.403 83.008 100.762 82.8008C101.121 82.5935 101.547 82.4292 102.015 82.317C102.484 82.2049 102.987 82.1472 103.494 82.1472C104.002 82.1473 104.504 82.2051 104.973 82.3173L108.288 83.1099C109.233 83.3363 110.295 83.3369 111.241 83.1117L114.558 82.3185C115.504 82.0921 116.568 82.0921 117.514 82.3184C118.461 82.5448 119.213 82.9789 119.605 83.5254L120.978 85.439C121.37 85.9851 122.123 86.4188 123.069 86.6447L126.383 87.4406C127.329 87.667 128.081 88.1011 128.473 88.6475C128.865 89.1938 128.865 89.8077 128.473 90.3542L127.099 92.2697L127.103 92.2672Z" stroke="#6E6E6A" stroke-width="3.795" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<path d="M63.8511 94.3505L63.5117 107.039C67.1675 140.643 150.153 142.264 155.271 107.769L155.512 94.2546C155.454 87.5326 150.98 80.8208 142.089 75.6921C124.191 65.3676 95.1725 65.3676 77.2745 75.6921C68.3413 80.8453 63.8668 87.5965 63.8511 94.3505Z" stroke="black" stroke-width="3"/>
+<defs>
+<radialGradient id="paint0_radial_3916_19896" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(109.512 106.5) rotate(92.6943) scale(85.0941 108.12)">
+<stop stop-color="#D9D9D7"/>
+<stop offset="1" stop-color="#D9D9D7" stop-opacity="0"/>
+</radialGradient>
+<clipPath id="clip0_3916_19896">
+<rect width="37.2416" height="37.2416" fill="white" transform="matrix(0.866025 0.5 -0.866025 0.5 109.764 74.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/apps/mesh/public/empty-state-success.svg b/apps/mesh/public/empty-state-success.svg
new file mode 100644
index 0000000000..c7b9e06f0c
--- /dev/null
+++ b/apps/mesh/public/empty-state-success.svg
@@ -0,0 +1,19 @@
+<svg width="220" height="200" viewBox="0 0 220 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M136.512 52.5108L163.512 37.0853M136.512 52.5108L163.512 67.9363M136.512 52.5108L109.512 67.9363M163.512 37.0853L190.512 52.5108M163.512 37.0853L190.512 21.6599L217.512 37.0853M163.512 37.0853L136.512 21.5L109.512 37.0853M190.512 52.5108L163.512 67.9363M190.512 52.5108L217.512 37.0853M190.512 52.5108L217.512 67.9363L190.512 83.3618M163.512 67.9363L136.512 83.3618M163.512 67.9363L190.512 83.3618M163.512 67.9363L109.512 98.7873M163.512 67.9363L217.512 98.7873M163.512 67.9363L217.512 37.0853M163.512 67.9363L109.512 37.0853M1.51172 98.7873L28.5117 83.3618M1.51172 98.7873L28.5117 114.213M1.51172 98.7873L55.5117 67.9363M1.51172 98.7873L55.5117 129.638M1.51172 98.7873L109.512 37.0853M1.51172 98.7873L109.512 160.489M28.5117 83.3618L55.5117 98.7873M28.5117 83.3618L55.5117 67.9363M28.5117 83.3618L1.51172 67.9363L28.5117 52.5108M55.5117 98.7873L28.5117 114.213M55.5117 98.7873L82.5117 114.213M55.5117 98.7873L82.5117 83.3618M28.5117 114.213L55.5117 129.638M28.5117 114.213L1.51172 129.638L28.5117 145.064M109.512 98.7873L136.512 83.3618M109.512 98.7873L136.512 114.213M109.512 98.7873L82.5117 83.3618M109.512 98.7873L82.5117 114.213M109.512 98.7873L55.5117 67.9363M109.512 98.7873L55.5117 129.638M109.512 98.7873L163.512 129.638M136.512 83.3618L163.512 98.7873M136.512 83.3618L109.512 67.9363M163.512 98.7873L136.512 114.213M163.512 98.7873L190.512 114.213M163.512 98.7873L190.512 83.3618M136.512 114.213L163.512 129.638M136.512 114.213L109.512 129.638M55.5117 67.9363L82.5117 52.5108M55.5117 67.9363L82.5117 83.3618M55.5117 67.9363L28.5117 52.5108M55.5117 67.9363L1.51172 37.0853M55.5117 67.9363L109.512 37.0853M82.5117 52.5108L109.512 67.9363M82.5117 52.5108L109.512 37.0853M82.5117 52.5108L55.5117 37.0853M109.512 67.9363L82.5117 83.3618M82.5117 114.213L55.5117 129.638M82.5117 114.213L109.512 129.638M55.5117 129.638L28.5117 145.064M55.5117 129.638L82.5117 145.064M55.5117 129.638L1.51172 160.489M55.5117 129.638L109.512 160.489M190.512 114.213L163.512 129.638M190.512 114.213L217.512 98.7873M190.512 114.213L217.512 129.638L190.512 145.064M163.512 129.638L190.512 145.064M163.512 129.638L136.512 145.064M163.512 129.638L217.512 98.7873M163.512 129.638L217.512 160.489M163.512 129.638L109.512 160.489M190.512 83.3618L217.512 98.7873M217.512 98.7873L109.512 37.0853M217.512 98.7873L109.512 160.489M190.512 145.064L163.512 160.489M190.512 145.064L217.512 160.489M136.512 145.064L163.512 160.489M136.512 145.064L109.512 129.638M136.512 145.064L109.512 160.489M163.512 160.489L136.512 175.915M163.512 160.489L190.512 175.915L217.512 160.489M28.5117 145.064L55.5117 160.489M28.5117 145.064L1.51172 160.489M82.5117 145.064L55.5117 160.489M82.5117 145.064L109.512 129.638M82.5117 145.064L109.512 160.489M55.5117 160.489L28.5117 175.915L1.51172 160.489M55.5117 160.489L82.5117 175.915M28.5117 52.5108L55.5117 37.0853M28.5117 52.5108L1.51172 37.0853M1.51172 37.0853L28.5117 21.6599L55.5117 37.0853M55.5117 37.0853L82.5117 21.6599L109.512 37.0853M109.512 160.489L136.512 175.915M109.512 160.489L82.5117 175.915M136.512 175.915L163.512 191.34L217.512 160.489M136.512 175.915L109.512 191.5L82.5117 175.915M82.5117 175.915L55.5117 191.34L1.51172 160.489" stroke="url(#paint0_radial_3916_19896)" stroke-width="1.5"/>
+<path d="M63.8511 94.3505L63.5117 107.039C67.1675 140.643 150.153 142.264 155.271 107.769L155.512 94.2546C155.454 87.5326 150.98 80.8208 142.089 75.6921C124.191 65.3676 95.1725 65.3676 77.2745 75.6921C68.3413 80.8453 63.8668 87.5965 63.8511 94.3505Z" fill="white" stroke="black" stroke-width="3"/>
+<path d="M155.54 93.0736C155.766 100.041 151.274 107.051 142.065 112.368C124.086 122.748 94.9373 122.748 76.9588 112.368C67.7494 107.051 63.2575 100.041 63.483 93.0736" stroke="black"/>
+<path d="M76.9848 75.2607C94.9489 64.9118 124.075 64.9118 142.039 75.2607C160.003 85.6096 160.003 102.388 142.039 112.737C124.075 123.086 94.9489 123.086 76.9848 112.737C59.0207 102.388 59.0207 85.6096 76.9848 75.2607Z" fill="#D0EC1A" stroke="#131310"/>
+<g clip-path="url(#clip0_3916_19896)">
+<path d="M105.732 90.7932V93.8967H117.827M127.103 92.2672C126.71 92.8133 126.709 93.4271 127.101 93.9736L128.474 95.8885C128.866 96.435 128.866 97.049 128.474 97.5955C128.082 98.142 127.33 98.5762 126.384 98.8026L123.069 99.5952C122.122 99.8217 121.369 100.256 120.978 100.803L119.604 102.716C119.41 102.986 119.126 103.232 118.767 103.44C118.408 103.647 117.982 103.811 117.513 103.923C117.044 104.035 116.542 104.093 116.034 104.093C115.527 104.093 115.024 104.035 114.556 103.923L111.241 103.13C110.295 102.904 109.232 102.903 108.286 103.129L104.969 103.922C104.022 104.149 102.959 104.149 102.012 103.922C101.066 103.696 100.314 103.262 99.9215 102.715L98.5487 100.802C98.156 100.256 97.4037 99.8221 96.4572 99.5962L93.1419 98.8022C92.1964 98.5757 91.4452 98.1418 91.0535 97.5958C90.6618 97.0497 90.6615 96.4362 91.0526 95.8901L92.427 93.9745C92.8195 93.4284 92.8203 92.8146 92.4292 92.2681L91.0555 90.3532C90.6636 89.8069 90.6634 89.1932 91.055 88.6469C91.4466 88.1005 92.1979 87.6663 93.1438 87.4397L96.4582 86.647C97.4041 86.4203 98.1553 85.9859 98.5467 85.4394L99.9243 83.5247C100.118 83.254 100.403 83.008 100.762 82.8008C101.121 82.5935 101.547 82.4292 102.015 82.317C102.484 82.2049 102.987 82.1472 103.494 82.1472C104.002 82.1473 104.504 82.2051 104.973 82.3173L108.288 83.1099C109.233 83.3363 110.295 83.3369 111.241 83.1117L114.558 82.3185C115.504 82.0921 116.568 82.0921 117.514 82.3184C118.461 82.5448 119.213 82.9789 119.605 83.5254L120.978 85.439C121.37 85.9851 122.123 86.4188 123.069 86.6447L126.383 87.4406C127.329 87.667 128.081 88.1011 128.473 88.6475C128.865 89.1938 128.865 89.8077 128.473 90.3542L127.099 92.2697L127.103 92.2672Z" stroke="#07401A" stroke-width="3.795" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<path d="M63.8511 94.3505L63.5117 107.039C67.1675 140.643 150.153 142.264 155.271 107.769L155.512 94.2546C155.454 87.5326 150.98 80.8208 142.089 75.6921C124.191 65.3676 95.1725 65.3676 77.2745 75.6921C68.3413 80.8453 63.8668 87.5965 63.8511 94.3505Z" stroke="black" stroke-width="3"/>
+<defs>
+<radialGradient id="paint0_radial_3916_19896" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(109.512 106.5) rotate(92.6943) scale(85.0941 108.12)">
+<stop stop-color="#D9D9D7"/>
+<stop offset="1" stop-color="#D9D9D7" stop-opacity="0"/>
+</radialGradient>
+<clipPath id="clip0_3916_19896">
+<rect width="37.2416" height="37.2416" fill="white" transform="matrix(0.866025 0.5 -0.866025 0.5 109.764 74.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/apps/mesh/src/web/components/details/connection/settings-tab/index.tsx b/apps/mesh/src/web/components/details/connection/settings-tab/index.tsx
index 27344eb015..cca10aa6ad 100644
--- a/apps/mesh/src/web/components/details/connection/settings-tab/index.tsx
+++ b/apps/mesh/src/web/components/details/connection/settings-tab/index.tsx
@@ -398,6 +398,15 @@ function SettingsRightPanel({
     return (
       <div className="w-3/5 min-w-0 overflow-auto flex items-center justify-center">
         <EmptyState
+          image={
+            <img
+              src="/empty-state-success-muted.svg"
+              alt=""
+              width={220}
+              height={200}
+              aria-hidden="true"
+            />
+          }
           title="This server is all set!"
           description="No additional configuration is needed. Everything is ready to go."
         />
diff --git a/apps/mesh/src/web/routes/oauth-callback.tsx b/apps/mesh/src/web/routes/oauth-callback.tsx
index 0696eb86cc..494c1e6d1e 100644
--- a/apps/mesh/src/web/routes/oauth-callback.tsx
+++ b/apps/mesh/src/web/routes/oauth-callback.tsx
@@ -1,11 +1,5 @@
 import { useEffect, useState } from "react";
-import {
-  Card,
-  CardContent,
-  CardHeader,
-  CardTitle,
-} from "@deco/ui/components/card.tsx";
-import { CheckCircle, AlertCircle, Loading01 } from "@untitledui/icons";
+import { Loading01 } from "@untitledui/icons";
 import { handleOAuthCallback } from "@/web/lib/mcp-oauth";
 
 export default function OAuthCallback() {
@@ -46,51 +40,68 @@ export default function OAuthCallback() {
   }, []);
 
   return (
-    <div className="min-h-screen flex items-center justify-center p-4 bg-background">
-      <Card className="w-full max-w-md">
-        <CardHeader>
-          <CardTitle className="flex items-center gap-2">
+    <div className="min-h-screen flex items-center justify-center p-8 bg-background">
+      <div className="w-full max-w-md flex flex-col items-center justify-center gap-8">
+        {/* Image */}
+        {success && (
+          <img
+            src="/empty-state-success.svg"
+            alt=""
+            width={220}
+            height={200}
+            aria-hidden="true"
+          />
+        )}
+
+        {/* Loading spinner */}
+        {!success && !error && (
+          <div className="flex items-center justify-center py-4">
+            <Loading01 size={32} className="animate-spin text-primary" />
+          </div>
+        )}
+
+        {/* Error image */}
+        {error && (
+          <img
+            src="/empty-state-error.svg"
+            alt=""
+            width={220}
+            height={200}
+            aria-hidden="true"
+          />
+        )}
+
+        {/* Text content */}
+        <div className="flex flex-col items-center gap-2 text-center">
+          <h2 className="text-lg font-medium text-foreground">
+            {error
+              ? "Authentication Failed"
+              : success
+                ? "Authentication Successful"
+                : "Authentication in progress..."}
+          </h2>
+          <div className="text-sm text-muted-foreground">
             {error ? (
               <>
-                <AlertCircle className="h-5 w-5 text-destructive" />
-                Authentication Failed
+                <p className="mb-2">An error occurred during authentication:</p>
+                <p className="text-destructive">{error}</p>
+                <p className="mt-2">
+                  <br />
+                  This window will close automatically.
+                </p>
               </>
             ) : success ? (
-              <>
-                <CheckCircle className="h-5 w-5 text-green-600" />
-                Authentication Successful
-              </>
+              <p>
+                Authentication complete.
+                <br />
+                This window will close automatically.
+              </p>
             ) : (
-              <>
-                <Loading01 className="h-5 w-5 animate-spin" />
-                Authentication in progress...
-              </>
+              <p>Processing authentication...</p>
             )}
-          </CardTitle>
-        </CardHeader>
-        <CardContent className="space-y-4">
-          {error ? (
-            <div className="text-sm text-muted-foreground">
-              <p className="mb-2">An error occurred during authentication:</p>
-              <p className="text-destructive">{error}</p>
-              <p className="mt-4">This window will close automatically.</p>
-            </div>
-          ) : success ? (
-            <p className="text-sm text-muted-foreground text-center">
-              Authentication complete. This window will close automatically.
-            </p>
-          ) : (
-            <>
-              <div className="flex items-center justify-center py-4">
-                <Loading01 size={32} className="animate-spin text-primary" />
-              </div>
-              <p className="text-sm text-muted-foreground text-center">
-                Processing authentication...
-              </p>
-            </>
-          )}
-        </CardContent>
-      </Card>
+          </div>
+        </div>
+      </div>
     </div>
   );
 }
diff --git a/apps/mesh/src/web/routes/orgs/monitoring.tsx b/apps/mesh/src/web/routes/orgs/monitoring.tsx
index f11ccecf24..dc27ad55e1 100644
--- a/apps/mesh/src/web/routes/orgs/monitoring.tsx
+++ b/apps/mesh/src/web/routes/orgs/monitoring.tsx
@@ -348,6 +348,15 @@ function MonitoringLogsTableContent({
     return (
       <div className="flex-1 flex items-center justify-center">
         <EmptyState
+          image={
+            <img
+              src="/empty-state-logs.svg"
+              alt=""
+              width={336}
+              height={320}
+              aria-hidden="true"
+            />
+          }
           title="No logs found"
           description={
             searchQuery ||