diff --git a/src/images/icons/ogp.png b/src/images/icons/ogp.png
new file mode 100644
index 0000000..093f3f5
Binary files /dev/null and b/src/images/icons/ogp.png differ
diff --git a/src/images/logo_black.png b/src/images/logo_black.png
deleted file mode 100644
index d5967ed..0000000
Binary files a/src/images/logo_black.png and /dev/null differ
diff --git a/src/images/ogp.png b/src/images/ogp.png
deleted file mode 100644
index eddcc35..0000000
Binary files a/src/images/ogp.png and /dev/null differ
diff --git a/src/images/source/badge_icon_black.png b/src/images/source/badge_icon_black.png
new file mode 100644
index 0000000..093f3f5
Binary files /dev/null and b/src/images/source/badge_icon_black.png differ
diff --git a/src/images/source/badge_icon_default.png b/src/images/source/badge_icon_default.png
new file mode 100644
index 0000000..ad8d26e
Binary files /dev/null and b/src/images/source/badge_icon_default.png differ
diff --git a/src/images/source/badge_icon_message.png b/src/images/source/badge_icon_message.png
new file mode 100644
index 0000000..b45df54
Binary files /dev/null and b/src/images/source/badge_icon_message.png differ
diff --git a/src/images/source/badge_icon_transparent_dark.png b/src/images/source/badge_icon_transparent_dark.png
new file mode 100644
index 0000000..ed7f8fb
Binary files /dev/null and b/src/images/source/badge_icon_transparent_dark.png differ
diff --git a/src/images/source/badge_icon_transparent_light.png b/src/images/source/badge_icon_transparent_light.png
new file mode 100644
index 0000000..62a1e3a
Binary files /dev/null and b/src/images/source/badge_icon_transparent_light.png differ
diff --git a/src/images/source/logo_title_waves.png b/src/images/source/logo_title_waves.png
new file mode 100644
index 0000000..76dbc09
Binary files /dev/null and b/src/images/source/logo_title_waves.png differ
diff --git a/src/images/source/main_marker.png b/src/images/source/main_marker.png
new file mode 100644
index 0000000..aede923
Binary files /dev/null and b/src/images/source/main_marker.png differ
diff --git a/src/images/source/ogp.xcf b/src/images/source/ogp.xcf
deleted file mode 100644
index 84c215c..0000000
Binary files a/src/images/source/ogp.xcf and /dev/null differ
diff --git a/src/images/spot-logo.svg b/src/images/source/spot-logo.svg
similarity index 100%
rename from src/images/spot-logo.svg
rename to src/images/source/spot-logo.svg
diff --git a/src/images/source/spot.svg b/src/images/source/spot.svg
deleted file mode 100644
index 8d6f564..0000000
--- a/src/images/source/spot.svg
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="spot.svg"
-   width="512"
-   height="512"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   inkscape:export-filename="C:\Users\francois\Downloads\footprint_mapbox.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8">
-    <linearGradient
-       id="linearGradient4520"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#6dff58;stop-opacity:1;"
-         offset="0"
-         id="stop4518" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter4696">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4686" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite4688" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="3"
-         result="blur"
-         id="feGaussianBlur4690" />
-      <feOffset
-         dx="3"
-         dy="3"
-         result="offset"
-         id="feOffset4692" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite4694" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter5223">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood5213" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite5215" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur5217" />
-      <feOffset
-         dx="1.2"
-         dy="1.2"
-         result="offset"
-         id="feOffset5219" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite5221" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview6"
-     showgrid="false"
-     inkscape:snap-grids="true"
-     inkscape:zoom="1.3037281"
-     inkscape:cx="248.69883"
-     inkscape:cy="256.06919"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4"
-     units="px" />
-  <path
-     id="path4698"
-     d="M 14.766749,479.35437 C 5.685625,466.18943 4,464.83831 4,460 c 0,-6.62744 5.372562,-12 11.999999,-12 6.627437,0 11.999998,5.37256 11.999998,12 0,4.83831 -1.685625,6.18943 -10.766748,19.35437 -0.595937,0.86087 -1.870625,0.86081 -2.4665,0 z"
-     inkscape:connector-curvature="0"
-     style="fill:#6dff58;fill-opacity:1;stroke:none;stroke-width:0.06249999;stroke-opacity:1;filter:url(#filter5223)"
-     inkscape:label="marker"
-     transform="matrix(13.333333,0,0,13.333333,42.666662,-5930.6664)" />
-  <path
-     id="shoes"
-     d="m 221.87402,255.01429 v -11.375 h -45.49995 v 11.375 c 0,12.56578 10.18419,22.74983 22.74997,22.74983 12.56579,0 22.74998,-10.18405 22.74998,-22.74983 z m 90.99975,68.24979 c 12.56579,0 22.74982,-10.18419 22.74982,-22.74998 v -11.37499 h -45.4998 v 11.37499 c 0,12.56579 10.18419,22.74998 22.74998,22.74998 z M 267.37383,203.30789 c 0,12.40941 4.66373,27.07248 11.37498,37.22819 5.82257,8.81203 11.37498,15.8254 11.37498,37.22804 h 45.4998 l 5.67685,-20.45001 c 2.58791,-9.31681 4.66375,-18.84333 5.34988,-28.54756 0.8216,-11.6203 0.23791,-23.31873 -2.20387,-34.68656 -8.36069,-38.91663 -26.87344,-52.81544 -42.94766,-52.81544 -22.74998,0 -34.12496,29.92325 -34.12496,62.04334 z m -99.81881,-54.72772 c -2.44205,11.36784 -3.02861,23.06626 -2.20402,34.68644 0.68639,9.70437 2.7621,19.23086 5.34624,28.54769 l 5.67683,20.45002 h 45.49995 c 0,-21.39914 5.55243,-28.41615 11.37498,-37.22818 6.71124,-10.15572 11.37499,-24.81865 11.37499,-37.22807 0,-32.12008 -11.37499,-62.043305 -34.12495,-62.043305 -16.07422,0 -34.58699,13.898815 -42.94402,52.815405 z"
-     inkscape:connector-curvature="0"
-     style="fill:#326526;fill-opacity:1;stroke-width:0.35546762" />
-</svg>
diff --git a/src/masks/index.html b/src/masks/index.html
index 09c92cd..4c13327 100644
--- a/src/masks/index.html
+++ b/src/masks/index.html
@@ -8,7 +8,7 @@
 	<meta property="og:description" content="[#]lang:meta.page_og_desc[#]" />
 	<meta property="og:type" content="website" />
 	<meta property="og:url" content="[#]server[#]" />
-	<meta property="og:image" content="images/ogp.png" />
+	<meta property="og:image" content="images/icons/ogp.png" />
 	<meta property="og:locale" content="[#]lang:meta.locale[#]" />
 	<link rel="icon" type="image/png" href="images/icons/favicon-96x96.png?v=20260525" sizes="96x96" />
 	<link rel="icon" type="image/svg+xml" href="images/icons/favicon.svg?v=20260525" />