diff --git a/apps/files/index.php b/apps/files/index.php
index 2338cf439e..156febd87f 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -95,6 +95,7 @@ $list->assign('files', $files);
 $list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
 $list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
 $list->assign('disableSharing', false);
+$list->assign('isPublic', false);
 $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 $breadcrumbNav->assign('breadcrumb', $breadcrumb);
 $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 38d1314392..9e62c99197 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -30,7 +30,14 @@ $totalsize = 0; ?>
 		<?php if($file['type'] == 'dir'): ?>
 			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
 		<?php else: ?>
-			style="background-image:url(<?php print_unescaped(OCP\preview_icon($relativePath)); ?>)"
+			<?php if($_['isPublic']): ?>
+				<?php
+				$relativePath = substr($relativePath, strlen($_['sharingroot']));
+				?>
+				style="background-image:url(<?php print_unescaped(OCP\publicPreview_icon($relativePath, $_['sharingtoken'])); ?>)"
+			<?php else: ?>
+				style="background-image:url(<?php print_unescaped(OCP\preview_icon($relativePath)); ?>)"
+			<?php endif; ?>
 		<?php endif; ?>
 			>
 		<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 9462844a82..0c4150f74d 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -191,6 +191,9 @@ if (isset($path)) {
 			$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
 			$list->assign('downloadURL',
 				OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=');
+			$list->assign('isPublic', true);
+			$list->assign('sharingtoken', $token);
+			$list->assign('sharingroot', ($path));
 			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 			$breadcrumbNav->assign('breadcrumb', $breadcrumb);
 			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
diff --git a/lib/helper.php b/lib/helper.php
index 856dba625b..6153f31872 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -234,6 +234,10 @@ class OC_Helper {
 		return self::linkToRoute( 'core_ajax_preview', array('x' => 44, 'y' => 44, 'file' => urlencode($path) ));
 	}
 
+	public static function publicPreview_icon( $path, $token ) {
+		return self::linkToRoute( 'core_ajax_public_preview', array('x' => 44, 'y' => 44, 'file' => urlencode($path), 't' => $token));
+	}
+
 	/**
 	 * @brief Make a human file size
 	 * @param int $bytes file size in bytes
diff --git a/lib/public/template.php b/lib/public/template.php
index 5f9888f9f2..69997ad42b 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -64,6 +64,16 @@ function preview_icon( $path ) {
 	return(\preview_icon( $path ));
 }
 
+/**
+ * @brief make publicpreview_icon available as a simple function
+ * Returns the path to the preview of the image.
+ * @param $path path of file
+ * @returns link to the preview
+ */
+function publicPreview_icon ( $path, $token ) {
+	return(\publicPreview_icon( $path, $token ));
+}
+
 /**
  * @brief make OC_Helper::humanFileSize available as a simple function
  * Makes 2048 to 2 kB.
diff --git a/lib/template.php b/lib/template.php
index 048d172f1c..842c332535 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -74,6 +74,10 @@ function preview_icon( $path ) {
 	return OC_Helper::previewIcon( $path );
 }
 
+function publicPreview_icon ( $path, $token ) {
+	return OC_Helper::publicPreview_icon( $path, $token );
+}
+
 /**
  * @brief make OC_Helper::mimetypeIcon available as a simple function
  * @param string $mimetype mimetype