diff --git a/docker-compose.yml b/docker-compose.yml
index 2fa58ca..7257265 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -96,6 +96,8 @@ services:
       - ANILIST=https://anilist.co/
       - GITBUCKET=https://gitbucket.github.io/
       - SHAZAM=https://www.shazam.com/myshazam
+      - TPDB=https://theposterdb.com/
+      - FLICKR=https://www.flickr.com/
       - OG_SITE_NAME=Techno Tim Live (OG)
       - OG_TITLE=Techno Tim (OG)
       - OG_DESCRIPTION=Techno Tim Link page (OG)
diff --git a/public/css/brands.css b/public/css/brands.css
index c6611c4..cd5eda3 100644
--- a/public/css/brands.css
+++ b/public/css/brands.css
@@ -457,4 +457,16 @@ button {
 .button.button-shazam {
   color: #fff;
   background-color: #1f5bfc
+}
+
+/* Flickr */
+.button.button-flickr {
+  color: #fff;
+  background-color: #000
+}
+
+/* TPDB */
+.button.button-tpdb {
+  color: #fff;
+  background-color: #FA6940
 }
\ No newline at end of file
diff --git a/src/components/Home/Home.js b/src/components/Home/Home.js
index 0900399..a2d84b5 100644
--- a/src/components/Home/Home.js
+++ b/src/components/Home/Home.js
@@ -68,6 +68,8 @@ import matrixLogo from '../../icons/matrix.svg';
 import anilistLogo from '../../icons/anilist.svg';
 import gitbucketLogo from '../../icons/gitbucket.svg';
 import shazamLogo from '../../icons/shazam.svg';
+import flickrLogo from '../../icons/flickr.svg';
+import tpdbLogo from '../../icons/tpdb.svg';
 
 function Home(props) {
   let order = [];
@@ -728,6 +730,24 @@ function Home(props) {
                   order={buttonOrder('SHAZAM')}
                 />
               )}
+              {runtimeConfig.FLICKR && (
+                <Button
+                  name="flickr"
+                  href={runtimeConfig.FLICKR}
+                  displayName="Flickr"
+                  logo={flickrLogo}
+                  order={buttonOrder('FLICKR')}
+                />
+              )}
+              {runtimeConfig.TPDB && (
+                <Button
+                  name="tpdb"
+                  href={runtimeConfig.TPDB}
+                  displayName="The Poster Database"
+                  logo={tpdbLogo}
+                  order={buttonOrder('TPDB')}
+                />
+              )}
             </Sort>
             <div>
               <p className="footer">
diff --git a/src/config.js b/src/config.js
index 3c0d8c5..78d6d4b 100644
--- a/src/config.js
+++ b/src/config.js
@@ -109,6 +109,8 @@ export const runtimeConfig =
         ANILIST: window?.env?.ANILIST,
         GITBUCKET: window?.env?.GITBUCKET,
         SHAZAM: window?.env?.SHAZAM,
+        FLICKR: window?.env?.FLICKR,
+        TPDB: window?.env?.TPDB,
         MATOMO_URL: window?.env?.MATOMO_URL,
         MATOMO_SITE_ID: window?.env?.MATOMO_SITE_ID,
         SHARE: window?.env?.SHARE,
@@ -398,6 +400,10 @@ export const runtimeConfig =
         SHAZAM: nodeIsProduction
           ? process.env.SHAZAM
           : process.env.RAZZLE_SHAZAM,
+        FLICKR: nodeIsProduction
+          ? process.env.FLICKR
+          : process.env.RAZZLE_FLICKR,
+        TPDB: nodeIsProduction ? process.env.TPDB : process.env.RAZZLE_TPDB,
         MATOMO_URL: nodeIsProduction
           ? process.env.MATOMO_URL
           : process.env.RAZZLE_MATOMO_URL,
diff --git a/src/icons/flickr.svg b/src/icons/flickr.svg
new file mode 100644
index 0000000..71ad56f
--- /dev/null
+++ b/src/icons/flickr.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="1160" viewBox="28.861 41.416 47.754 22.153"><path fill="#FF0084" d="M54.461 52.492c0 6.117 4.96 11.077 11.078 11.077 6.117 0 11.076-4.96 11.076-11.077s-4.959-11.076-11.076-11.076c-6.118 0-11.078 4.959-11.078 11.076z"/><path fill="#0063DC" d="M28.861 52.492c0 6.117 4.959 11.077 11.077 11.077s11.077-4.96 11.077-11.077-4.959-11.076-11.077-11.076-11.077 4.959-11.077 11.076z"/></svg>
\ No newline at end of file
diff --git a/src/icons/tpdb.svg b/src/icons/tpdb.svg
new file mode 100644
index 0000000..8ea79b3
--- /dev/null
+++ b/src/icons/tpdb.svg
@@ -0,0 +1,26 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 228.0628 256.9292">
+  <defs>
+    <linearGradient id="linear-gradient" x1="-653.872" y1="564.413" x2="-653.422" y2="564.413" gradientTransform="matrix(-123.1042, -544.0433, -611.0961, 138.2768, 264555.2575, -433542.1851)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#f76237"/>
+      <stop offset="1" stop-color="#ff754f"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-2" x1="-655.5937" y1="561.8709" x2="-655.1435" y2="561.8709" gradientTransform="matrix(0, -164.4193, -164.4193, 0, 92496.7158, -107584.8649)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff" stop-opacity="0.5"/>
+      <stop offset="1" stop-color="#fff" stop-opacity="0.38"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-3" x1="-656.324" y1="561.4897" x2="-655.8739" y2="561.4897" gradientTransform="matrix(-0.5376, -145.9384, -145.9384, 0.5376, 81704.4748, -95923.799)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff" stop-opacity="0.75"/>
+      <stop offset="1" stop-color="#fff" stop-opacity="0.56"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-4" x1="-656.6454" y1="561.5017" x2="-656.1953" y2="561.5017" gradientTransform="matrix(0, -146.9314, -146.9314, 0, 82616.0499, -96363.8194)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff"/>
+      <stop offset="1" stop-color="#fff" stop-opacity="0.75"/>
+    </linearGradient>
+  </defs>
+  <g id="logoMark">
+    <path id="logoMark_PathItem_" data-name="logoMark &lt;PathItem&gt;" d="M128.7334,3.9393l83.7617,48.36A31.1355,31.1355,0,0,1,228.0628,79.264v95.7193a31.136,31.136,0,0,1-15.5677,26.9646l-89.9818,51.9507a16.9623,16.9623,0,0,1-16.9638,0L15.5677,201.9479A31.136,31.136,0,0,1,0,174.9833V79.264A31.1355,31.1355,0,0,1,15.5677,52.2994L99.33,3.9393a29.4036,29.4036,0,0,1,29.4035,0" style="fill-rule: evenodd;fill: url(#linear-gradient)"/>
+    <path id="logoMark_PathItem_2" data-name="logoMark &lt;PathItem&gt;" d="M123.4663,125.16l68.7751,38.5366a8.1942,8.1942,0,0,1,0,14.4046l-68.7751,38.5371a18.8722,18.8722,0,0,1-18.3867,0L36.3055,178.1011a8.1942,8.1942,0,0,1,0-14.4046L105.08,125.16a18.8722,18.8722,0,0,1,18.3867,0" style="fill-rule: evenodd;fill: url(#linear-gradient-2)"/>
+    <path id="logoMark_PathItem_3" data-name="logoMark &lt;PathItem&gt;" d="M123.4663,82.3463l68.7751,38.5375a8.1934,8.1934,0,0,1,0,14.4037l-68.7751,38.5376a18.8722,18.8722,0,0,1-18.3867,0L36.3055,135.2875a8.1934,8.1934,0,0,1,0-14.4037L105.08,82.3463a18.8743,18.8743,0,0,1,18.3867,0" style="fill-rule: evenodd;fill: url(#linear-gradient-3)"/>
+    <path id="logoMark_PathItem_4" data-name="logoMark &lt;PathItem&gt;" d="M122.9823,39.5331l68.7751,38.5376a8.1938,8.1938,0,0,1,0,14.4041l-68.7751,38.5371a18.8745,18.8745,0,0,1-18.3868,0L35.8214,92.4748a8.1938,8.1938,0,0,1,0-14.4041l68.7741-38.5376a18.875,18.875,0,0,1,18.3868,0" style="fill-rule: evenodd;fill: url(#linear-gradient-4)"/>
+  </g>
+</svg>