3 files changed, 12 insertions, 8 deletions
diff --git a/themes/default/css/styles.css b/themes/default/css/styles.css
index f50362a6..341927ef 100644
--- a/themes/default/css/styles.css
+++ b/themes/default/css/styles.css
@@ -339,10 +339,8 @@ table.gBlockContent td {
   float: right;
 }
 #gItem img {
-	clear: both;
+  clear: both;
   display: block;
-  width: 500px;
-  height: 400px;
   border: 1px solid silver;
   background-color: #e7e7e7;
 }
@@ -425,8 +423,6 @@ table.gMetadata td.toggle {
 
 #gAlbumGrid .gItemContainer,
 #gAlbumGrid .gAlbumContainer {
-	width: 32%;
-	height: 220px;
 	float: left;
 	text-align: center;
 	border: 1px lightgray solid;
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 390a22b8..232e749b 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -15,7 +15,10 @@
         <? if ($child->is_album()): ?>
         <div class="gAlbumContainer gAlbum <?= text::alternate("first", "", "") ?>">
           <a href="<?= url::site("album/{$child->id}") ?>">
-            <img id="photo-id-<?= $child->id ?>" class="photo" alt="photo" src="<?= $child->thumbnail_url() ?>" />
+            <img id="photo-id-<?= $child->id ?>" class="photo"
+                 alt="photo" src="<?= $child->thumbnail_url() ?>"
+                 width="<?= $child->thumbnail_width ?>"
+                 height="<?= $child->thumbnail_height ?>" />
           </a>
           <h2>Album title</h2>
           <ul class="gMetadata">
@@ -26,7 +29,10 @@
         <? else: ?>
         <div class="gItemContainer <?= text::alternate("first", "", "") ?>">
           <a href="<?= url::site("photo/{$child->id}") ?>">
-            <img id="photo-id-<?= $child->id ?>" class="photo" alt="photo" src="<?= $child->thumbnail_url() ?>" />
+            <img id="photo-id-<?= $child->id ?>" class="photo"
+                 alt="photo" src="<?= $child->thumbnail_url() ?>"
+                 width="<?= $child->thumbnail_width ?>"
+                 height="<?= $child->thumbnail_height ?>" />
           </a>
           <h2><?= $child->title ?></h2>
         </div>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 31458094..8f7fa791 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -8,7 +8,9 @@
         <a href="" class="buttonlink">Full size (1024x768)</a>
         <a href="" class="buttonlink">Slideshow</a>
 
-        <img id="photo-id-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>" />
+        <img id="photo-id-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>"
+             width="<?= $item->resize_width ?>"
+             height="<?= $item->resize_height ?>" />
         <h1><?= $item->title ?></h1>
         <p><?= $item->description ?></p>
       </div>