diff --git a/node_modules/architect-build/build.js b/node_modules/architect-build/build.js
index baa2d583..2c0dd3ac 100644
--- a/node_modules/architect-build/build.js
+++ b/node_modules/architect-build/build.js
@@ -161,6 +161,8 @@ function compileLess(opts, sources, callback) {
     var cache = opts.cache;
     if (cache && !cache.less)
         cache.less = Object.create(null);
+    if (cache && !cache.images)
+        cache.images = Object.create(null);
     
     var libs = opts.lessLibs;
     less.forEach(function(file) {
@@ -175,9 +177,15 @@ function compileLess(opts, sources, callback) {
         }
         
         var staticPrefix = plugin.staticPrefix || libs.staticPrefix;
+        var id = file.pkg.id.replace(/^[^!]+!/, "");
         // Complete paths, but not subdirectories like foo/images/bar.png
         var lessCode = file.code.replace(/(["(])(images|icons)\//g, "$1" + staticPrefix + "/$2/");
-        code.push("ß{" + lessPathLib(staticPrefix) + lessCode + "}");
+        code.push(
+            "/* @file " + id + " */\nß{"
+            + lessPathLib(staticPrefix)
+            + lessCode
+            + "}"
+        );
     });
     
      var ctx = {
@@ -193,12 +201,38 @@ function compileLess(opts, sources, callback) {
         
         toCss(tree, imports, options, function(err, css) {
             if (err) return callback(err);
-             
-            callback(null, { code: css.replace(/ß /g, "").replace(/^ +/gm, "\t") });
+            css = css.replace(/ß /g, "").replace(/^ +/gm, "\t");
+            css = checkImages(css, cache);
+            callback(null, { code: css });
         });
     });
 }
 
+function checkImages(css, cache) {
+    var images = cache && cache.images || Object.create(null);
+    var root = __dirname + "/../../";
+    var t = Date.now();
+    css = css.replace(/(url\(['"]?\/static\/)([^"')]+)/g, function(_, prefix, imagePath) {
+        var dir = path.dirname(imagePath);
+        var name = path.basename(imagePath);
+        try {
+            if (!images[dir])
+                images[dir] = fs.readdirSync(root + dir);
+        } catch(e) {
+            images[dir] = [];
+        }
+        if (images[dir].indexOf(name) != -1)
+            return prefix + imagePath;
+        var name1 = name.replace("@1x", "");
+        if (images[dir].indexOf(name1) != -1)
+            return prefix + dir + name1;
+        
+        console.log("missing image:" + imagePath);
+        return prefix + undefined + imagePath;
+    });
+    console.log(t- Date.now());
+    return css
+}
 
 function addCssPrefixes(css) {
     return css.replace(/\b(user-select|font-smoothing)\b([^;\n]+);?/g, function(_, prop, value, index, string) {
diff --git a/package.json b/package.json
index f5926894..a1c93daf 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.4072",
+    "version": "3.1.5000",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -56,4 +56,4 @@
         "msgpack-js",
         "c9"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/c9.ide.ace.statusbar/statusbar.xml b/plugins/c9.ide.ace.statusbar/statusbar.xml
index ce4b2829..6be7b3d1 100644
--- a/plugins/c9.ide.ace.statusbar/statusbar.xml
+++ b/plugins/c9.ide.ace.statusbar/statusbar.xml
@@ -34,7 +34,7 @@
           skin    = "btn-statusbar-icon" 
           skinset = "c9statusbar"
           height  = "23"
-          icon    = "pref-ico.png" 
+          icon    = "true" 
           submenudir = "up" />
     </a:bar>
 </a:application>
\ No newline at end of file
diff --git a/plugins/c9.ide.behaviors/images/splits.png b/plugins/c9.ide.behaviors/images/splits@1x.png
similarity index 100%
rename from plugins/c9.ide.behaviors/images/splits.png
rename to plugins/c9.ide.behaviors/images/splits@1x.png
diff --git a/plugins/c9.ide.behaviors/images/splits_flat_dark.png b/plugins/c9.ide.behaviors/images/splits_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.behaviors/images/splits_flat_dark.png
rename to plugins/c9.ide.behaviors/images/splits_flat_dark@1x.png
diff --git a/plugins/c9.ide.behaviors/images/splits_flat_light.png b/plugins/c9.ide.behaviors/images/splits_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.behaviors/images/splits_flat_light.png
rename to plugins/c9.ide.behaviors/images/splits_flat_light@1x.png
diff --git a/plugins/c9.ide.collab/members/images/collab-led-states.png b/plugins/c9.ide.collab/members/images/collab-led-states@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/members/images/collab-led-states.png
rename to plugins/c9.ide.collab/members/images/collab-led-states@1x.png
diff --git a/plugins/c9.ide.collab/members/images/collab-led-states_flat_light.png b/plugins/c9.ide.collab/members/images/collab-led-states_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/members/images/collab-led-states_flat_light.png
rename to plugins/c9.ide.collab/members/images/collab-led-states_flat_light@1x.png
diff --git a/plugins/c9.ide.collab/members/images/trash-icon.png b/plugins/c9.ide.collab/members/images/trash-icon@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/members/images/trash-icon.png
rename to plugins/c9.ide.collab/members/images/trash-icon@1x.png
diff --git a/plugins/c9.ide.collab/notifications/images/bk-close-btn.png b/plugins/c9.ide.collab/notifications/images/bk-close-btn@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/notifications/images/bk-close-btn.png
rename to plugins/c9.ide.collab/notifications/images/bk-close-btn@1x.png
diff --git a/plugins/c9.ide.collab/timeslider/images/close_tab_btn.png b/plugins/c9.ide.collab/timeslider/images/close_tab_btn@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/timeslider/images/close_tab_btn.png
rename to plugins/c9.ide.collab/timeslider/images/close_tab_btn@1x.png
diff --git a/plugins/c9.ide.collab/timeslider/images/pause.png b/plugins/c9.ide.collab/timeslider/images/pause@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/timeslider/images/pause.png
rename to plugins/c9.ide.collab/timeslider/images/pause@1x.png
diff --git a/plugins/c9.ide.collab/timeslider/images/pause_flat_light.png b/plugins/c9.ide.collab/timeslider/images/pause_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/timeslider/images/pause_flat_light.png
rename to plugins/c9.ide.collab/timeslider/images/pause_flat_light@1x.png
diff --git a/plugins/c9.ide.collab/timeslider/images/play.png b/plugins/c9.ide.collab/timeslider/images/play@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/timeslider/images/play.png
rename to plugins/c9.ide.collab/timeslider/images/play@1x.png
diff --git a/plugins/c9.ide.collab/timeslider/images/play_flat_light.png b/plugins/c9.ide.collab/timeslider/images/play_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/timeslider/images/play_flat_light.png
rename to plugins/c9.ide.collab/timeslider/images/play_flat_light@1x.png
diff --git a/plugins/c9.ide.collab/timeslider/images/scrubber_flat_light.png b/plugins/c9.ide.collab/timeslider/images/scrubber_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/timeslider/images/scrubber_flat_light.png
rename to plugins/c9.ide.collab/timeslider/images/scrubber_flat_light@1x.png
diff --git a/plugins/c9.ide.collab/timeslider/images/stepper_buttons.png b/plugins/c9.ide.collab/timeslider/images/stepper_buttons@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/timeslider/images/stepper_buttons.png
rename to plugins/c9.ide.collab/timeslider/images/stepper_buttons@1x.png
diff --git a/plugins/c9.ide.collab/timeslider/images/stepper_buttons_flat_light.png b/plugins/c9.ide.collab/timeslider/images/stepper_buttons_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.collab/timeslider/images/stepper_buttons_flat_light.png
rename to plugins/c9.ide.collab/timeslider/images/stepper_buttons_flat_light@1x.png
diff --git a/plugins/c9.ide.console/style.css b/plugins/c9.ide.console/style.css
index 67c27050..ddec3371 100644
--- a/plugins/c9.ide.console/style.css
+++ b/plugins/c9.ide.console/style.css
@@ -8,12 +8,5 @@
 }
 
 .console .console_close_btn {
-    background-image: url("@{icon-path}/@{button-console-close}");
-}
-
-@media print, (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx) {
-    .console .console_close_btn {
-        background-image: url("@{icon-path}/@{button-console-close-retina}");
-        background-size: 22px 66px;
-    }
+    .image-2x("@{icon-path}/@{button-console-close}", 22px, 66px);
 }
\ No newline at end of file
diff --git a/plugins/c9.ide.find.replace/findreplace.css b/plugins/c9.ide.find.replace/findreplace.css
index eabb424a..4b4645a4 100644
--- a/plugins/c9.ide.find.replace/findreplace.css
+++ b/plugins/c9.ide.find.replace/findreplace.css
@@ -18,10 +18,10 @@
 }
 
 .btnquicksearchnav.btnquicksearchnavLeft .lbl span {
-    background-image: url("@{icon-path}/@{find-next-image}");
+    .image-2x("@{icon-path}/@{find-next-image}", 20px, 100px);
 }
 .btnquicksearchnav.btnquicksearchnavRight .lbl span {
-    background-image: url("@{icon-path}/@{find-previous-image}");
+    .image-2x("@{icon-path}/@{find-previous-image}", 20px, 100px);
 }
 
 .findInRangeMarker {
diff --git a/plugins/c9.ide.find.replace/icons/arrow_left_search.png b/plugins/c9.ide.find.replace/icons/arrow_left_search@1x.png
similarity index 100%
rename from plugins/c9.ide.find.replace/icons/arrow_left_search.png
rename to plugins/c9.ide.find.replace/icons/arrow_left_search@1x.png
diff --git a/plugins/c9.ide.find.replace/icons/arrow_left_search_flat_light.png b/plugins/c9.ide.find.replace/icons/arrow_left_search_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.find.replace/icons/arrow_left_search_flat_light.png
rename to plugins/c9.ide.find.replace/icons/arrow_left_search_flat_light@1x.png
diff --git a/plugins/c9.ide.find.replace/icons/arrow_right_search.png b/plugins/c9.ide.find.replace/icons/arrow_right_search@1x.png
similarity index 100%
rename from plugins/c9.ide.find.replace/icons/arrow_right_search.png
rename to plugins/c9.ide.find.replace/icons/arrow_right_search@1x.png
diff --git a/plugins/c9.ide.find.replace/icons/arrow_right_search_flat_light.png b/plugins/c9.ide.find.replace/icons/arrow_right_search_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.find.replace/icons/arrow_right_search_flat_light.png
rename to plugins/c9.ide.find.replace/icons/arrow_right_search_flat_light@1x.png
diff --git a/plugins/c9.ide.language/images/event.png b/plugins/c9.ide.language/images/event@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/event.png
rename to plugins/c9.ide.language/images/event@1x.png
diff --git a/plugins/c9.ide.language/images/event_flat_light.png b/plugins/c9.ide.language/images/event_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/event_flat_light.png
rename to plugins/c9.ide.language/images/event_flat_light@1x.png
diff --git a/plugins/c9.ide.language/images/method2.png b/plugins/c9.ide.language/images/method2@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/method2.png
rename to plugins/c9.ide.language/images/method2@1x.png
diff --git a/plugins/c9.ide.language/images/method2_flat_light.png b/plugins/c9.ide.language/images/method2_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/method2_flat_light.png
rename to plugins/c9.ide.language/images/method2_flat_light@1x.png
diff --git a/plugins/c9.ide.language/images/method.png b/plugins/c9.ide.language/images/method@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/method.png
rename to plugins/c9.ide.language/images/method@1x.png
diff --git a/plugins/c9.ide.language/images/method_flat_light.png b/plugins/c9.ide.language/images/method_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/method_flat_light.png
rename to plugins/c9.ide.language/images/method_flat_light@1x.png
diff --git a/plugins/c9.ide.language/images/package.png b/plugins/c9.ide.language/images/package@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/package.png
rename to plugins/c9.ide.language/images/package@1x.png
diff --git a/plugins/c9.ide.language/images/package_flat_light.png b/plugins/c9.ide.language/images/package_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/package_flat_light.png
rename to plugins/c9.ide.language/images/package_flat_light@1x.png
diff --git a/plugins/c9.ide.language/images/property2.png b/plugins/c9.ide.language/images/property2@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/property2.png
rename to plugins/c9.ide.language/images/property2@1x.png
diff --git a/plugins/c9.ide.language/images/property2_flat_light.png b/plugins/c9.ide.language/images/property2_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/property2_flat_light.png
rename to plugins/c9.ide.language/images/property2_flat_light@1x.png
diff --git a/plugins/c9.ide.language/images/property.png b/plugins/c9.ide.language/images/property@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/property.png
rename to plugins/c9.ide.language/images/property@1x.png
diff --git a/plugins/c9.ide.language/images/property_flat_light.png b/plugins/c9.ide.language/images/property_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/property_flat_light.png
rename to plugins/c9.ide.language/images/property_flat_light@1x.png
diff --git a/plugins/c9.ide.language/images/tree_close_arrow_small.png b/plugins/c9.ide.language/images/tree_close_arrow_small@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/tree_close_arrow_small.png
rename to plugins/c9.ide.language/images/tree_close_arrow_small@1x.png
diff --git a/plugins/c9.ide.language/images/unknown2_flat_light.png b/plugins/c9.ide.language/images/unknown2_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/unknown2_flat_light.png
rename to plugins/c9.ide.language/images/unknown2_flat_light@1x.png
diff --git a/plugins/c9.ide.language/images/unknown_flat_light.png b/plugins/c9.ide.language/images/unknown_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.language/images/unknown_flat_light.png
rename to plugins/c9.ide.language/images/unknown_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/bug.png b/plugins/c9.ide.layout.classic/icons/bug@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/bug.png
rename to plugins/c9.ide.layout.classic/icons/bug@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/bug_flat_dark.png b/plugins/c9.ide.layout.classic/icons/bug_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/bug_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/bug_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/bug_flat_light.png b/plugins/c9.ide.layout.classic/icons/bug_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/bug_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/bug_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/console_close_btn.png b/plugins/c9.ide.layout.classic/icons/console_close_btn@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/console_close_btn.png
rename to plugins/c9.ide.layout.classic/icons/console_close_btn@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/console_close_btn_dark.png b/plugins/c9.ide.layout.classic/icons/console_close_btn_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/console_close_btn_dark.png
rename to plugins/c9.ide.layout.classic/icons/console_close_btn_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj.gif b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj.gif
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj@1x.gif
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_condition.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_condition@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_condition.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_condition@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_condition_disabled.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_condition_disabled@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_condition_disabled.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_condition_disabled@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line_condition.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line_condition@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line_condition.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line_condition@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line_dark.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line_dark.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_current_line_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_dark.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_dark.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled_current_line_dark.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled_current_line_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled_current_line_dark.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled_current_line_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled_dark.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled_dark.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_disabled_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_warn.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_warn@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_warn.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_warn@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_warn_dark.png b/plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_warn_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_warn_dark.png
rename to plugins/c9.ide.layout.classic/icons/debugger/brkp_obj_warn_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/brkpd_obj_disabled.gif b/plugins/c9.ide.layout.classic/icons/debugger/brkpd_obj_disabled@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/brkpd_obj_disabled.gif
rename to plugins/c9.ide.layout.classic/icons/debugger/brkpd_obj_disabled@1x.gif
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/current_line_dark.png b/plugins/c9.ide.layout.classic/icons/debugger/current_line_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/current_line_dark.png
rename to plugins/c9.ide.layout.classic/icons/debugger/current_line_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/genericvariable_obj.gif b/plugins/c9.ide.layout.classic/icons/debugger/genericvariable_obj@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/genericvariable_obj.gif
rename to plugins/c9.ide.layout.classic/icons/debugger/genericvariable_obj@1x.gif
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/genericvariable_obj_flat_light.png b/plugins/c9.ide.layout.classic/icons/debugger/genericvariable_obj_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/genericvariable_obj_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/debugger/genericvariable_obj_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/debugger/stack_co.png b/plugins/c9.ide.layout.classic/icons/debugger/stack_co@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/debugger/stack_co.png
rename to plugins/c9.ide.layout.classic/icons/debugger/stack_co@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/exception_break.png b/plugins/c9.ide.layout.classic/icons/exception_break@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/exception_break.png
rename to plugins/c9.ide.layout.classic/icons/exception_break@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/exception_break_flat_dark.png b/plugins/c9.ide.layout.classic/icons/exception_break_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/exception_break_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/exception_break_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/exception_break_flat_light.png b/plugins/c9.ide.layout.classic/icons/exception_break_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/exception_break_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/exception_break_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/file-tree-load-spinner-dark-unfocus_flat_light.gif b/plugins/c9.ide.layout.classic/icons/file-tree-load-spinner-dark-unfocus_flat_light@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/file-tree-load-spinner-dark-unfocus_flat_light.gif
rename to plugins/c9.ide.layout.classic/icons/file-tree-load-spinner-dark-unfocus_flat_light@1x.gif
diff --git a/plugins/c9.ide.layout.classic/icons/file-tree-load-spinner-selected_flat_light.gif b/plugins/c9.ide.layout.classic/icons/file-tree-load-spinner-selected_flat_light@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/file-tree-load-spinner-selected_flat_light.gif
rename to plugins/c9.ide.layout.classic/icons/file-tree-load-spinner-selected_flat_light@1x.gif
diff --git a/plugins/c9.ide.layout.classic/icons/file-tree-load-spinner_flat_light.gif b/plugins/c9.ide.layout.classic/icons/file-tree-load-spinner_flat_light@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/file-tree-load-spinner_flat_light.gif
rename to plugins/c9.ide.layout.classic/icons/file-tree-load-spinner_flat_light@1x.gif
diff --git a/plugins/c9.ide.layout.classic/icons/folder.png b/plugins/c9.ide.layout.classic/icons/folder@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/folder.png
rename to plugins/c9.ide.layout.classic/icons/folder@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/folder_alternative.png b/plugins/c9.ide.layout.classic/icons/folder_alternative@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/folder_alternative.png
rename to plugins/c9.ide.layout.classic/icons/folder_alternative@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/folder_flat_dark.png b/plugins/c9.ide.layout.classic/icons/folder_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/folder_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/folder_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/folder_flat_light.png b/plugins/c9.ide.layout.classic/icons/folder_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/folder_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/folder_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/folder_light.png b/plugins/c9.ide.layout.classic/icons/folder_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/folder_light.png
rename to plugins/c9.ide.layout.classic/icons/folder_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/pause.png b/plugins/c9.ide.layout.classic/icons/pause@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/pause.png
rename to plugins/c9.ide.layout.classic/icons/pause@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/pause_flat_dark.png b/plugins/c9.ide.layout.classic/icons/pause_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/pause_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/pause_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/pause_flat_light.png b/plugins/c9.ide.layout.classic/icons/pause_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/pause_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/pause_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/play.png b/plugins/c9.ide.layout.classic/icons/play@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/play.png
rename to plugins/c9.ide.layout.classic/icons/play@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/play_flat_dark.png b/plugins/c9.ide.layout.classic/icons/play_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/play_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/play_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/play_flat_light.png b/plugins/c9.ide.layout.classic/icons/play_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/play_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/play_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/pref-ico.png b/plugins/c9.ide.layout.classic/icons/pref-ico@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/pref-ico.png
rename to plugins/c9.ide.layout.classic/icons/pref-ico@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/pref-ico_flat_dark.png b/plugins/c9.ide.layout.classic/icons/pref-ico_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/pref-ico_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/pref-ico_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/pref-ico_flat_light.png b/plugins/c9.ide.layout.classic/icons/pref-ico_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/pref-ico_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/pref-ico_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/remove_breakpoints.png b/plugins/c9.ide.layout.classic/icons/remove_breakpoints@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/remove_breakpoints.png
rename to plugins/c9.ide.layout.classic/icons/remove_breakpoints@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/remove_breakpoints_flat_dark.png b/plugins/c9.ide.layout.classic/icons/remove_breakpoints_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/remove_breakpoints_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/remove_breakpoints_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/remove_breakpoints_flat_light.png b/plugins/c9.ide.layout.classic/icons/remove_breakpoints_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/remove_breakpoints_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/remove_breakpoints_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/restart-icon.png b/plugins/c9.ide.layout.classic/icons/restart-icon@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/restart-icon.png
rename to plugins/c9.ide.layout.classic/icons/restart-icon@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/restart-icon_flat_light.png b/plugins/c9.ide.layout.classic/icons/restart-icon_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/restart-icon_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/restart-icon_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/run.png b/plugins/c9.ide.layout.classic/icons/run@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/run.png
rename to plugins/c9.ide.layout.classic/icons/run@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/run_flat_dark.png b/plugins/c9.ide.layout.classic/icons/run_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/run_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/run_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/run_flat_light.png b/plugins/c9.ide.layout.classic/icons/run_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/run_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/run_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/scripts.png b/plugins/c9.ide.layout.classic/icons/scripts@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/scripts.png
rename to plugins/c9.ide.layout.classic/icons/scripts@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/scripts_flat_light.png b/plugins/c9.ide.layout.classic/icons/scripts_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/scripts_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/scripts_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/search-ico_flat_light.png b/plugins/c9.ide.layout.classic/icons/search-ico_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/search-ico_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/search-ico_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/step.png b/plugins/c9.ide.layout.classic/icons/step@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/step.png
rename to plugins/c9.ide.layout.classic/icons/step@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/step_flat_dark.png b/plugins/c9.ide.layout.classic/icons/step_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/step_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/step_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/step_flat_light.png b/plugins/c9.ide.layout.classic/icons/step_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/step_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/step_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/stepback.png b/plugins/c9.ide.layout.classic/icons/stepback@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/stepback.png
rename to plugins/c9.ide.layout.classic/icons/stepback@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/stepback_flat_dark.png b/plugins/c9.ide.layout.classic/icons/stepback_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/stepback_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/stepback_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/stepback_flat_light.png b/plugins/c9.ide.layout.classic/icons/stepback_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/stepback_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/stepback_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/stepinto.png b/plugins/c9.ide.layout.classic/icons/stepinto@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/stepinto.png
rename to plugins/c9.ide.layout.classic/icons/stepinto@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/stepinto_flat_dark.png b/plugins/c9.ide.layout.classic/icons/stepinto_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/stepinto_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/stepinto_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/stepinto_flat_light.png b/plugins/c9.ide.layout.classic/icons/stepinto_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/stepinto_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/stepinto_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/stop.png b/plugins/c9.ide.layout.classic/icons/stop@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/stop.png
rename to plugins/c9.ide.layout.classic/icons/stop@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/stop_flat_light.png b/plugins/c9.ide.layout.classic/icons/stop_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/stop_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/stop_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/toggle_breakpoints1_flat_dark.png b/plugins/c9.ide.layout.classic/icons/toggle_breakpoints1_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/toggle_breakpoints1_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/toggle_breakpoints1_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/toggle_breakpoints1_flat_light.png b/plugins/c9.ide.layout.classic/icons/toggle_breakpoints1_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/toggle_breakpoints1_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/toggle_breakpoints1_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/toggle_breakpoints2.png b/plugins/c9.ide.layout.classic/icons/toggle_breakpoints2@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/toggle_breakpoints2.png
rename to plugins/c9.ide.layout.classic/icons/toggle_breakpoints2@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/toggle_breakpoints2_flat_dark.png b/plugins/c9.ide.layout.classic/icons/toggle_breakpoints2_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/toggle_breakpoints2_flat_dark.png
rename to plugins/c9.ide.layout.classic/icons/toggle_breakpoints2_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/icons/toggle_breakpoints2_flat_light.png b/plugins/c9.ide.layout.classic/icons/toggle_breakpoints2_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/icons/toggle_breakpoints2_flat_light.png
rename to plugins/c9.ide.layout.classic/icons/toggle_breakpoints2_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/ace_error_dark.png b/plugins/c9.ide.layout.classic/images/ace_error_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/ace_error_dark.png
rename to plugins/c9.ide.layout.classic/images/ace_error_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/ace_error_flat_light.png b/plugins/c9.ide.layout.classic/images/ace_error_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/ace_error_flat_light.png
rename to plugins/c9.ide.layout.classic/images/ace_error_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/ace_error_light.png b/plugins/c9.ide.layout.classic/images/ace_error_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/ace_error_light.png
rename to plugins/c9.ide.layout.classic/images/ace_error_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/ace_warning_dark.png b/plugins/c9.ide.layout.classic/images/ace_warning_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/ace_warning_dark.png
rename to plugins/c9.ide.layout.classic/images/ace_warning_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/ace_warning_flat_light.png b/plugins/c9.ide.layout.classic/images/ace_warning_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/ace_warning_flat_light.png
rename to plugins/c9.ide.layout.classic/images/ace_warning_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/ace_warning_light_flat_light.png b/plugins/c9.ide.layout.classic/images/ace_warning_light_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/ace_warning_light_flat_light.png
rename to plugins/c9.ide.layout.classic/images/ace_warning_light_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/arrow_down_grey.png b/plugins/c9.ide.layout.classic/images/arrow_down_grey@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/arrow_down_grey.png
rename to plugins/c9.ide.layout.classic/images/arrow_down_grey@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/bk-close-btn.png b/plugins/c9.ide.layout.classic/images/bk-close-btn@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/bk-close-btn.png
rename to plugins/c9.ide.layout.classic/images/bk-close-btn@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/btnclose.gif b/plugins/c9.ide.layout.classic/images/btnclose@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/btnclose.gif
rename to plugins/c9.ide.layout.classic/images/btnclose@1x.gif
diff --git a/plugins/c9.ide.layout.classic/images/btnclose_flat_light.png b/plugins/c9.ide.layout.classic/images/btnclose_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/btnclose_flat_light.png
rename to plugins/c9.ide.layout.classic/images/btnclose_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/c9-logo-blue.png b/plugins/c9.ide.layout.classic/images/c9-logo-blue@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/c9-logo-blue.png
rename to plugins/c9.ide.layout.classic/images/c9-logo-blue@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/c9-logo-white.png b/plugins/c9.ide.layout.classic/images/c9-logo-white@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/c9-logo-white.png
rename to plugins/c9.ide.layout.classic/images/c9-logo-white@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/c9-no-repeat.png b/plugins/c9.ide.layout.classic/images/c9-no-repeat@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/c9-no-repeat.png
rename to plugins/c9.ide.layout.classic/images/c9-no-repeat@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/c9-no-repeat_flat_dark.png b/plugins/c9.ide.layout.classic/images/c9-no-repeat_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/c9-no-repeat_flat_dark.png
rename to plugins/c9.ide.layout.classic/images/c9-no-repeat_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/c9-no-repeat_flat_light.png b/plugins/c9.ide.layout.classic/images/c9-no-repeat_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/c9-no-repeat_flat_light.png
rename to plugins/c9.ide.layout.classic/images/c9-no-repeat_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/c9-repeat-x.png b/plugins/c9.ide.layout.classic/images/c9-repeat-x@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/c9-repeat-x.png
rename to plugins/c9.ide.layout.classic/images/c9-repeat-x@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/c9-repeat-x_flat_dark.png b/plugins/c9.ide.layout.classic/images/c9-repeat-x_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/c9-repeat-x_flat_dark.png
rename to plugins/c9.ide.layout.classic/images/c9-repeat-x_flat_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/c9-repeat-x_flat_light.png b/plugins/c9.ide.layout.classic/images/c9-repeat-x_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/c9-repeat-x_flat_light.png
rename to plugins/c9.ide.layout.classic/images/c9-repeat-x_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/checkbox_black.png b/plugins/c9.ide.layout.classic/images/checkbox_black@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/checkbox_black.png
rename to plugins/c9.ide.layout.classic/images/checkbox_black@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/checkbox_black_flat_light.png b/plugins/c9.ide.layout.classic/images/checkbox_black_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/checkbox_black_flat_light.png
rename to plugins/c9.ide.layout.classic/images/checkbox_black_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/checkbox_flat_light.png b/plugins/c9.ide.layout.classic/images/checkbox_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/checkbox_flat_light.png
rename to plugins/c9.ide.layout.classic/images/checkbox_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/clear_dark_flat_light.png b/plugins/c9.ide.layout.classic/images/clear_dark_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/clear_dark_flat_light.png
rename to plugins/c9.ide.layout.classic/images/clear_dark_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/clear_light_flat_light.png b/plugins/c9.ide.layout.classic/images/clear_light_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/clear_light_flat_light.png
rename to plugins/c9.ide.layout.classic/images/clear_light_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/close_tab_btn.png b/plugins/c9.ide.layout.classic/images/close_tab_btn@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/close_tab_btn.png
rename to plugins/c9.ide.layout.classic/images/close_tab_btn@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/close_tab_btn_flat_light.png b/plugins/c9.ide.layout.classic/images/close_tab_btn_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/close_tab_btn_flat_light.png
rename to plugins/c9.ide.layout.classic/images/close_tab_btn_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/dropdown-dark-glossy/button.png b/plugins/c9.ide.layout.classic/images/dropdown-dark-glossy/button@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/dropdown-dark-glossy/button.png
rename to plugins/c9.ide.layout.classic/images/dropdown-dark-glossy/button@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-selected.gif b/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-selected@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-selected.gif
rename to plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-selected@1x.gif
diff --git a/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-unfocus.gif b/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-unfocus@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-unfocus.gif
rename to plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-unfocus@1x.gif
diff --git a/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-unfocus_flat_light.gif b/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-unfocus_flat_light@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-unfocus_flat_light.gif
rename to plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark-unfocus_flat_light@1x.gif
diff --git a/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark.gif b/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark.gif
rename to plugins/c9.ide.layout.classic/images/file-tree-load-spinner-dark@1x.gif
diff --git a/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-selected.gif b/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-selected@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/file-tree-load-spinner-selected.gif
rename to plugins/c9.ide.layout.classic/images/file-tree-load-spinner-selected@1x.gif
diff --git a/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-selected_flat_light.gif b/plugins/c9.ide.layout.classic/images/file-tree-load-spinner-selected_flat_light@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/file-tree-load-spinner-selected_flat_light.gif
rename to plugins/c9.ide.layout.classic/images/file-tree-load-spinner-selected_flat_light@1x.gif
diff --git a/plugins/c9.ide.layout.classic/images/file-tree-load-spinner.gif b/plugins/c9.ide.layout.classic/images/file-tree-load-spinner@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/file-tree-load-spinner.gif
rename to plugins/c9.ide.layout.classic/images/file-tree-load-spinner@1x.gif
diff --git a/plugins/c9.ide.layout.classic/images/file-tree-load-spinner_flat_light.gif b/plugins/c9.ide.layout.classic/images/file-tree-load-spinner_flat_light@1x.gif
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/file-tree-load-spinner_flat_light.gif
rename to plugins/c9.ide.layout.classic/images/file-tree-load-spinner_flat_light@1x.gif
diff --git a/plugins/c9.ide.layout.classic/images/gecko_mask_flat_light.png b/plugins/c9.ide.layout.classic/images/gecko_mask_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/gecko_mask_flat_light.png
rename to plugins/c9.ide.layout.classic/images/gecko_mask_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/loading-logo.png b/plugins/c9.ide.layout.classic/images/loading-logo@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/loading-logo.png
rename to plugins/c9.ide.layout.classic/images/loading-logo@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/maximize.png b/plugins/c9.ide.layout.classic/images/maximize@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/maximize.png
rename to plugins/c9.ide.layout.classic/images/maximize@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/maximize_dark.png b/plugins/c9.ide.layout.classic/images/maximize_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/maximize_dark.png
rename to plugins/c9.ide.layout.classic/images/maximize_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/running_flat_light.png b/plugins/c9.ide.layout.classic/images/running_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/running_flat_light.png
rename to plugins/c9.ide.layout.classic/images/running_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tab-save-spinner-active.png b/plugins/c9.ide.layout.classic/images/tab-save-spinner-active@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tab-save-spinner-active.png
rename to plugins/c9.ide.layout.classic/images/tab-save-spinner-active@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tab-save-spinner-active_flat_light.png b/plugins/c9.ide.layout.classic/images/tab-save-spinner-active_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tab-save-spinner-active_flat_light.png
rename to plugins/c9.ide.layout.classic/images/tab-save-spinner-active_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tab_menu.png b/plugins/c9.ide.layout.classic/images/tab_menu@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tab_menu.png
rename to plugins/c9.ide.layout.classic/images/tab_menu@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tab_menu_dark.png b/plugins/c9.ide.layout.classic/images/tab_menu_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tab_menu_dark.png
rename to plugins/c9.ide.layout.classic/images/tab_menu_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tab_menu_flat_light.png b/plugins/c9.ide.layout.classic/images/tab_menu_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tab_menu_flat_light.png
rename to plugins/c9.ide.layout.classic/images/tab_menu_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tab_plus.png b/plugins/c9.ide.layout.classic/images/tab_plus@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tab_plus.png
rename to plugins/c9.ide.layout.classic/images/tab_plus@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tab_plus_dark.png b/plugins/c9.ide.layout.classic/images/tab_plus_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tab_plus_dark.png
rename to plugins/c9.ide.layout.classic/images/tab_plus_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tab_plus_flat_light.png b/plugins/c9.ide.layout.classic/images/tab_plus_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tab_plus_flat_light.png
rename to plugins/c9.ide.layout.classic/images/tab_plus_flat_light@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tabsave-flat.png b/plugins/c9.ide.layout.classic/images/tabsave-flat@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tabsave-flat.png
rename to plugins/c9.ide.layout.classic/images/tabsave-flat@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tabsave.png b/plugins/c9.ide.layout.classic/images/tabsave@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tabsave.png
rename to plugins/c9.ide.layout.classic/images/tabsave@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tree_close_arrow_small.png b/plugins/c9.ide.layout.classic/images/tree_close_arrow_small@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tree_close_arrow_small.png
rename to plugins/c9.ide.layout.classic/images/tree_close_arrow_small@1x.png
diff --git a/plugins/c9.ide.layout.classic/images/tree_close_arrow_small_dark.png b/plugins/c9.ide.layout.classic/images/tree_close_arrow_small_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.layout.classic/images/tree_close_arrow_small_dark.png
rename to plugins/c9.ide.layout.classic/images/tree_close_arrow_small_dark@1x.png
diff --git a/plugins/c9.ide.layout.classic/layout.js b/plugins/c9.ide.layout.classic/layout.js
index c2f32a63..e68821b0 100644
--- a/plugins/c9.ide.layout.classic/layout.js
+++ b/plugins/c9.ide.layout.classic/layout.js
@@ -24,6 +24,8 @@ define(function(require, exports, module) {
         var plugin = new Plugin("Ajax.org", main.consumes);
         var emit = plugin.getEmitter();
         
+        var highResolution = c9.location.indexOf("2x=1") > -1;
+        
         var dashboardUrl = options.dashboardUrl || "/dashboard.html";
         
         var logobar, removeTheme, theme;
@@ -109,7 +111,7 @@ define(function(require, exports, module) {
             // Offline
             // preload the offline images programmatically:
             [
-                "noconnection.png", "close_tab_btn.png"
+                "close_tab_btn@1x.png"
             ].forEach(function(p) {
                 var img = new Image();
                 img.src = options.staticPrefix + "/images/" + p;
@@ -135,6 +137,15 @@ define(function(require, exports, module) {
             "flat-dark": 1
         };
         
+        function setImageResolution(value) {
+            if (window.matchMedia) {
+                var mq = window.matchMedia("(-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx) ");
+                if (mq.matches || highResolution)
+                    return value.replace(/@1x/g, "@2x");
+            }
+            return value;
+        }
+        
         function updateTheme(noquestion, type) {
             var sTheme = settings.get("user/general/@skin");
             if (!allowedThemes[sTheme])
@@ -160,6 +171,8 @@ define(function(require, exports, module) {
                         theme = theme.replace(/(url\(["']?)\/static\/plugins\//g, function(_, x) {
                             return x + url;
                         });
+                        theme = setImageResolution(theme);
+                        
                         // Load the theme css
                         ui.insertCss(theme, false, {
                             addOther: function(remove) { removeTheme = remove; }
diff --git a/plugins/c9.ide.layout.classic/less/lesshat.less b/plugins/c9.ide.layout.classic/less/lesshat.less
index 302260e5..ade915fe 100755
--- a/plugins/c9.ide.layout.classic/less/lesshat.less
+++ b/plugins/c9.ide.layout.classic/less/lesshat.less
@@ -20,13 +20,9 @@
 .image-2x(@image; @width; @height; @repeat: no-repeat; @important: false) {
     @filename  : ~`/(.*)\.(jpg|jpeg|png|gif)|$/.exec(@{image})[1] || ""`;
     @extension : ~`/(.*)\.(jpg|jpeg|png|gif)|$/.exec(@{image})[2] || ""`;
-    background-image: ~`(function(){ return "url(@{filename}.@{extension})" + ("@{important}" == "true" ? ' !important' : '');})()`;
     background-repeat: @repeat;
-
-    @media (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx) {
-        background-image: ~`(function(){ return "url(@{filename}@2x.@{extension})" + ("@{important}" == "true" ? ' !important' : '');})()`;
-        background-size: ~`(function(){ return "@{width} @{height}" + ("@{important}" == "true" ? ' !important' : '');})()`;
-    }
+    background-image: ~`(function(){ return "url(@{filename}@1x.@{extension})" + ("@{important}" == "true" ? ' !important' : '');})()`;
+    background-size: ~`(function(){ return "@{width} @{height}" + ("@{important}" == "true" ? ' !important' : '');})()`;
 }
 .display(@state){
     .display(@state) when (@state = true) {
diff --git a/plugins/c9.ide.layout.classic/loading-flat.css b/plugins/c9.ide.layout.classic/loading-flat.css
index 25c7e30e..2808067b 100644
--- a/plugins/c9.ide.layout.classic/loading-flat.css
+++ b/plugins/c9.ide.layout.classic/loading-flat.css
@@ -27,7 +27,7 @@
 }
 
 #c9logo{
-    background-image: url(images/c9-logo-blue.png);
+    background-image: url(images/c9-logo-blue@1x.png);
     background-repeat: no-repeat;
     background-position: 50% 30%;
     position: relative;
@@ -38,7 +38,7 @@
     height: 279px;
 }
 .dark #c9logo{
-    background-image: url(images/c9-logo-white.png);
+    background-image: url(images/c9-logo-white@1x.png);
 }
 
 @media screen and (max-height: 600px) {
diff --git a/plugins/c9.ide.layout.classic/loading.css b/plugins/c9.ide.layout.classic/loading.css
index e9a7c34d..ca46f202 100644
--- a/plugins/c9.ide.layout.classic/loading.css
+++ b/plugins/c9.ide.layout.classic/loading.css
@@ -1,5 +1,5 @@
 #loadingide {
-    background-image: url(images/loading-logo.png);
+    background-image: url(images/loading-logo@1x.png);
     background-repeat: no-repeat;
     background-color: #222222;
     background-position: 50% 40%;
diff --git a/plugins/c9.ide.layout.classic/skins.xml b/plugins/c9.ide.layout.classic/skins.xml
index 98a24f02..4ec81650 100644
--- a/plugins/c9.ide.layout.classic/skins.xml
+++ b/plugins/c9.ide.layout.classic/skins.xml
@@ -69,7 +69,6 @@
                         <div class="c9-mbar-round">
                             <a id="backToC9" href="http://c9.io/" class="mainlogo backToC9" target="_blank" title="Go to c9.io">c9.io</a>
                             <div class="c9-activity" id="saveStatus"><div class="light"> </div></div>
-                            <!--div id="offlineInfoDiv" class="c9-offlineInfo menu-bk upward moveleft menu-bkFocus">Keep working without<br />internet. When you're back online, Cloud9 syncs your files for you!<div class="offlineInfoWarn">Some features are disabled.</div></div-->
                         </div>
                     </div>
                 </div>
diff --git a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less
index 7246ca15..a92f9b3d 100644
--- a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less
+++ b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less
@@ -977,7 +977,6 @@
 @button-console-active-background: lighten(rgba(0, 0, 0, 0.09), @lighten-chrome);
 
 @button-console-close: "console_close_btn_dark.png";
-@button-console-close-retina: "console_close_btn_dark@2x.png";
 @button-console-clear: "clear_dark.png";
 @button-console-maximize: "maximize_dark.png";
 @button-console-popout: "popout_dark.png";
diff --git a/plugins/c9.ide.layout.classic/themes/default-dark.less b/plugins/c9.ide.layout.classic/themes/default-dark.less
index bdcb5ab8..651e18f2 100644
--- a/plugins/c9.ide.layout.classic/themes/default-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/default-dark.less
@@ -977,7 +977,6 @@
 @button-console-active-background: lighten(rgba(0, 0, 0, 0.09), @lighten-chrome);
 
 @button-console-close: "console_close_btn_dark.png";
-@button-console-close-retina: "console_close_btn_dark@2x.png";
 @button-console-clear: "clear_dark.png";
 @button-console-maximize: "maximize_dark.png";
 @button-console-popout: "popout_dark.png";
diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-dark.less b/plugins/c9.ide.layout.classic/themes/default-flat-dark.less
index adbed39c..b9a60c8d 100644
--- a/plugins/c9.ide.layout.classic/themes/default-flat-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/default-flat-dark.less
@@ -977,7 +977,6 @@
 @button-console-active-background: darken(rgba(255, 255, 255, 0.4), @darken-chrome);
 
 @button-console-close: "console_close_btn.png";
-@button-console-close-retina: "console_close_btn@2x.png";
 @button-console-clear: "clear_dark_flat_light.png";
 @button-console-maximize: "maximize.png";
 @button-console-popout: "popout.png";
diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-light.less b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
index 27427342..64b6e66f 100644
--- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less
+++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
@@ -977,7 +977,6 @@
 @button-console-active-background: darken(rgba(255, 255, 255, 0.4), @darken-chrome);
 
 @button-console-close: "console_close_btn.png";
-@button-console-close-retina: "console_close_btn@2x.png";
 @button-console-clear: "clear_dark_flat_light.png";
 @button-console-maximize: "maximize.png";
 @button-console-popout: "popout.png";
diff --git a/plugins/c9.ide.layout.classic/themes/default-light-gray.less b/plugins/c9.ide.layout.classic/themes/default-light-gray.less
index 78595746..86d50691 100644
--- a/plugins/c9.ide.layout.classic/themes/default-light-gray.less
+++ b/plugins/c9.ide.layout.classic/themes/default-light-gray.less
@@ -977,7 +977,6 @@
 @button-console-active-background: darken(rgba(255, 255, 255, 0.4), @darken-chrome);
 
 @button-console-close: "console_close_btn.png";
-@button-console-close-retina: "console_close_btn@2x.png";
 @button-console-clear: "clear.png";
 @button-console-maximize: "maximize.png";
 @button-console-popout: "popout.png";
diff --git a/plugins/c9.ide.layout.classic/themes/default-light.less b/plugins/c9.ide.layout.classic/themes/default-light.less
index bfdb8bc9..fe4a1801 100644
--- a/plugins/c9.ide.layout.classic/themes/default-light.less
+++ b/plugins/c9.ide.layout.classic/themes/default-light.less
@@ -977,7 +977,6 @@
 @button-console-active-background: darken(rgba(255, 255, 255, 0.4), @darken-chrome);
 
 @button-console-close: "console_close_btn.png";
-@button-console-close-retina: "console_close_btn@2x.png";
 @button-console-clear: "clear.png";
 @button-console-maximize: "maximize.png";
 @button-console-popout: "popout.png";
diff --git a/plugins/c9.ide.layout.classic/themes/flat-dark.less b/plugins/c9.ide.layout.classic/themes/flat-dark.less
index 40d55d3f..cc216f1c 100644
--- a/plugins/c9.ide.layout.classic/themes/flat-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/flat-dark.less
@@ -218,8 +218,4 @@
 
 .has_apf .bar-preferences .blackdg{
     border: 0;
-}
-
-@media print, (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx) {
-    
-}
+}
\ No newline at end of file
diff --git a/plugins/c9.ide.preferences/images/tree_close_arrow_small.png b/plugins/c9.ide.preferences/images/tree_close_arrow_small@1x.png
similarity index 100%
rename from plugins/c9.ide.preferences/images/tree_close_arrow_small.png
rename to plugins/c9.ide.preferences/images/tree_close_arrow_small@1x.png
diff --git a/plugins/c9.ide.preview/images/c9-preview-repeat.png b/plugins/c9.ide.preview/images/c9-preview-repeat@1x.png
similarity index 100%
rename from plugins/c9.ide.preview/images/c9-preview-repeat.png
rename to plugins/c9.ide.preview/images/c9-preview-repeat@1x.png
diff --git a/plugins/c9.ide.preview/images/c9-preview-repeat_flat_dark.png b/plugins/c9.ide.preview/images/c9-preview-repeat_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.preview/images/c9-preview-repeat_flat_dark.png
rename to plugins/c9.ide.preview/images/c9-preview-repeat_flat_dark@1x.png
diff --git a/plugins/c9.ide.preview/images/c9-preview-repeat_flat_light.png b/plugins/c9.ide.preview/images/c9-preview-repeat_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.preview/images/c9-preview-repeat_flat_light.png
rename to plugins/c9.ide.preview/images/c9-preview-repeat_flat_light@1x.png
diff --git a/plugins/c9.ide.preview/preview.js b/plugins/c9.ide.preview/preview.js
index 93fda119..9dcfc61e 100644
--- a/plugins/c9.ide.preview/preview.js
+++ b/plugins/c9.ide.preview/preview.js
@@ -593,7 +593,7 @@ define(function(require, exports, module) {
                                                 new ui.button({
                                                     id: "btnMode",
                                                     submenu: menu.aml,
-                                                    icon: "page_white.png",
+                                                    icon: true,
                                                     skin: "btn-switcher",
                                                     caption: "browser"
                                                 })
diff --git a/plugins/c9.ide.run.debug/breakpoints.js b/plugins/c9.ide.run.debug/breakpoints.js
index 0b304d3d..769e6267 100644
--- a/plugins/c9.ide.run.debug/breakpoints.js
+++ b/plugins/c9.ide.run.debug/breakpoints.js
@@ -441,7 +441,7 @@ define(function(require, exports, module) {
             btnBreakpoints = hbox1.insertBefore(new ui.button({
                 id: "btnBreakpoints",
                 tooltip: "Deactivate All Breakpoints",
-                icon: "toggle_breakpoints2.png",
+                icon: true,
                 skinset: "default",
                 skin: "c9-menu-btn",
                 class: "nosize toggle_breakpoints2"
@@ -449,7 +449,7 @@ define(function(require, exports, module) {
             btnBpRemove = hbox2.insertBefore(new ui.button({
                 id: "btnBpRemove",
                 tooltip: "Clear All Breakpoints",
-                icon: "remove_breakpoints.png",
+                icon: true,
                 skinset: "default",
                 skin: "c9-menu-btn",
                 class: "nosize remove_breakpoints"
diff --git a/plugins/c9.ide.run.debug/callstack.js b/plugins/c9.ide.run.debug/callstack.js
index 752e9796..beced677 100644
--- a/plugins/c9.ide.run.debug/callstack.js
+++ b/plugins/c9.ide.run.debug/callstack.js
@@ -57,7 +57,7 @@ define(function(require, exports, module) {
                 caption: "Function",
                 value: "name",
                 width: "60%",
-                icon: "debugger/stckframe_obj.gif"
+                icon: true
             }, {
                 caption: "File",
                 getText: function(node) {
@@ -260,7 +260,7 @@ define(function(require, exports, module) {
             button = hbox.appendChild(new ui.button({
                 id: "btnScripts",
                 tooltip: "Available internal and external scripts",
-                icon: "scripts.png",
+                icon: true,
                 right: "0",
                 top: "0",
                 class: "scripts",
diff --git a/plugins/c9.ide.run.debug/debuggers/debugger.xml b/plugins/c9.ide.run.debug/debuggers/debugger.xml
index e757fb11..9d47a94c 100644
--- a/plugins/c9.ide.run.debug/debuggers/debugger.xml
+++ b/plugins/c9.ide.run.debug/debuggers/debugger.xml
@@ -2,7 +2,7 @@
     <a:bar id="hbox" skin="toolbar-top" class="fakehbox aligncenter debugger_buttons basic">
         <a:button id="btnResume"
           tooltip  = "Resume"
-          icon     = "play.png"
+          icon     = "true"
           command  = "resume"
           skin     = "c9-menu-btn"
           class    = "nosize play"
@@ -11,26 +11,26 @@
           tooltip  = "Suspend"
           skin     = "c9-menu-btn"
           class    = "nosize pause"
-          icon     = "pause.png"
+          icon     = "true"
           command  = "suspend"
           disabled = "true" />
         <a:button id="btnStepOver"
           tooltip  = "Step Over"
-          icon     = "step.png"
+          icon     = "true"
           skin     = "c9-menu-btn"
           class    = "nosize step"
           command  = "stepover"
           disabled = "true" />
         <a:button id="btnStepInto"
           tooltip  = "Step Into"
-          icon     = "stepinto.png"
+          icon     = "true"
           skin     = "c9-menu-btn"
           class    = "nosize stepinto"
           command  = "stepinto"
           disabled = "true" />
         <a:button id="btnStepOut"
           tooltip  = "Step Out"
-          icon     = "stepback.png"
+          icon     = "true"
           skin     = "c9-menu-btn"
           class    = "nosize stepback"
           command  = "stepout"
@@ -38,7 +38,7 @@
         <a:divider  skin="c9-divider" style="margin:0 3px 0 3px" />
         <a:button id="btnPause"
           tooltip  = "Don't pause on exceptions"
-          icon     = "exception_break.png"
+          icon     = "true"
           class    = "pause0 nosize exception_break"
           skinset  = "default"
           skin     = "c9-menu-btn" />
diff --git a/plugins/c9.ide.run.debug/variables.js b/plugins/c9.ide.run.debug/variables.js
index d9fca8fa..78a1acb9 100644
--- a/plugins/c9.ide.run.debug/variables.js
+++ b/plugins/c9.ide.run.debug/variables.js
@@ -43,7 +43,7 @@ define(function(require, exports, module) {
                 value: "name",
                 defaultValue: "Scope",
                 width: "40%",
-                icon: "debugger/genericvariable_obj.gif",
+                icon: true,
                 type: "tree"
             }, {
                 caption: "Value",
diff --git a/plugins/c9.ide.run.debug/watches.js b/plugins/c9.ide.run.debug/watches.js
index b63577d3..d2cc9c92 100644
--- a/plugins/c9.ide.run.debug/watches.js
+++ b/plugins/c9.ide.run.debug/watches.js
@@ -65,7 +65,7 @@ define(function(require, exports, module) {
                 match: "name",
                 value: "name",
                 width: "60%",
-                icon: "debugger/genericvariable_obj.gif",
+                icon: true,
                 type: "tree",
                 editor: "textbox"
             }, { 
diff --git a/plugins/c9.ide.run/gui.js b/plugins/c9.ide.run/gui.js
index 2a326d3d..daa37a6f 100644
--- a/plugins/c9.ide.run/gui.js
+++ b/plugins/c9.ide.run/gui.js
@@ -628,7 +628,7 @@ define(function(require, module, exports) {
                 caption: "Run",
                 disabled: true,
                 class: "runbtn stopped",
-                icon: "run.png",
+                icon: true,
             }), 100, plugin);
 
             btnRun.on("contextmenu", function(e) {
diff --git a/plugins/c9.ide.run/output.xml b/plugins/c9.ide.run/output.xml
index 31265eac..e25087fc 100644
--- a/plugins/c9.ide.run/output.xml
+++ b/plugins/c9.ide.run/output.xml
@@ -5,7 +5,7 @@
             skin     = "c9-toolbarbutton-glossy"
             caption  = "Run"
             width    = "54"
-            icon     = "run.png"
+            icon     = "true"
             class    = "runbtn stopped"
             visible  = "true"
             style    = "min-width:54px;" />
@@ -13,11 +13,11 @@
             id       = "btnRestart"
             skin     = "c9-toolbarbutton-glossy"
             width    = "22"
-            icon     = "restart-icon.png"
+            icon     = "true"
             tooltip  = "Restart"
             class    = "light restart"
             style    = "min-width:22px" />
-        <!--<a:button skin="c9-toolbarbutton-glossy" id="btnConsoleClear" class="clear" icon="console_clear.png" />-->
+        <!--<a:button skin="c9-toolbarbutton-glossy" id="btnConsoleClear" class="clear" icon="true" />-->
         <a:textbox skin="tbsimple" id="tbName" initial-message="Run Config Name" style="min-width:40px"/>
         <a:divider skin="c9-divider" />
         <a:label style="min-width:64px">Command:</a:label>
@@ -26,7 +26,7 @@
         <a:button
             id       = "btnDebug"
             skin     = "c9-toolbarbutton-glossy"
-            icon     = "bug.png"
+            icon     = "true"
             state    = "true"
             class    = "bug"
             tooltip  = "Run in Debug Mode"
diff --git a/plugins/c9.ide.scm/icons/conflict-button.png b/plugins/c9.ide.scm/icons/conflict-button@1x.png
similarity index 100%
rename from plugins/c9.ide.scm/icons/conflict-button.png
rename to plugins/c9.ide.scm/icons/conflict-button@1x.png
diff --git a/plugins/c9.ide.scm/icons/sync-button-dark.png b/plugins/c9.ide.scm/icons/sync-button-dark@1x.png
similarity index 100%
rename from plugins/c9.ide.scm/icons/sync-button-dark.png
rename to plugins/c9.ide.scm/icons/sync-button-dark@1x.png
diff --git a/plugins/c9.ide.scm/icons/sync-button.png b/plugins/c9.ide.scm/icons/sync-button@1x.png
similarity index 100%
rename from plugins/c9.ide.scm/icons/sync-button.png
rename to plugins/c9.ide.scm/icons/sync-button@1x.png
diff --git a/plugins/c9.ide.scm/icons/syncing-conflict-dark.gif b/plugins/c9.ide.scm/icons/syncing-conflict-dark@1x.gif
similarity index 100%
rename from plugins/c9.ide.scm/icons/syncing-conflict-dark.gif
rename to plugins/c9.ide.scm/icons/syncing-conflict-dark@1x.gif
diff --git a/plugins/c9.ide.scm/icons/syncing-conflict.gif b/plugins/c9.ide.scm/icons/syncing-conflict@1x.gif
similarity index 100%
rename from plugins/c9.ide.scm/icons/syncing-conflict.gif
rename to plugins/c9.ide.scm/icons/syncing-conflict@1x.gif
diff --git a/plugins/c9.ide.scm/icons/syncing-dark.gif b/plugins/c9.ide.scm/icons/syncing-dark@1x.gif
similarity index 100%
rename from plugins/c9.ide.scm/icons/syncing-dark.gif
rename to plugins/c9.ide.scm/icons/syncing-dark@1x.gif
diff --git a/plugins/c9.ide.scm/icons/syncing-error-dark.gif b/plugins/c9.ide.scm/icons/syncing-error-dark@1x.gif
similarity index 100%
rename from plugins/c9.ide.scm/icons/syncing-error-dark.gif
rename to plugins/c9.ide.scm/icons/syncing-error-dark@1x.gif
diff --git a/plugins/c9.ide.scm/icons/syncing-error.gif b/plugins/c9.ide.scm/icons/syncing-error@1x.gif
similarity index 100%
rename from plugins/c9.ide.scm/icons/syncing-error.gif
rename to plugins/c9.ide.scm/icons/syncing-error@1x.gif
diff --git a/plugins/c9.ide.scm/icons/syncing.gif b/plugins/c9.ide.scm/icons/syncing@1x.gif
similarity index 100%
rename from plugins/c9.ide.scm/icons/syncing.gif
rename to plugins/c9.ide.scm/icons/syncing@1x.gif
diff --git a/plugins/c9.ide.test/icons/run.png b/plugins/c9.ide.test/icons/run@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/run.png
rename to plugins/c9.ide.test/icons/run@1x.png
diff --git a/plugins/c9.ide.test/icons/run_flat_light.png b/plugins/c9.ide.test/icons/run_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/run_flat_light.png
rename to plugins/c9.ide.test/icons/run_flat_light@1x.png
diff --git a/plugins/c9.ide.test/icons/stop.png b/plugins/c9.ide.test/icons/stop@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/stop.png
rename to plugins/c9.ide.test/icons/stop@1x.png
diff --git a/plugins/c9.ide.test/icons/stop_flat_light.png b/plugins/c9.ide.test/icons/stop_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/stop_flat_light.png
rename to plugins/c9.ide.test/icons/stop_flat_light@1x.png
diff --git a/plugins/c9.ide.test/icons/testError.png b/plugins/c9.ide.test/icons/testError@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/testError.png
rename to plugins/c9.ide.test/icons/testError@1x.png
diff --git a/plugins/c9.ide.test/icons/testFailed.png b/plugins/c9.ide.test/icons/testFailed@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/testFailed.png
rename to plugins/c9.ide.test/icons/testFailed@1x.png
diff --git a/plugins/c9.ide.test/icons/testFile.png b/plugins/c9.ide.test/icons/testFile@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/testFile.png
rename to plugins/c9.ide.test/icons/testFile@1x.png
diff --git a/plugins/c9.ide.test/icons/testIgnored.png b/plugins/c9.ide.test/icons/testIgnored@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/testIgnored.png
rename to plugins/c9.ide.test/icons/testIgnored@1x.png
diff --git a/plugins/c9.ide.test/icons/testNotRan.png b/plugins/c9.ide.test/icons/testNotRan@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/testNotRan.png
rename to plugins/c9.ide.test/icons/testNotRan@1x.png
diff --git a/plugins/c9.ide.test/icons/testPassed.png b/plugins/c9.ide.test/icons/testPassed@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/testPassed.png
rename to plugins/c9.ide.test/icons/testPassed@1x.png
diff --git a/plugins/c9.ide.test/icons/testPrepare.png b/plugins/c9.ide.test/icons/testPrepare@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/testPrepare.png
rename to plugins/c9.ide.test/icons/testPrepare@1x.png
diff --git a/plugins/c9.ide.test/icons/testSet.png b/plugins/c9.ide.test/icons/testSet@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/testSet.png
rename to plugins/c9.ide.test/icons/testSet@1x.png
diff --git a/plugins/c9.ide.test/icons/testTerminated.png b/plugins/c9.ide.test/icons/testTerminated@1x.png
similarity index 100%
rename from plugins/c9.ide.test/icons/testTerminated.png
rename to plugins/c9.ide.test/icons/testTerminated@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_condition_disabled_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_condition_disabled_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_condition_disabled_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_condition_disabled_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_condition_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_condition_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_condition_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_condition_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_condition_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_condition_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_condition_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_condition_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_dark_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_dark_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_dark_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_dark_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_current_line_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_dark_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_dark_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_dark_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_dark_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_current_line_dark_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_current_line_dark_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_current_line_dark_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_current_line_dark_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_dark_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_dark_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_dark_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_dark_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_disabled_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_flat_light_NOTGIF.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_flat_light_NOTGIF@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_flat_light_NOTGIF.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_flat_light_NOTGIF@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_warn_dark_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_warn_dark_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_warn_dark_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_warn_dark_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_warn_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_warn_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_warn_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkp_obj_warn_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/brkpd_obj_disabled_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/brkpd_obj_disabled_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/brkpd_obj_disabled_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/brkpd_obj_disabled_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/current_line_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/current_line_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/current_line_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/current_line_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/icons/debugger/stack_co_flat_light.png b/plugins/c9.ide.theme.flat/icons/debugger/stack_co_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/icons/debugger/stack_co_flat_light.png
rename to plugins/c9.ide.theme.flat/icons/debugger/stack_co_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/images/ace_info_flat_light.png b/plugins/c9.ide.theme.flat/images/ace_info_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/images/ace_info_flat_light.png
rename to plugins/c9.ide.theme.flat/images/ace_info_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/images/cloud9_logo.png b/plugins/c9.ide.theme.flat/images/cloud9_logo@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/images/cloud9_logo.png
rename to plugins/c9.ide.theme.flat/images/cloud9_logo@1x.png
diff --git a/plugins/c9.ide.theme.flat/images/trash-icon_flat_dark.png b/plugins/c9.ide.theme.flat/images/trash-icon_flat_dark@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/images/trash-icon_flat_dark.png
rename to plugins/c9.ide.theme.flat/images/trash-icon_flat_dark@1x.png
diff --git a/plugins/c9.ide.theme.flat/images/trash-icon_flat_light.png b/plugins/c9.ide.theme.flat/images/trash-icon_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/images/trash-icon_flat_light.png
rename to plugins/c9.ide.theme.flat/images/trash-icon_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/images/tree_close_arrow_small_dark_flat_light.png b/plugins/c9.ide.theme.flat/images/tree_close_arrow_small_dark_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/images/tree_close_arrow_small_dark_flat_light.png
rename to plugins/c9.ide.theme.flat/images/tree_close_arrow_small_dark_flat_light@1x.png
diff --git a/plugins/c9.ide.theme.flat/images/tree_close_arrow_small_flat_light.png b/plugins/c9.ide.theme.flat/images/tree_close_arrow_small_flat_light@1x.png
similarity index 100%
rename from plugins/c9.ide.theme.flat/images/tree_close_arrow_small_flat_light.png
rename to plugins/c9.ide.theme.flat/images/tree_close_arrow_small_flat_light@1x.png
diff --git a/plugins/c9.ide.ui/lib_apf.js b/plugins/c9.ide.ui/lib_apf.js
index e0fb7d30..a31561a2 100644
--- a/plugins/c9.ide.ui/lib_apf.js
+++ b/plugins/c9.ide.ui/lib_apf.js
@@ -4257,12 +4257,8 @@ apf.skins = {
             return;
         }
 
-        
-
         //Assuming image url
-        {
-            
-
+        if (strQuery && typeof strQuery == "string" && !apf.isTrue(strQuery)) {
             var isQualified = strQuery.match(/^(https?|file):/);
             oHtml.style.backgroundImage = "url(" + (isQualified ? "" : iconPath || "")
                 + strQuery + ")";
diff --git a/plugins/c9.ide.welcome/images/welcome-logo.png b/plugins/c9.ide.welcome/images/welcome-logo@1x.png
similarity index 100%
rename from plugins/c9.ide.welcome/images/welcome-logo.png
rename to plugins/c9.ide.welcome/images/welcome-logo@1x.png