diff --git a/COPYING-README b/COPYING-README
index b0caca2ad21681d6c43283fef2a8ea2ff3b3d0c9..49e035186ed0b3ff295f752150262ea424ebc736 100644
--- a/COPYING-README
+++ b/COPYING-README
@@ -2,13 +2,14 @@ Files in ownCloud are licensed under the Affero General Public License version 3
 the text of which can be found in COPYING-AGPL, or any later version of the AGPL,
 unless otherwise noted.
 
-Components of ownCloud:
-* jQuery is dual licensed under MIT and GPL
-* HTTP is three clause BSD license
-* MDB2 uses a custom license in the BSD style
-* User is AGPL
-* XML/RPC is both MIT and PHP license
+Licensing of components:
+* jQuery: MIT / GPL
+* HTTP: 3 clause BSD
+* MDB2: BSD style custom
+* User: AGPL
+* XML/RPC: MIT / PHP
+* Silk icons: Creative Commons Attribution 
 All unmodified files from these and other sources retain their original copyright
 and license notices: see the relevant individual files.
 
-Attribution information for ownCloud is contained in the AUTHORS file.
+Attribution information for ownCloud is contained in the AUTHORS file.
\ No newline at end of file
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 14b7d45523eac995920a4614e87efe0d87f727a7..80d29ca8974b7bf77105ecccffa1c8a781fa6cce 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -58,5 +58,5 @@ color:#A9A9A9;
 select#category{width:140px;}
 button.category{margin:0 3px;}
 
