diff --git a/src/Photos.vue b/src/Photos.vue
index ff1b2e099..1f8f33dfa 100644
--- a/src/Photos.vue
+++ b/src/Photos.vue
@@ -24,11 +24,20 @@
 	<Content app-name="photos">
 		<AppNavigation>
 			<template #list>
-				<AppNavigationItem :to="{name: 'timeline'}"
-					class="app-navigation__photos"
+				<AppNavigationItem
+					:to="{ name: 'timeline' }"
+					class="app-navigation__allmedia "
+					:title="t('photos', 'All Media')"
+					icon="icon-yourphotos allmedia"
+					exact
+					/>
+				<AppNavigationItem
+					to="/images"
+					class="app-navigation__photos "
 					:title="t('photos', 'Your photos')"
-					icon="icon-yourphotos"
-					exact />
+					icon="icon-yourphotos allphotos"
+					
+					/>
 				<AppNavigationItem to="/videos" :title="t('photos', 'Your videos')" icon="icon-video" />
 				<AppNavigationItem to="/favorites" :title="t('photos', 'Favorites')" icon="icon-favorite" />
 				<AppNavigationItem :to="{name: 'thisday'}" :title="t('photos', 'On this day')" icon="icon-calendar-dark" />
diff --git a/src/router/index.js b/src/router/index.js
index a27f628b6..adea95e4d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -26,7 +26,7 @@ import Vue from 'vue'
 
 import isMapsInstalled from '../services/IsMapsInstalled'
 import areTagsInstalled from '../services/AreTagsInstalled'
-import { videoMimes } from '../services/AllowedMimes'
+import { imageMimes,videoMimes } from '../services/AllowedMimes'
 
 const Albums = () => import('../views/Albums')
 const Tags = () => import('../views/Tags')
@@ -61,8 +61,17 @@ export default new Router({
 			path: '/',
 			component: Timeline,
 			name: 'timeline',
+			props: route => ({
+				rootTitle: t('photos', 'All media'),
+			}),
+		},
+		{
+			path: '/images',
+			component: Timeline,
+			name: 'images',
 			props: route => ({
 				rootTitle: t('photos', 'Your photos'),
+				mimesType: imageMimes,
 			}),
 		},
 		{
diff --git a/src/views/Albums.vue b/src/views/Albums.vue
index 6bd7dccd9..0f56b2c95 100644
--- a/src/views/Albums.vue
+++ b/src/views/Albums.vue
@@ -43,8 +43,19 @@
 		</EmptyContent>
 
 		<div v-else class="grid-container">
-			<VirtualGrid ref="virtualgrid"
-				:items="contentList"
+			<div class="folders" v-if="contentList.folders.length">
+				<div class="list-title" >Folders</div>
+				<VirtualGrid
+					ref="virtualgrid"
+					:items="contentList.folders"
+					:get-column-count="() => gridConfig.count"
+					:get-grid-gap="() => gridConfig.gap" />
+			</div>
+			<div class="spacing-between" v-if="contentList.folders.length" />
+			<div class="list-title"  >Images</div>
+			<VirtualGrid
+				ref="virtualgrid"
+				:items="contentList.files"
 				:get-column-count="() => gridConfig.count"
 				:get-grid-gap="() => gridConfig.gap" />
 		</div>
@@ -169,7 +180,8 @@ export default {
 				}
 			})
 
-			return [...(folders || []), ...(files || [])]
+			//return [...(folders || []), ...(files || [])]
+			return {"folders": folders,"files":(files)}
 		},
 
 		// is current folder empty?