Index: wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css
===================================================================
--- wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css	(revision 22599)
+++ wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css	(working copy)
@@ -412,7 +412,13 @@
 	text-align: left;
 }
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+/**
+ * Retina display 2x icons
+ */
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 	.image-align-none-label {
 		background: url(../../../../../../wp-admin/images/align-none-2x.png) no-repeat center left;
 		background-size: auto 15px;
Index: wp-includes/js/thickbox/thickbox.css
===================================================================
--- wp-includes/js/thickbox/thickbox.css	(revision 22599)
+++ wp-includes/js/thickbox/thickbox.css	(working copy)
@@ -167,7 +167,10 @@
 	width: 15px;
 }
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 	.tb-close-icon {
 		background: url('tb-close-2x.png') no-repeat;
 		background-size: 15px;
Index: wp-includes/css/admin-bar.css
===================================================================
--- wp-includes/css/admin-bar.css	(revision 22599)
+++ wp-includes/css/admin-bar.css	(working copy)
@@ -406,13 +406,6 @@
 	display: inline-block;
 }
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
-	#wpadminbar .quicklinks li div.blavatar {
-		background: url('../images/wpmini-blue-2x.png') no-repeat;
-		background-size: 16px 16px;
-	}
-}
-
 /**
  * Search
  */
@@ -600,7 +593,10 @@
 /**
  * Retina display 2x icons
  */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 	#wpadminbar .menupop .menupop > .ab-item,
 	#wpadminbar .ab-top-secondary .menupop .menupop > .ab-item,
 	#wpadminbar #adminbarsearch .adminbar-input,
@@ -611,6 +607,11 @@
 		background-image: url(../images/admin-bar-sprite-2x.png?d=20120830);
 		background-size: 20px 220px;
 	}
+	
+	#wpadminbar .quicklinks li div.blavatar {
+		background: url('../images/wpmini-blue-2x.png') no-repeat;
+		background-size: 16px 16px;
+	}
 }
 
 /* Skip link */
Index: wp-includes/css/wp-pointer.css
===================================================================
--- wp-includes/css/wp-pointer.css	(revision 22599)
+++ wp-includes/css/wp-pointer.css	(working copy)
@@ -189,7 +189,10 @@
 /**
  * HiDPI Displays
  */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 
 	.wp-pointer-buttons a.close:before {
 		background-image: url('../images/xit-2x.gif');
Index: wp-includes/css/editor.css
===================================================================
--- wp-includes/css/editor.css	(revision 22599)
+++ wp-includes/css/editor.css	(working copy)
@@ -2027,7 +2027,10 @@
 
 
 /* HiDPI */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 	.wp_themeSkin span.mce_undo,
 	.wp_themeSkin span.mce_redo,
 	.wp_themeSkin span.mce_bullist,
Index: wp-admin/css/colors-fresh.css
===================================================================
--- wp-admin/css/colors-fresh.css	(revision 22599)
+++ wp-admin/css/colors-fresh.css	(working copy)
@@ -1893,7 +1893,10 @@
 /**
  * HiDPI Displays
  */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 
 	.curtime #timestamp {
 		background-image: url("../images/date-button-2x.gif?ver=20120916");
Index: wp-admin/css/install.css
===================================================================
--- wp-admin/css/install.css	(revision 22599)
+++ wp-admin/css/install.css	(working copy)
@@ -74,7 +74,10 @@
 	overflow: hidden;
 	display: block;
 }
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 	#logo a {
 		background-image: url('../images/wordpress-logo-2x.png?ver=20120412');
 		background-size: 274px 63px;
