diff --git a/desktop/app.js b/desktop/app.js
index bc67687..9d8b9d8 100644
--- a/desktop/app.js
+++ b/desktop/app.js
@@ -1455,11 +1455,12 @@ async function init() {
   };
 
   // --- GIF Picker Logic ---
-  const GIPHY_API_KEY = "dc6zaTOxFJmzC"; // Public beta key
+  const TENOR_API_KEY = "exTiFGKJ0CzESIHzVQWy3pRO8I1MAdpRomg95DBSu2sg6e7YcHgThMI4giGAx8D0"; // Placeholder / Public key if available, otherwise "YOUR_API_KEY"
+  const TENOR_CLIENT_KEY = "pavel-discord";
 
   el.gifBtn.onclick = () => {
     el.gifPicker.classList.remove("hidden");
-    searchGifs(""); // Initial trending search
+    searchGifs(""); // Initial featured search
   };
 
   el.gifPickerClose.onclick = () => {
@@ -1476,14 +1477,15 @@ async function init() {
 
   async function searchGifs(query) {
     el.gifResults.innerHTML = '<div class="gif-loading">Searching...</div>';
+    const baseUrl = "https://api.klipy.com/v2";
     const endpoint = query
-      ? `https://api.giphy.com/v1/gifs/search?api_key=${GIPHY_API_KEY}&q=${encodeURIComponent(query)}&limit=20`
-      : `https://api.giphy.com/v1/gifs/trending?api_key=${GIPHY_API_KEY}&limit=20`;
+      ? `${baseUrl}/search?q=${encodeURIComponent(query)}&key=${TENOR_API_KEY}&client_key=${TENOR_CLIENT_KEY}&limit=20`
+      : `${baseUrl}/featured?key=${TENOR_API_KEY}&client_key=${TENOR_CLIENT_KEY}&limit=20`;
 
     try {
       const res = await fetch(endpoint);
       const data = await res.json();
-      renderGifs(data.data);
+      renderGifs(data.results);
     } catch (err) {
       el.gifResults.innerHTML = '<div class="gif-loading">Error loading GIFs</div>';
     }
@@ -1497,12 +1499,15 @@ async function init() {
     }
 
     gifs.forEach(gif => {
-      const imgUrl = gif.images.fixed_height.url;
+      // Use tinygif for preview, standard gif for sending
+      const previewUrl = gif.media_formats.tinygif.url;
+      const fullUrl = gif.media_formats.gif.url;
+
       const item = document.createElement("div");
       item.className = "gif-item";
-      item.innerHTML = `<img src="${imgUrl}" loading="lazy" />`;
+      item.innerHTML = `<img src="${previewUrl}" loading="lazy" />`;
       item.onclick = () => {
-        sendGif(imgUrl);
+        sendGif(fullUrl);
         el.gifPicker.classList.add("hidden");
         el.gifSearchInput.value = "";
       };
diff --git a/desktop/styles.css b/desktop/styles.css
index 218927d..7bfb922 100644
--- a/desktop/styles.css
+++ b/desktop/styles.css
@@ -864,6 +864,94 @@ select {
   object-fit: contain;
 }
 
+/* ═══════════════════════════════════════════════════════════ */
+/*  Sound Board                                               */
+/* ═══════════════════════════════════════════════════════════ */
+.soundboard-container {
+  padding: 12px;
+  background: var(--bg-secondary);
+  border-top: 1px solid rgba(255, 255, 255, 0.03);
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.soundboard-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 12px;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.4px;
+  color: var(--text-muted);
+}
+
+.soundboard-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
+  gap: 8px;
+  max-height: 200px;
+  overflow-y: auto;
+}
+
+.sound-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  padding: 10px 8px;
+  background: var(--bg-darker);
+  border-radius: var(--radius-md);
+  cursor: pointer;
+  transition: all var(--transition);
+  border: 1px solid transparent;
+  position: relative;
+}
+
+.sound-item:hover {
+  background: var(--bg-modifier-hover);
+  transform: translateY(-2px);
+  border-color: rgba(255, 255, 255, 0.06);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
+}
+
+.sound-item:active {
+  transform: scale(0.95);
+}
+
+.sound-delete {
+  position: absolute;
+  top: 4px;
+  right: 4px;
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  background: rgba(0, 0, 0, 0.6);
+  color: var(--text-muted);
+  display: grid;
+  place-items: center;
+  opacity: 0;
+  transition: all var(--transition);
+  z-index: 2;
+}
+
+.sound-delete:hover {
+  background: var(--danger);
+  color: #fff;
+  transform: scale(1.1);
+}
+
+.sound-item:hover .sound-delete {
+  opacity: 1;
+}
+
+.sound-icon {
+  font-size: 24px;
+  display: block;
+  object-fit: contain;
+}
+
 .sound-name {
   font-size: 11px;
   text-align: center;
diff --git a/static/app.js b/static/app.js
index adc84c9..85b910d 100644
--- a/static/app.js
+++ b/static/app.js
@@ -1434,11 +1434,12 @@ async function init() {
   };
 
   // --- GIF Picker Logic ---
-  const GIPHY_API_KEY = "dc6zaTOxFJmzC"; // Public beta key
+  const TENOR_API_KEY = "exTiFGKJ0CzESIHzVQWy3pRO8I1MAdpRomg95DBSu2sg6e7YcHgThMI4giGAx8D0"; // Placeholder / Public key if available, otherwise "YOUR_API_KEY"
+  const TENOR_CLIENT_KEY = "pavel-discord";
 
   el.gifBtn.onclick = () => {
     el.gifPicker.classList.remove("hidden");
-    searchGifs(""); // Initial trending search
+    searchGifs(""); // Initial featured search
   };
 
   el.gifPickerClose.onclick = () => {
@@ -1455,14 +1456,15 @@ async function init() {
 
   async function searchGifs(query) {
     el.gifResults.innerHTML = '<div class="gif-loading">Searching...</div>';
+    const baseUrl = "https://api.klipy.com/v2";
     const endpoint = query
-      ? `https://api.giphy.com/v1/gifs/search?api_key=${GIPHY_API_KEY}&q=${encodeURIComponent(query)}&limit=20`
-      : `https://api.giphy.com/v1/gifs/trending?api_key=${GIPHY_API_KEY}&limit=20`;
+      ? `${baseUrl}/search?q=${encodeURIComponent(query)}&key=${TENOR_API_KEY}&client_key=${TENOR_CLIENT_KEY}&limit=20`
+      : `${baseUrl}/featured?key=${TENOR_API_KEY}&client_key=${TENOR_CLIENT_KEY}&limit=20`;
 
     try {
       const res = await fetch(endpoint);
       const data = await res.json();
-      renderGifs(data.data);
+      renderGifs(data.results);
     } catch (err) {
       el.gifResults.innerHTML = '<div class="gif-loading">Error loading GIFs</div>';
     }
@@ -1476,12 +1478,15 @@ async function init() {
     }
 
     gifs.forEach(gif => {
-      const imgUrl = gif.images.fixed_height.url;
+      // Use tinygif for preview, standard gif for sending
+      const previewUrl = gif.media_formats.tinygif.url;
+      const fullUrl = gif.media_formats.gif.url;
+
       const item = document.createElement("div");
       item.className = "gif-item";
-      item.innerHTML = `<img src="${imgUrl}" loading="lazy" />`;
+      item.innerHTML = `<img src="${previewUrl}" loading="lazy" />`;
       item.onclick = () => {
-        sendGif(imgUrl);
+        sendGif(fullUrl);
         el.gifPicker.classList.add("hidden");
         el.gifSearchInput.value = "";
       };
diff --git a/static/styles.css b/static/styles.css
index 218927d..7bfb922 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -864,6 +864,94 @@ select {
   object-fit: contain;
 }
 
+/* ═══════════════════════════════════════════════════════════ */
+/*  Sound Board                                               */
+/* ═══════════════════════════════════════════════════════════ */
+.soundboard-container {
+  padding: 12px;
+  background: var(--bg-secondary);
+  border-top: 1px solid rgba(255, 255, 255, 0.03);
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.soundboard-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 12px;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.4px;
+  color: var(--text-muted);
+}
+
+.soundboard-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
+  gap: 8px;
+  max-height: 200px;
+  overflow-y: auto;
+}
+
+.sound-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  padding: 10px 8px;
+  background: var(--bg-darker);
+  border-radius: var(--radius-md);
+  cursor: pointer;
+  transition: all var(--transition);
+  border: 1px solid transparent;
+  position: relative;
+}
+
+.sound-item:hover {
+  background: var(--bg-modifier-hover);
+  transform: translateY(-2px);
+  border-color: rgba(255, 255, 255, 0.06);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
+}
+
+.sound-item:active {
+  transform: scale(0.95);
+}
+
+.sound-delete {
+  position: absolute;
+  top: 4px;
+  right: 4px;
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  background: rgba(0, 0, 0, 0.6);
+  color: var(--text-muted);
+  display: grid;
+  place-items: center;
+  opacity: 0;
+  transition: all var(--transition);
+  z-index: 2;
+}
+
+.sound-delete:hover {
+  background: var(--danger);
+  color: #fff;
+  transform: scale(1.1);
+}
+
+.sound-item:hover .sound-delete {
+  opacity: 1;
+}
+
+.sound-icon {
+  font-size: 24px;
+  display: block;
+  object-fit: contain;
+}
+
 .sound-name {
   font-size: 11px;
   text-align: center;