diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
index 04f8caf138c5536c461d3a3a14e99b23b18a0d92..e87013bd99309377b5aa0b90acdbb6888f5441a9 100644
--- a/admin/appinfo/app.php
+++ b/admin/appinfo/app.php
@@ -2,10 +2,10 @@
 
 OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
 
-OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System setting", "icon" => OC_HELPER::imagePath( "admin", "administration.png" )));
+OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" =>"System", "icon" => OC_HELPER::imagePath( "admin", "administration.png" )));
 OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "users.png" )));
 OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "apps.png" )));
-OC_APP::addAdminPage( array( "id" => "core_plugins", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins", "icon" => OC_HELPER::imagePath( "admin", "apps.png" )));
+OC_APP::addAdminPage( array( "id" => "core_plugins", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins", "icon" => OC_HELPER::imagePath( "admin", "plugins.png" )));
 
 // Add subentries for App installer
 OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_installed", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php?add=some&parameters=here" ), "name" => "Installed apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
diff --git a/admin/img/apps.png b/admin/img/apps.png
index 1e6f16651c26da368234185e515f9a189472ae15..ee3e8355e664219251542f04e6e4d5fbecc8859d 100644
Binary files a/admin/img/apps.png and b/admin/img/apps.png differ
diff --git a/admin/img/plugins.png b/admin/img/plugins.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e6f16651c26da368234185e515f9a189472ae15
Binary files /dev/null and b/admin/img/plugins.png differ
diff --git a/admin/img/users.png b/admin/img/users.png
index 0d3701918b92e6a33b1a1f2fcc9a50f05c809523..ea2ed9e3335ea5be11896d705b6afaf92a691695 100644
Binary files a/admin/img/users.png and b/admin/img/users.png differ
diff --git a/files/appinfo/app.php b/files/appinfo/app.php
index c542f47b24f0d5c66dab8e2d8be3b32ca323001b..bf67812cf3834417803da61b355af80f52a4ce71 100644
--- a/files/appinfo/app.php
+++ b/files/appinfo/app.php
@@ -2,7 +2,7 @@
 
 OC_APP::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
 
-OC_APP::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_HELPER::linkTo( "files", "index.php" ), "icon" => OC_HELPER::imagePath( "files", "navicon.png" ), "name" => "Files" ));
+OC_APP::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_HELPER::linkTo( "files", "index.php" ), "icon" => OC_HELPER::imagePath( "files", "home.png" ), "name" => "Files" ));
 OC_APP::addSettingsPage( array( "id" => "files_administration", "order" => 1, "href" => OC_HELPER::linkTo( "files", "admin.php" ), "name" => "Files", "icon" => OC_HELPER::imagePath( "files", "folder.png" )));
 
 
diff --git a/files/img/file.png b/files/img/file.png
new file mode 100644
index 0000000000000000000000000000000000000000..4979044889708bf736aefaee7ade0b1f4462600e
Binary files /dev/null and b/files/img/file.png differ
diff --git a/files/img/folder.png b/files/img/folder.png
index 3e7a3ba8cfec2e569b9bfa28ecfa43dcd68fbd44..3edbe257a34cf50b5015f427138a67ea4debb5cf 100644
Binary files a/files/img/folder.png and b/files/img/folder.png differ
diff --git a/files/img/home.png b/files/img/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3fb9bbaf6fba02fa618187ba4ba03f0eeb21fc5
Binary files /dev/null and b/files/img/home.png differ
diff --git a/files/img/navicon.png b/files/img/navicon.png
deleted file mode 100644
index 3802c98fc465bce1296799c41db28ba37c0756ae..0000000000000000000000000000000000000000
Binary files a/files/img/navicon.png and /dev/null differ
diff --git a/help/img/help.png b/help/img/help.png
index aa222ed83b3c9fce78eeb5c459766993756c6f63..487c6e6fd9241ad9f5e106b2989d16771226d937 100644
Binary files a/help/img/help.png and b/help/img/help.png differ
diff --git a/img/help_about.png b/img/help_about.png
deleted file mode 100644
index 792d18b1a53e050ec8e484b42712a867197380ae..0000000000000000000000000000000000000000
Binary files a/img/help_about.png and /dev/null differ
diff --git a/img/mimetypes/application-octet-stream.png b/img/mimetypes/application-octet-stream.png
index 0a90cf06b5f2eb8da1aedd25388183ccefaec7f4..4979044889708bf736aefaee7ade0b1f4462600e 100644
Binary files a/img/mimetypes/application-octet-stream.png and b/img/mimetypes/application-octet-stream.png differ
diff --git a/img/places/folder.png b/img/places/folder.png
index 3e7a3ba8cfec2e569b9bfa28ecfa43dcd68fbd44..3edbe257a34cf50b5015f427138a67ea4debb5cf 100644
Binary files a/img/places/folder.png and b/img/places/folder.png differ
diff --git a/img/task-attention.png b/img/task-attention.png
deleted file mode 100644
index 35a112e9d53429da221cfd0b7110a6eae0594b85..0000000000000000000000000000000000000000
Binary files a/img/task-attention.png and /dev/null differ
diff --git a/settings/img/personal.png b/settings/img/personal.png
index 95b4ca396c1686318219be80ea73a3e22aac2179..ae22c1c1dabd45002a1248832fa1583f2c3e78c3 100644
Binary files a/settings/img/personal.png and b/settings/img/personal.png differ