Index: wp-admin/css/wp-admin-rtl.css
===================================================================
--- wp-admin/css/wp-admin-rtl.css	(revision 22599)
+++ wp-admin/css/wp-admin-rtl.css	(working copy)
@@ -2382,7 +2382,10 @@
 /**
  * HiDPI Displays
  */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 	.post-com-count {
 		background-image: url('../images/bubble_bg-rtl-2x.gif');
 		background-size: 18px 100px;
Index: wp-admin/css/wp-admin.css
===================================================================
--- wp-admin/css/wp-admin.css	(revision 22599)
+++ wp-admin/css/wp-admin.css	(working copy)
@@ -2362,43 +2362,6 @@
 	padding: 2px 0 8px 32px;
 }
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
-	.welcome-panel .welcome-add-page {
-		background: url('../images/welcome-icons-2x.png') no-repeat 0 -1px;
-		background-size: 16px;
-	}
-
-	.welcome-panel .welcome-edit-page {
-		background: url('../images/welcome-icons-2x.png') no-repeat 0px -92px;
-		background-size: 16px;
-	}
-
-	.welcome-panel .welcome-learn-more {
-		background: url('../images/welcome-icons-2x.png') no-repeat 0px -138px;
-		background-size: 16px;
-	}
-
-	.welcome-panel .welcome-comments {
-		background: url('../images/welcome-icons-2x.png') no-repeat 0px -184px;
-		background-size: 16px;
-	}
-
-	.welcome-panel .welcome-view-site {
-		background: url('../images/welcome-icons-2x.png') no-repeat 0px -276px;
-		background-size: 16px;
-	}
-
-	.welcome-panel .welcome-widgets-menus {
-		background: url('../images/welcome-icons-2x.png') no-repeat 1px -230px;
-		background-size: 16px;
-	}
-
-	.welcome-panel .welcome-write-blog {
-	 	background: url('../images/welcome-icons-2x.png') no-repeat 0px -46px;
-	 	background-size: 16px;
-	}
-}
-
 .welcome-panel .welcome-panel-column ul {
 	margin: 0.8em 1em 1em 0;
 }
@@ -2440,17 +2403,6 @@
 	}
 }
 
-/**
- * HiDPI Displays
- */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
-
-	.welcome-panel .welcome-panel-close:before {
-		background-image: url('../images/xit-2x.gif');
-		background-size: 20px auto;
-	}
-}
-
 /*------------------------------------------------------------------------------
   10.0 - List Posts (/Pages/etc)
 ------------------------------------------------------------------------------*/
@@ -4195,14 +4147,6 @@
 	margin: 5px 5px 0;
 }
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
-	.spinner,
-	.imgedit-wait,
-	.customize-loading #customize-container {
-		background-image: url(../images/wpspin_light-2x.gif);
-	}
-}
-
 .no-float {
 	float: none;
 }
@@ -4397,22 +4341,6 @@
 	padding: 2px 10px;
 }
 
-/**
- * HiDPI Displays
- */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
-	.imgedit-crop,
-	.imgedit-rleft,
-	.imgedit-rright,
-	.imgedit-flipv,
-	.imgedit-fliph,
-	.imgedit-undo,
-	.imgedit-redo {
-		background-image: url('../images/imgedit-icons-2x.png');
-		background-size: 260px 64px;
-	}
-}
-
 /*------------------------------------------------------------------------------
   15.0 - Comments Screen
 ------------------------------------------------------------------------------*/
@@ -5132,12 +5060,6 @@
 	box-shadow: 0 10px 8px rgba(0, 0, 0, 0.6);
 }
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
-	.pressthis a span {
-		background-image: url(../images/press-this-2x.png?v=20121105);
-	}
-}
-
 /*------------------------------------------------------------------------------
   20.0 - Settings
 ------------------------------------------------------------------------------*/
@@ -5684,18 +5606,7 @@
 	transition-duration:         0.2s;
 }
 
-/**
- * HiDPI Displays
- */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
 
-	.wp-full-overlay .collapse-sidebar-arrow {
-	 	background-image: url('../images/arrows-2x.png');
-	 	background-size: 15px 123px;
-	 }
-}
-
-
 /*------------------------------------------------------------------------------
   24.0 - Customize Loader
 ------------------------------------------------------------------------------*/
