diff --git a/lib/Application/Utils.php b/lib/Application/Utils.php
index 25e9c4b..f844e6d 100644
--- a/lib/Application/Utils.php
+++ b/lib/Application/Utils.php
@@ -199,6 +199,16 @@ class Utils
                 return 'yaml';
             case 'yaml':
                 return 'yaml';
+            case 'png':
+                return 'image';
+            case 'jpg':
+                return 'image';
+            case 'gif':
+                return 'image';
+            case 'jpeg':
+                return 'image';
+            case 'bmp':
+                return 'image';
             default:
                 return 'text';
         }
diff --git a/views/file.twig b/views/file.twig
index 752e008..dd3ecbc 100644
--- a/views/file.twig
+++ b/views/file.twig
@@ -33,7 +33,11 @@
                 <a href="{{ baseurl }}/{{ repo }}/commits/{{ branch }}/{{ file }}" class="btn btn-small"><i class="icon-list-alt"></i> History</a>
             </div>
         </div>
+        {% if fileType == 'image' %}
+        <center><img src="{{ baseurl }}/{{ repo }}/raw/{{ branch }}/{{ file }}" alt="{{ file }}" class="image-blob" /></center>
+        {% else %}
         <textarea id="sourcecode" language="{{ fileType }}" readonly="readonly">{{ blob }}</textarea>
+        {% endif %}
     </div>
 
     <hr>
diff --git a/web/css/style.css b/web/css/style.css
index 3d2cb08..47dea85 100644
--- a/web/css/style.css
+++ b/web/css/style.css
@@ -258,6 +258,7 @@ table .span24{float:none;width:1884px;margin-left:0;}
 .source-view .source-diff .new{background-color:#DFD;}
 .source-view .source-diff .old{background-color:#FDD;}
 .source-view .source-diff .chunk{background-color:#e8e8e8;color:#999999;}
+.source-view .image-blob{padding:10px;max-width:600px;}
 .blame-view{width:100%;background-color:#f5f5f5;}.blame-view td{vertical-align:top;padding:8px;}
 .blame-view tr{border-bottom:1px solid #cccccc;}
 .blame-view tr:last-child{border-bottom:0;}
diff --git a/web/less/files.less b/web/less/files.less
index 1335516..20d45b9 100644
--- a/web/less/files.less
+++ b/web/less/files.less
@@ -52,6 +52,10 @@
       color:@grayLight;
     }
   }
+  .image-blob {
+    padding:10px;
+    max-width: 600px;
+  }
 }
 
 .blame-view {