diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 5760bb149d..8f855c470e 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -8,7 +8,7 @@ OC_App::addNavigationEntry( array(
  'id' => 'gallery_index',
  'order' => 20,
  'href' => OC_Helper::linkTo('gallery', 'index.php'),
- 'icon' => OC_Helper::linkTo('', 'core/img/filetypes/image.png'),
+ 'icon' => OC_Helper::imagePath('core', 'places/picture.svg'),
  'name' => 'Gallery'));
 
  class OC_GallerySearchProvider extends OC_Search_Provider{
@@ -17,7 +17,7 @@ OC_App::addNavigationEntry( array(
 		$result = $stmt->execute(array(OC_User::getUser(),'%'.$query.'%'));
 		$results=array();
 		while($row=$result->fetchRow()){
-			$results[]=new OC_Search_Result($row['album_name'],'',OC_Helper::linkTo( 'apps/gallery', 'index.php?view='.$row['album_name']),'Galleries');
+			$results[]=new OC_Search_Result($row['album_name'],'',OC_Helper::linkTo('apps/gallery', 'index.php?view='.$row['album_name']),'Galleries');
 		}
 		return $results;
 	}
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index dd1a830a94..475a33500f 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -29,5 +29,5 @@ OC_APP::registerPersonal('media','settings');
 
 OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
 
-OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'core', 'filetypes/audio.svg' ), 'name' => $l->t('Music') ));
+OC_App::addNavigationEntry(array('id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo('media', 'index.php'), 'icon' => OC_Helper::imagePath('core', 'places/music.svg'), 'name' => $l->t('Music')));
 ?>
diff --git a/core/img/filetypes/addressbook.png b/core/img/filetypes/addressbook.png
deleted file mode 100644
index b73419ba82..0000000000
Binary files a/core/img/filetypes/addressbook.png and /dev/null differ
diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
new file mode 100644
index 0000000000..8b8b1ca000
Binary files /dev/null and b/core/img/filetypes/file.png differ
diff --git a/core/img/filetypes/presentation.png b/core/img/filetypes/presentation.png
index c4eff0387d..b4aaad9a45 100644
Binary files a/core/img/filetypes/presentation.png and b/core/img/filetypes/presentation.png differ
diff --git a/core/img/places/image.png b/core/img/places/picture.png
similarity index 100%
rename from core/img/places/image.png
rename to core/img/places/picture.png
diff --git a/core/img/places/image.svg b/core/img/places/picture.svg
similarity index 100%
rename from core/img/places/image.svg
rename to core/img/places/picture.svg