diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 9207a133cdf2d4eb5bf19a4e9cbf82452cbc0dbe..1d4d077448227b7f20a235f9e5faca5456e4d859 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -580,6 +580,9 @@ a.action > img {
 #fileList .popovermenu {
 	margin-right: 21px;
 }
+.ie8 #fileList .popovermenu {
+	margin-top: -10px;
+}
 
 .ie8 #fileList a.action img,
 #fileList tr:hover a.action,
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 39a00d0a5a5d1b6423754babc00b18c7c0138017..b50e92dea8cfe1a940fdc224e485c1b5162de0dc 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -131,6 +131,7 @@
 				} else {
 					// TODO: special icons / shared / external
 					$iconDiv.css('background-image', 'url("' + OC.MimeType.getIconUrl('dir') + '")');
+					OC.Util.scaleFixForIE8($iconDiv);
 				}
 				this.$el.find('[title]').tooltip({placement: 'bottom'});
 			} else {
@@ -214,6 +215,7 @@
 					$iconDiv.css({
 						'background-image': 'url("' + $iconDiv.previewImg + '")'
 					});
+					OC.Util.scaleFixForIE8($iconDiv);
 				}.bind(this)
 			});
 		}
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
index b07999821d57acababa7c54d14be643a70e8b0b9..0a67aba202bc3a2c1517d3c97a7ea8ab8044053a 100644
--- a/apps/files/js/newfilemenu.js
+++ b/apps/files/js/newfilemenu.js
@@ -212,6 +212,7 @@
 					fileType: 'folder'
 				}]
 			}));
+			OC.Util.scaleFixForIE8(this.$('.svg'));
 		},
 
 		/**
diff --git a/core/css/apps.css b/core/css/apps.css
index 23e0c519d0000aa27c75305561fa810003476bba..3122a2b48a160539e2b7611a668c54afcc23018a 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -308,6 +308,13 @@
 	-o-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 	filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 }
+.ie8 .bubble {
+	border: 1px solid #eee;
+	margin-top: 18px;
+}
+.ie8 .bubble:after {
+	display: none;
+}
 /* miraculous border arrow stuff */
 .bubble:after,
 #app-navigation .app-navigation-entry-menu:after {
diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png
index 4029f8aead1ad736c65389dcdad02d8aa4b0a0db..c215094eaa777c8d06bd2197399065e7f4b812fe 100644
Binary files a/core/img/filetypes/application-pdf.png and b/core/img/filetypes/application-pdf.png differ
diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png
index 9be7361d1b60940cf171886800c7878039a87705..d9db3b9114ccad32c2f06b064e21976cd9a2b021 100644
Binary files a/core/img/filetypes/application.png and b/core/img/filetypes/application.png differ
diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png
index 4eb8ab78e3f523464cc8b604eb65b8adbbb242b4..3d52756341acdc897f1abf5ba55306153cb905da 100644
Binary files a/core/img/filetypes/audio.png and b/core/img/filetypes/audio.png differ
diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
index 3bd7463cfc9d5b8b2253b5b930358e04cc8cce17..74add13f2760e194a8145532201f6bdc478ea9ed 100644
Binary files a/core/img/filetypes/file.png and b/core/img/filetypes/file.png differ
diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png
index 80ab53b72b932da93c16afcceaa2bced2ed1a4a1..1124a02982f6673167ecaaea22c89cedf0788205 100644
Binary files a/core/img/filetypes/folder-drag-accept.png and b/core/img/filetypes/folder-drag-accept.png differ
diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png
index 5262d72e627c1772da547ccbd75b8e8be34abddd..dd8343d245aeafc38967572f5ea6654ecc5e2973 100644
Binary files a/core/img/filetypes/folder-external.png and b/core/img/filetypes/folder-external.png differ
diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png
index 17c3ee2a8d91633c1c03e47e46b69bc5ef006e1c..3da67f85f79d13ac9674a3e364bc140adeaf6447 100644
Binary files a/core/img/filetypes/folder-public.png and b/core/img/filetypes/folder-public.png differ
diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png
index be5e59cbf28d20d4a7d4a3d8c3cfdad8bd479d6e..d24e1d7af4edddfe4a9edc3b4d091b8af510243c 100644
Binary files a/core/img/filetypes/folder-shared.png and b/core/img/filetypes/folder-shared.png differ
diff --git a/core/img/filetypes/folder-starred.png b/core/img/filetypes/folder-starred.png
index b083a9d2d11f43ae961f02a180c82de3148f4c93..4b847bf69ea9912e7e1753fcca3124a23d8860c3 100644
Binary files a/core/img/filetypes/folder-starred.png and b/core/img/filetypes/folder-starred.png differ
diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png
index 1dbb1154100103bab8096a60a0dc98dfd198c195..e811e9cdfdcb70ba397a52797ce8aff7616af1bb 100644
Binary files a/core/img/filetypes/folder.png and b/core/img/filetypes/folder.png differ
diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png
index 0feaecf2830a7e7c1e6e3723aeccc26eb6e7e4a7..8ff5e6c119fda8354bd7ab90ea3ed8345d20e00a 100644
Binary files a/core/img/filetypes/image.png and b/core/img/filetypes/image.png differ
diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png
index 287a1f18869ec927ce48a1a70d005f09953e97b4..68117e0d0701d9917a8af13f98f1aa3a9d1c31a9 100644
Binary files a/core/img/filetypes/package-x-generic.png and b/core/img/filetypes/package-x-generic.png differ
diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png
index ff3ced625311665d81557d2669bb13e93167dd9e..f21c3a9951d2e7188a5c2980fa63463f268b5afe 100644
Binary files a/core/img/filetypes/text-calendar.png and b/core/img/filetypes/text-calendar.png differ
diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png
index 5505102f60ebc0d295ca836a253027d1977033e0..69744e499e6edae39545353f6ebfebb0bb3fdfcd 100644
Binary files a/core/img/filetypes/text-code.png and b/core/img/filetypes/text-code.png differ
diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png
index 77ac138fe1c3cd727961d15dd0525c246d4fefa4..087eadaabd123e5e7ecd60b6c0351be96313060b 100644
Binary files a/core/img/filetypes/text-vcard.png and b/core/img/filetypes/text-vcard.png differ
diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png
index 5fca7cb69d785617a9ef7fa74ffde4c5c6ca591f..d6bec70cf43e2deacb8b42f2f9201693a7329922 100644
Binary files a/core/img/filetypes/text.png and b/core/img/filetypes/text.png differ
diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png
index 308e81cca831fc2674d4660884ce7babd312ccba..7cc1ecdc46a0e9cb0b0d1653b6a75450e79a101c 100644
Binary files a/core/img/filetypes/video.png and b/core/img/filetypes/video.png differ
diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png
index d9c5b890583a874cb2fd6606aa46dd594c223d3d..3bc2f08d1f9d7c848152864c94407d9232f3b877 100644
Binary files a/core/img/filetypes/x-office-document.png and b/core/img/filetypes/x-office-document.png differ
diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png
index 5b3733b712129c817568a8eb4c8ff8cea174e033..644fb852009e9a6d057d23cd0ab14fc8d02e6c04 100644
Binary files a/core/img/filetypes/x-office-presentation.png and b/core/img/filetypes/x-office-presentation.png differ
diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png
index 5a20026ebdd597b545aef1135805450124412e12..8f79c32fe01e201d5c5e458327628b0c31d4712d 100644
Binary files a/core/img/filetypes/x-office-spreadsheet.png and b/core/img/filetypes/x-office-spreadsheet.png differ
diff --git a/core/js/js.js b/core/js/js.js
index 397fea8e3c588e5f36e4a43ede4a4659f887f115..e40141ac617a9b8311d23f70a523e8168287c9b3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1596,6 +1596,46 @@ OC.Util = {
 		});
 	},
 
+	/**
+	 * Fix image scaling for IE8, since background-size is not supported.
+	 *
+	 * This scales the image to the element's actual size, the URL is
+	 * taken from the "background-image" CSS attribute.
+	 *
+	 * @param {Object} $el image element
+	 */
+	scaleFixForIE8: function($el) {
+		if (!this.isIE8()) {
+			return;
+		}
+		var self = this;
+		$($el).each(function() {
+			var url = $(this).css('background-image');
+			var r = url.match(/url\(['"]?([^'")]*)['"]?\)/);
+			if (!r) {
+				return;
+			}
+			url = r[1];
+			url = self.replaceSVGIcon(url);
+			// TODO: escape
+			url = url.replace(/'/g, '%27');
+			$(this).css({
+				'filter': 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\'' + url + '\', sizingMethod=\'scale\')',
+				'background-image': ''
+			});
+		});
+		return $el;
+	},
+
+	/**
+	 * Returns whether this is IE8
+	 *
+	 * @return {bool} true if this is IE8, false otherwise
+	 */
+	isIE8: function() {
+		return $('html').hasClass('ie8');
+	},
+
 	/**
 	 * Remove the time component from a given date
 	 *