diff --git a/system/assets/responsive-overlays/1x.png b/system/assets/responsive-overlays/1x.png
new file mode 100644
index 000000000..950bda815
Binary files /dev/null and b/system/assets/responsive-overlays/1x.png differ
diff --git a/system/assets/responsive-overlays/2x.png b/system/assets/responsive-overlays/2x.png
new file mode 100644
index 000000000..69fc44ad2
Binary files /dev/null and b/system/assets/responsive-overlays/2x.png differ
diff --git a/system/assets/responsive-overlays/3x.png b/system/assets/responsive-overlays/3x.png
new file mode 100644
index 000000000..b03d155b9
Binary files /dev/null and b/system/assets/responsive-overlays/3x.png differ
diff --git a/system/assets/responsive-overlays/unknown.png b/system/assets/responsive-overlays/unknown.png
new file mode 100644
index 000000000..6a0737945
Binary files /dev/null and b/system/assets/responsive-overlays/unknown.png differ
diff --git a/system/config/system.yaml b/system/config/system.yaml
index a7c1ada23..a3ac7e7a4 100644
--- a/system/config/system.yaml
+++ b/system/config/system.yaml
@@ -63,3 +63,6 @@ debugger:
   twig: true                           # Enable debugging of Twig templates
   shutdown:
     close_connection: true             # Close the connection before calling onShutdown(). false for debugging
+
+images:
+  debug: false                         # Show an overlay over images indicating the pixel depth of the image when working with retina for example
diff --git a/system/src/Grav/Common/Page/Medium.php b/system/src/Grav/Common/Page/Medium.php
index b29068647..7a588c3f7 100644
--- a/system/src/Grav/Common/Page/Medium.php
+++ b/system/src/Grav/Common/Page/Medium.php
@@ -49,6 +49,7 @@ class Medium extends Data
 
     protected $type = 'guess';
     protected $quality = 85;
+    protected $debug_watermarked = false;
 
     public static $valid_actions = [
         // Medium functions
@@ -137,7 +138,7 @@ class Medium extends Data
         $config = self::$grav['config'];
 
         if ($this->image) {
-            $output = $this->image->cacheFile($this->type, $this->quality);
+            $output = $this->saveImage();
             $this->reset();
             $output = ROOT_DIR . $output;
         } else {
@@ -154,7 +155,7 @@ class Medium extends Data
     public function url($reset = true)
     {
         if ($this->image) {
-            $output = $this->image->cacheFile($this->type, $this->quality);
+            $output = $this->saveImage();
             
             if ($reset) $this->reset();
         } else {
@@ -351,6 +352,7 @@ class Medium extends Data
         }
         $this->type = 'guess';
         $this->quality = 80;
+        $this->debug_watermarked = false;
 
         return $this;
     }
@@ -417,6 +419,28 @@ class Medium extends Data
         return $this;
     }
 
+    protected function saveImage()
+    {
+        if (!$this->image) {
+            $this->image();
+        }
+
+        if (self::$grav['config']->get('system.images.debug') && !$this->debug_watermarked) {
+
+            $ratio = $this->get('ratio');
+            if (!$ratio) {
+                $ratio = 1;
+            }
+
+            $overlay = SYSTEM_DIR . '/assets/responsive-overlays/' . $ratio . 'x.png';
+            $overlay = file_exists($overlay) ? $overlay : SYSTEM_DIR . '/assets/responsive-overlays/unknown.png';
+
+            $this->image->merge(ImageFile::open($overlay));
+        }
+
+        return $this->image->cacheFile($this->type, $this->quality);
+    }
+
     /**
      * Add meta file for the medium.
      *
@@ -451,6 +475,8 @@ class Medium extends Data
             return;
         }
 
+        $alternative->set('ratio', $ratio);
+
         $this->alternatives[(float) $ratio] = $alternative;
     }