diff --git a/frontend/elements/photo-lightbox.html b/frontend/elements/photo-lightbox.html
index d3ae966..deecf50 100644
--- a/frontend/elements/photo-lightbox.html
+++ b/frontend/elements/photo-lightbox.html
@@ -4,8 +4,14 @@
 <link rel="import" href="../bower_components/polymer/polymer.html">
 <link rel="import" href="../bower_components/iron-icon/iron-icon.html">
 <link rel="import" href="../bower_components/iron-icons/iron-icons.html">
+<link rel="import" href="../bower_components/iron-iconset/iron-iconset.html">
 <link rel="import" href="../bower_components/iron-pages/iron-pages.html">
+
+<link rel="import" href="../bower_components/paper-button/paper-button.html">
 <link rel="import" href="../bower_components/paper-spinner/paper-spinner.html">
+
+<link rel="import" href="../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 </head>
 
 <dom-module id="photo-lightbox">
@@ -37,7 +43,10 @@
     background-repeat: no-repeat;
     transition: opacity 0.5s ease-in-out;
     -webkit-transition: opacity 0.5s ease-in-out;
-    pointer-events: none;
+  }
+
+  #image paper-icon-button {
+    color: white;
   }
 
   #overlay {
@@ -54,7 +63,8 @@
   }
   </style>
 
-  <div id="image">
+  <div id="image" class="layout vertical" on-tap="onTap">
+    <paper-icon-button on-tap="download" class="start-end" icon="file-download"></paper-icon-button>      
   </div>
 
   <div id="overlay" class="layout vertical center">
@@ -87,7 +97,6 @@ Polymer({
 
   listeners: {
     "keydown": "onKeyDown",
-    "tap": "onTap",
     "blur": "onBlur",
     "focus": "onFocus",
     "scroll": "onScroll"
@@ -139,6 +148,20 @@ Polymer({
     }
   },
 
+  download: function(event) {
+    event.preventDefault();
+    event.stopPropagation();
+    event.stopImmediatePropagation();
+
+    var anchor = document.createElement('a');
+    anchor.href = this.src;
+    anchor.setAttribute("download", this.src.replace(/.*\/([^/]+)$/, "$1"));
+    anchor.style.display = "none";
+    document.body.appendChild(anchor);
+    anchor.click();
+    document.body.removeChild(anchor);
+  },
+
   close: function() {
     this.style.opacity = 0;