diff --git a/site/themes/citra-bs-theme/layouts/game/list.html b/site/themes/citra-bs-theme/layouts/game/list.html
index 2c93570..b2ba651 100644
--- a/site/themes/citra-bs-theme/layouts/game/list.html
+++ b/site/themes/citra-bs-theme/layouts/game/list.html
@@ -55,7 +55,9 @@
 							<span>{{ .Params.title }} {{ $type.name }} {{ $rating.name }}</span>
 						</td>
 						<td class="col-md-1 icon">
-							<img src="/images/game/icons/{{ .File.BaseFileName }}.png" />
+							{{ if (fileExists (print "static/images/game/icons/" .File.BaseFileName ".png")) }}
+								<img src="/images/game/icons/{{ .File.BaseFileName }}.png" />
+							{{ end }}
 						</td>
 						<td class="col-md-6 title" data-title="{{ strings.TrimPrefix "The " .Params.title }}">
 							<a href="{{ .Permalink }}">{{ .Params.title }}</a>
diff --git a/site/themes/citra-bs-theme/layouts/game/single.html b/site/themes/citra-bs-theme/layouts/game/single.html
index d1ced6d..30603f5 100644
--- a/site/themes/citra-bs-theme/layouts/game/single.html
+++ b/site/themes/citra-bs-theme/layouts/game/single.html
@@ -39,9 +39,11 @@
 	<h1>{{ .Title }}</h1>
   <div class="row">
     <div class="col-md-5">
-      <div class="boxart">
-        <img src="{{ .Site.BaseURL }}/images/game/boxart/{{ .Params.Banner | default (print .File.BaseFileName ".png") }}" />
-      </div>
+        {{ if (fileExists (print "static/images/game/boxart/" .File.BaseFileName ".png")) }}
+          <div class="boxart">
+              <img src="/images/game/boxart/{{ .File.BaseFileName }}.png" />
+          </div>  
+        {{ end }}
     </div>
     <div class="col-md-7">
       <!-- Metadata information -->
@@ -67,7 +69,11 @@
           </tr>
           <tr>
             <td>Game Icon</td>
-            <td><img class="img-responsive" src="{{ .Site.BaseURL }}/images/game/icons/{{ .File.BaseFileName }}.png" /></td>
+            <td>
+                {{ if (fileExists (print "static/images/game/icons/" .File.BaseFileName ".png")) }}
+                  <img src="/images/game/icons/{{ .File.BaseFileName }}.png" />
+                {{ end }}
+            </td>
           </tr>
           <tr>
             <td>Title IDs</td>