-.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;}
-.calendar-colorpicker-color.active{background-image:url("../../../core/img/actions/selected.svg");background-position:2px 2px;}
+.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;border:2px solid transparent;}
+.calendar-colorpicker-color.active{border:2px solid black;}
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 131325007a02aab21a2d730fa5df3789961ccb14..87954b7aac69ca18b3a774b8ec7cc5a38d5d65c6 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -491,8 +491,6 @@ Calendar={
 				// based on jquery-colorpicker at jquery.webspirited.com
 				var obj = $('.colorpicker', container);
 				var picker = $('<div class="calendar-colorpicker"></div>');
-				var size = 20;
-
 				//build an array of colors
 				var colors = {};
 				$(obj).children('option').each(function(i, elm) {
@@ -501,7 +499,7 @@ Calendar={
 					colors[i].label = $(elm).text();
 				});
 				for (var i in colors) {
-					picker.append('<span class="calendar-colorpicker-color ' + (colors[i].color == $(obj).children(":selected").val() ? ' active' : '') + '" rel="' + colors[i].label + '" style="background-color: #' + colors[i].color + '; width: ' + size + 'px; height: ' + size + 'px;"></span>');
+					picker.append('<span class="calendar-colorpicker-color ' + (colors[i].color == $(obj).children(":selected").val() ? ' active' : '') + '" rel="' + colors[i].label + '" style="background-color: #' + colors[i].color + ';"></span>');
 				}
 				picker.delegate(".calendar-colorpicker-color", "click", function() {
 					$(obj).val($(this).attr('rel'));
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 5760bb149d819fafa0831130f050232bdc975ba2..8f855c470e579a9a763c3e0053e3fa1e3c6b115f 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 dd1a830a94b70e5f249ecaf50f440f1d8c81a598..475a33500f4bdf4b15745de34bb0164b034183f7 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/actions/selected.png b/core/img/actions/selected.png
deleted file mode 100644
index 98c29df9cf5d612e21d8ab86bfa1b871c92064a8..0000000000000000000000000000000000000000
Binary files a/core/img/actions/selected.png and /dev/null differ
diff --git a/core/img/actions/selected.svg b/core/img/actions/selected.svg
deleted file mode 100644
index 3294f68c68de151c60b0e3bc5f2ad7d9a3933693..0000000000000000000000000000000000000000
--- a/core/img/actions/selected.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="play.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="25.345359"
-     inkscape:cx="10.565719"
-     inkscape:cy="5.327912"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="969"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0, -1036.36)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 14,1038.3622 -6,12 -6,-12 6,6.9978 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png
index 4c844425d644f2c6e83e2962ec6c4dd201e3100e..a8b3ede3df956f8d505543b190bc8d1b5b4dce75 100644
Binary files a/core/img/filetypes/audio.png and b/core/img/filetypes/audio.png differ
diff --git a/core/img/filetypes/c.png b/core/img/filetypes/c.png
new file mode 100644
index 0000000000000000000000000000000000000000..34a05cccf064b35701b61ba1d395048873d7b48e
Binary files /dev/null and b/core/img/filetypes/c.png differ
diff --git a/core/img/filetypes/code.png b/core/img/filetypes/code.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c76bd1297751b66230f74719504b2adb02b1615
Binary files /dev/null and b/core/img/filetypes/code.png differ
diff --git a/core/img/filetypes/cplusplus.png b/core/img/filetypes/cplusplus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a87cf847cb768acb8c600759ce433ce1bad3cdc0
Binary files /dev/null and b/core/img/filetypes/cplusplus.png differ
diff --git a/core/img/filetypes/csharp.png b/core/img/filetypes/csharp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffb8fc932f321d19049a51e0134459e7d6549226
Binary files /dev/null and b/core/img/filetypes/csharp.png differ
diff --git a/core/img/filetypes/css.png b/core/img/filetypes/css.png
new file mode 100644
index 0000000000000000000000000000000000000000..23f3101811f2e402b8c581ba2e39977a675e0295
Binary files /dev/null and b/core/img/filetypes/css.png differ
diff --git a/core/img/filetypes/database.png b/core/img/filetypes/database.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d09261a26eb97c6dedc1d3504cbc2cf915eb642
Binary files /dev/null and b/core/img/filetypes/database.png differ
diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
index 4979044889708bf736aefaee7ade0b1f4462600e..8b8b1ca0000bc8fa8d0379926736029f8fabe364 100644
Binary files a/core/img/filetypes/file.png and b/core/img/filetypes/file.png differ
diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/flash.png
new file mode 100644
index 0000000000000000000000000000000000000000..5769120b1b6d38019b505c9167498ea199212cc1
Binary files /dev/null and b/core/img/filetypes/flash.png differ
diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..784e8fa48234f4f64b6922a6758f254ee0ca08ec
Binary files /dev/null and b/core/img/filetypes/folder.png differ
diff --git a/core/img/filetypes/font.png b/core/img/filetypes/font.png
new file mode 100644
index 0000000000000000000000000000000000000000..81e41de7d3a9bcc50267b34d0005487d5c7cc7c0
Binary files /dev/null and b/core/img/filetypes/font.png differ
diff --git a/core/img/filetypes/h.png b/core/img/filetypes/h.png
new file mode 100644
index 0000000000000000000000000000000000000000..e902abb07671254da98cd4eb0f7d21fab89d2332
Binary files /dev/null and b/core/img/filetypes/h.png differ
diff --git a/core/img/filetypes/html.png b/core/img/filetypes/html.png
new file mode 100644
index 0000000000000000000000000000000000000000..55d1072eafda48abb0a5fcecb98b114d866077b9
Binary files /dev/null and b/core/img/filetypes/html.png differ
diff --git a/core/img/filetypes/ical.png b/core/img/filetypes/ical.png
new file mode 100644
index 0000000000000000000000000000000000000000..658913852d60fc6ca8557568d26b8e93e7d56525
Binary files /dev/null and b/core/img/filetypes/ical.png differ
diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png
index 980a7c6981311787a5c33102fb23d0157103b65f..4a158fef7e0da8fd19525f574f2c4966443866cf 100644
Binary files a/core/img/filetypes/image.png and b/core/img/filetypes/image.png differ
diff --git a/core/img/filetypes/link.png b/core/img/filetypes/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..68f21d30116710e48a8bf462cb32441e51fad5f6
Binary files /dev/null and b/core/img/filetypes/link.png differ
diff --git a/core/img/filetypes/model.png b/core/img/filetypes/model.png
new file mode 100644
index 0000000000000000000000000000000000000000..7851cf34c946e5667221e3478668503eb1cd733f
Binary files /dev/null and b/core/img/filetypes/model.png differ
diff --git a/core/img/filetypes/ms-excel.png b/core/img/filetypes/ms-excel.png
new file mode 100644
index 0000000000000000000000000000000000000000..abcd93689a08ec9bdbf0984927e8da06c043c7cd
Binary files /dev/null and b/core/img/filetypes/ms-excel.png differ
diff --git a/core/img/filetypes/ms-powerpoint.png b/core/img/filetypes/ms-powerpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4aaad9a45c9abbee2d47611a6963101b64a8023
Binary files /dev/null and b/core/img/filetypes/ms-powerpoint.png differ
diff --git a/core/img/filetypes/msword.png b/core/img/filetypes/msword.png
new file mode 100644
index 0000000000000000000000000000000000000000..813f712f726c935f9adf8d2f2dd0d7683791ef11
Binary files /dev/null and b/core/img/filetypes/msword.png differ
diff --git a/core/img/filetypes/pdf.png b/core/img/filetypes/pdf.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f8095e46fa4965700afe1f9d065d8a37b101676
Binary files /dev/null and b/core/img/filetypes/pdf.png differ
diff --git a/core/img/filetypes/php.png b/core/img/filetypes/php.png
new file mode 100644
index 0000000000000000000000000000000000000000..7868a25945cd5e5cb7daaca9591927511ca65c0f
Binary files /dev/null and b/core/img/filetypes/php.png differ
diff --git a/core/img/filetypes/presentation.png b/core/img/filetypes/presentation.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4aaad9a45c9abbee2d47611a6963101b64a8023
Binary files /dev/null and b/core/img/filetypes/presentation.png differ
diff --git a/core/img/filetypes/readme.txt b/core/img/filetypes/readme.txt
new file mode 100644
index 0000000000000000000000000000000000000000..400a64d7857425f6aa49877a91a9bf8a5737400a
--- /dev/null
+++ b/core/img/filetypes/readme.txt
@@ -0,0 +1,22 @@
+Silk icon set 1.3
+
+_________________________________________
+Mark James
+http://www.famfamfam.com/lab/icons/silk/
+_________________________________________
+
+This work is licensed under a
+Creative Commons Attribution 2.5 License.
+[ http://creativecommons.org/licenses/by/2.5/ ]
+
+This means you may use it for any purpose,
+and make any changes you like.
+All I ask is that you include a link back
+to this page in your credits.
+
+Are you using this icon set? Send me an email
+(including a link or picture if available) to
+mjames@gmail.com
+
+Any other questions about this icon set please
+contact mjames@gmail.com
\ No newline at end of file
diff --git a/core/img/filetypes/rss.png b/core/img/filetypes/rss.png
new file mode 100644
index 0000000000000000000000000000000000000000..315c4f4fa62cb720326ba3f54259666ba3999e42
Binary files /dev/null and b/core/img/filetypes/rss.png differ
diff --git a/core/img/filetypes/ruby.png b/core/img/filetypes/ruby.png
new file mode 100644
index 0000000000000000000000000000000000000000..f59b7c4365fa1720af1aa04eb47167ddaa6eeed4
Binary files /dev/null and b/core/img/filetypes/ruby.png differ
diff --git a/core/img/filetypes/script.png b/core/img/filetypes/script.png
new file mode 100644
index 0000000000000000000000000000000000000000..63fe6ceff5bfcedb9670279d4bb8d25807f6ecee
Binary files /dev/null and b/core/img/filetypes/script.png differ
diff --git a/core/img/filetypes/spreadsheet.png b/core/img/filetypes/spreadsheet.png
new file mode 100644
index 0000000000000000000000000000000000000000..abcd93689a08ec9bdbf0984927e8da06c043c7cd
Binary files /dev/null and b/core/img/filetypes/spreadsheet.png differ
diff --git a/core/img/filetypes/svg.png b/core/img/filetypes/svg.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1291c2dfad75b289f88ab762a3a32ccb436c1ed
Binary files /dev/null and b/core/img/filetypes/svg.png differ
diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png
new file mode 100644
index 0000000000000000000000000000000000000000..813f712f726c935f9adf8d2f2dd0d7683791ef11
Binary files /dev/null and b/core/img/filetypes/text.png differ
diff --git a/core/img/filetypes/vcf.png b/core/img/filetypes/vcf.png
new file mode 100644
index 0000000000000000000000000000000000000000..c02f315d20749098a50e79bd9525eed3cda7be6b
Binary files /dev/null and b/core/img/filetypes/vcf.png differ
diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0ce7bb198a3b268bd634d2b26e9b710f3797d37
Binary files /dev/null and b/core/img/filetypes/video.png differ
diff --git a/core/img/filetypes/x-.png b/core/img/filetypes/x-.png
new file mode 100644
index 0000000000000000000000000000000000000000..8443c23eb944cf8ef49c9d13cd496502f46f1885
Binary files /dev/null and b/core/img/filetypes/x-.png differ
diff --git a/core/img/places/file.png b/core/img/places/file.png
new file mode 100644
index 0000000000000000000000000000000000000000..4979044889708bf736aefaee7ade0b1f4462600e
Binary files /dev/null and b/core/img/places/file.png differ
diff --git a/core/img/filetypes/file.svg b/core/img/places/file.svg
similarity index 100%
rename from core/img/filetypes/file.svg
rename to core/img/places/file.svg
diff --git a/core/img/places/music.png b/core/img/places/music.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c844425d644f2c6e83e2962ec6c4dd201e3100e
Binary files /dev/null and b/core/img/places/music.png differ
diff --git a/core/img/filetypes/audio.svg b/core/img/places/music.svg
similarity index 100%
rename from core/img/filetypes/audio.svg
rename to core/img/places/music.svg
diff --git a/core/img/places/picture.png b/core/img/places/picture.png
new file mode 100644
index 0000000000000000000000000000000000000000..980a7c6981311787a5c33102fb23d0157103b65f
Binary files /dev/null and b/core/img/places/picture.png differ
diff --git a/core/img/filetypes/image.svg b/core/img/places/picture.svg
similarity index 100%
rename from core/img/filetypes/image.svg
rename to core/img/places/picture.svg