diff --git a/public/js/app.js b/public/js/app.js
index 5b2c2e4..2d55fa9 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -409,11 +409,6 @@ function buildPopupHtml(feature) {
     if (props.photo_path) {
         html += '<div class="popup-photo-container" id="photo-container-' + props.contribution_id + '" style="display:none;">' +
                     '<img src="' + escapeHtml(props.photo_path) + '" alt="Foto" class="popup-photo-img" onclick="window.open(\'' + escapeHtml(props.photo_path) + '\', \'_blank\')">' +
-                '</div>' +
-                '<div class="popup-photo-toggle">' +
-                    '<button class="popup-photo-btn" onclick="togglePhoto(' + props.contribution_id + ')">' +
-                        '<i class="fa-solid fa-camera"></i> <span id="photo-label-' + props.contribution_id + '">Foto anzeigen</span>' +
-                    '</button>' +
                 '</div>';
     }
 
@@ -423,15 +418,23 @@ function buildPopupHtml(feature) {
                 ' &middot; <i class="fa-solid fa-calendar"></i> ' + dateStr +
             '</div>';
 
-    // Vote Buttons
+    // Vote Buttons and Photo Toggle
     html += '<div class="popup-detail-votes">' +
                 '<button class="popup-vote-btn' + (userVotes[props.contribution_id] === 'like' ? ' liked' : '') + '" id="vote-like-' + props.contribution_id + '" onclick="voteContribution(' + props.contribution_id + ', \'like\')" title="Gefällt mir">' +
                     '<i class="fa-solid fa-thumbs-up"></i> <span id="likes-' + props.contribution_id + '">' + props.likes_count + '</span>' +
                 '</button>' +
                 '<button class="popup-vote-btn' + (userVotes[props.contribution_id] === 'dislike' ? ' disliked' : '') + '" id="vote-dislike-' + props.contribution_id + '" onclick="voteContribution(' + props.contribution_id + ', \'dislike\')" title="Gefällt mir nicht">' +
                     '<i class="fa-solid fa-thumbs-down"></i> <span id="dislikes-' + props.contribution_id + '">' + props.dislikes_count + '</span>' +
-                '</button>' +
-            '</div>';
+                '</button>';
+
+    // Photo Toggle Button
+    if (props.photo_path) {
+        html += '<button class="popup-vote-btn" onclick="togglePhoto(' + props.contribution_id + ')" title="Foto">' +
+                    '<i class="fa-solid fa-camera"></i> <span id="photo-label-' + props.contribution_id + '">Foto anzeigen</span>' +
+                '</button>';
+    }
+
+    html += '</div>';
 
     // Edit and Delete Buttons for Author or Admin
     if (props.browser_id === browserId || (typeof IS_ADMIN !== 'undefined' && IS_ADMIN)) {