@@ -6640,18 +6551,6 @@
 	display: block;
 }
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
-	.login h1 a {
-		background-image: url('../images/wordpress-logo-2x.png?ver=20120412');
-		background-size: 274px 63px;
-	}
-
-	.wp-badge {
-		background-image: url('../images/wp-badge-2x.png?ver=20120516');
-		background-size: 173px 194px;
-	}
-}
-
 #login {
 	width: 320px;
 	padding: 114px 0 0;
@@ -8424,7 +8323,10 @@
 /**
  * HiDPI Displays
  */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 
 	.press-this .tagchecklist span a {
 	 	background-image: url('../images/xit-2x.gif');
@@ -8473,6 +8375,82 @@
 		background: url('../images/stars-2x.png?ver=20121108') repeat-x top left;
 		background-size: 21px 37px;
 	}
+	
+	.welcome-panel .welcome-panel-close:before {
+		background-image: url('../images/xit-2x.gif');
+		background-size: 20px auto;
+	}
+	
+	.welcome-panel .welcome-add-page {
+		background: url('../images/welcome-icons-2x.png') no-repeat 0 -1px;
+		background-size: 16px;
+	}
+
+	.welcome-panel .welcome-edit-page {
+		background: url('../images/welcome-icons-2x.png') no-repeat 0px -92px;
+		background-size: 16px;
+	}
+
+	.welcome-panel .welcome-learn-more {
+		background: url('../images/welcome-icons-2x.png') no-repeat 0px -138px;
+		background-size: 16px;
+	}
+
+	.welcome-panel .welcome-comments {
+		background: url('../images/welcome-icons-2x.png') no-repeat 0px -184px;
+		background-size: 16px;
+	}
+
+	.welcome-panel .welcome-view-site {
+		background: url('../images/welcome-icons-2x.png') no-repeat 0px -276px;
+		background-size: 16px;
+	}
+
+	.welcome-panel .welcome-widgets-menus {
+		background: url('../images/welcome-icons-2x.png') no-repeat 1px -230px;
+		background-size: 16px;
+	}
+
+	.welcome-panel .welcome-write-blog {
+	 	background: url('../images/welcome-icons-2x.png') no-repeat 0px -46px;
+	 	background-size: 16px;
+	}
+	
+	.login h1 a {
+		background-image: url('../images/wordpress-logo-2x.png?ver=20120412');
+		background-size: 274px 63px;
+	}
+
+	.wp-badge {
+		background-image: url('../images/wp-badge-2x.png?ver=20120516');
+		background-size: 173px 194px;
+	}
+	
+	.wp-full-overlay .collapse-sidebar-arrow {
+	 	background-image: url('../images/arrows-2x.png');
+	 	background-size: 15px 123px;
+	 }
+	 
+	.pressthis a span {
+		background-image: url(../images/press-this-2x.png?v=20121105);
+	}
+	
+	.imgedit-crop,
+	.imgedit-rleft,
+	.imgedit-rright,
+	.imgedit-flipv,
+	.imgedit-fliph,
+	.imgedit-undo,
+	.imgedit-redo {
+		background-image: url('../images/imgedit-icons-2x.png');
+		background-size: 260px 64px;
+	}
+	
+	.spinner,
+	.imgedit-wait,
+	.customize-loading #customize-container {
+		background-image: url(../images/wpspin_light-2x.gif);
+	}
 }
 
 /* =Localized CSS
Index: wp-admin/css/media.css
===================================================================
--- wp-admin/css/media.css	(revision 22599)
+++ wp-admin/css/media.css	(working copy)
@@ -326,7 +326,10 @@
 /**
  * HiDPI Displays
  */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 
 	.image-align-none-label {
 		background-image: url("../images/align-none-2x.png?ver=20120916");
Index: wp-admin/css/colors-classic.css
===================================================================
--- wp-admin/css/colors-classic.css	(revision 22599)
+++ wp-admin/css/colors-classic.css	(working copy)
@@ -2023,7 +2023,10 @@
 /**
  * HiDPI Displays
  */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
 
 	.curtime #timestamp {
 		background-image: url("../images/date-button-2x.gif?ver=20120916");