diff --git a/README.md b/README.md
index 83484a9..6f341d8 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ A photo gallery site implemented in ASP.NET Core 2.0 Razor Pages.
 - Elegant masonry layout of images
 - Easy to manage through simple [admin interface](#admin-interface)
 - All major browsers fully supported (IE 10+)
+- Social media integration (Facebook, Twitter, Pinterest)
 - Follows best practices for web applications
   - [See DareBoost report](art/dareboost-report.pdf)
 
diff --git a/src/Pages/Album.cshtml.cs b/src/Pages/Album.cshtml.cs
index e74f5ce..559e58c 100644
--- a/src/Pages/Album.cshtml.cs
+++ b/src/Pages/Album.cshtml.cs
@@ -79,21 +79,22 @@ public async Task<IActionResult> OnPostUpload(string name, ICollection<IFormFile
 
             foreach (var file in files.Where(f => _ac.IsImageFile(f.FileName)))
             {
-                string path = Path.Combine(_environment.WebRootPath, "albums", album.Name, Path.GetFileName(file.FileName));
+                string fileName = Path.GetFileName(file.FileName);
+                string filePath = Path.Combine(_environment.WebRootPath, "albums", album.Name, Path.GetFileName(fileName));
 
-                if (System.IO.File.Exists(path))
+                if (System.IO.File.Exists(filePath))
                 {
-                    path = Path.ChangeExtension(path, file.GetHashCode() + Path.GetExtension(path));
+                    filePath = Path.ChangeExtension(filePath, file.GetHashCode() + Path.GetExtension(filePath));
                 }
 
                 using (var imageStream = file.OpenReadStream())
-                using (var fileStream = new FileStream(path, FileMode.Create, FileAccess.Write))
+                using (var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write))
                 {
-                    _processor.CreateThumbnails(imageStream, path);
+                    _processor.CreateThumbnails(imageStream, filePath);
                     await file.CopyToAsync(fileStream);
                 }
 
-                var photo = new Photo(album, new FileInfo(path));
+                var photo = new Photo(album, new FileInfo(filePath));
                 album.Photos.Insert(0, photo);
             }
 
diff --git a/src/Pages/_Layout.cshtml b/src/Pages/_Layout.cshtml
index 913d84c..d0560ed 100644
--- a/src/Pages/_Layout.cshtml
+++ b/src/Pages/_Layout.cshtml
@@ -26,6 +26,7 @@
 
     <main class="container">
         @RenderBody()
+        @{await Html.RenderPartialAsync("_SocialButtons.cshtml", ViewData["Title"]);}
     </main>
 
     <footer>
diff --git a/src/Pages/_SocialButtons.cshtml b/src/Pages/_SocialButtons.cshtml
new file mode 100644
index 0000000..64e7380
--- /dev/null
+++ b/src/Pages/_SocialButtons.cshtml
@@ -0,0 +1,24 @@
+@model string
+@{
+    string currentUrl = Context.Request.Scheme + "://" + Context.Request.Host + Context.Request.Path;
+    string enc = System.Net.WebUtility.UrlEncode(currentUrl);
+    string text = System.Net.WebUtility.UrlEncode(Model);
+}
+
+<ul class="share-buttons">
+    <li>
+        <a href="https://twitter.com/intent/tweet?source=@enc&text=@text" target="_blank" title="Tweet" rel="noreferrer noopener">
+            <img alt="Tweet" src="~/img/twitter.png" width="32" height="32" />
+        </a>
+    </li>
+    <li>
+        <a href="http://pinterest.com/pin/create/button/?url=@enc&description=@text" target="_blank" title="Pin it" rel="noreferrer noopener">
+            <img alt="Pin it" src="~/img/pinterest.png" width="32" height="32" />
+        </a>
+    </li>
+    <li>
+        <a href="https://www.facebook.com/sharer/sharer.php?u=@enc" title="Share on Facebook" target="_blank" rel="noreferrer noopener">
+            <img alt="Share on Facebook" src="~/img/facebook.png" width="32" height="32" />
+        </a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/src/Startup.cs b/src/Startup.cs
index 4c6c327..9401e67 100644
--- a/src/Startup.cs
+++ b/src/Startup.cs
@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Rewrite;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/wwwroot/css/site.scss b/src/wwwroot/css/site.scss
index 074c30c..fdda334 100644
--- a/src/wwwroot/css/site.scss
+++ b/src/wwwroot/css/site.scss
@@ -160,6 +160,16 @@ a {
     }
 }
 
+.share-buttons {
+    list-style: none;
+    padding: 0;
+
+    li {
+        display: inline-block;
+        margin-right: .3em;
+    }
+}
+
 footer {
     position: absolute;
     bottom: 0;
diff --git a/src/wwwroot/img/facebook.png b/src/wwwroot/img/facebook.png
new file mode 100644
index 0000000..dabf738
Binary files /dev/null and b/src/wwwroot/img/facebook.png differ
diff --git a/src/wwwroot/img/pinterest.png b/src/wwwroot/img/pinterest.png
new file mode 100644
index 0000000..6718a2f
Binary files /dev/null and b/src/wwwroot/img/pinterest.png differ
diff --git a/src/wwwroot/img/twitter.png b/src/wwwroot/img/twitter.png
new file mode 100644
index 0000000..3f20051
Binary files /dev/null and b/src/wwwroot/img/twitter.png differ