diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index d8923ea7..bc8e5b0c 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -87,16 +87,10 @@
 }
 
 .g-organize-microthumb-grid-cell {
-  margin: 6px;
-  padding: 0 !important;
-  position: relative;
-}
-
-.g-organize-microthumb {
   display: block;
   height: 100px;
-  margin: 0;
-  padding: .4em 0;
+  margin: 6px;
+  padding: .4em 0 !important;
   position: relative;
   text-align: center;
   width: 110px;
@@ -106,7 +100,7 @@
   z-index: 2000 !important;
 }
 
-.g-organize-microthumb .ui-icon {
+.g-organize-microthumb-grid-cell .ui-icon {
   bottom: 0;
   left: 0;
   position: absolute;
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index 9a9cd819..f29680f7 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? foreach ($album->children(25, $offset) as $child): ?>
-<li class="g-organize-microthumb-grid-cell g-left ui-state-default" ref="<?= $child->id ?>">
-  <div id="g-organize-microthumb-<?= $child->id ?>"
-       class="g-organize-microthumb <?= $child->is_album() ? "g-album" : "g-photo" ?> ui-state-active">
+<li class="g-organize-microthumb-grid-cell g-left ui-state-default ui-state-active" ref="<?= $child->id ?>">
+  <!-- div id="g-organize-microthumb-<?= $child->id ?>"
+       class="g-organize-microthumb <?= $child->is_album() ? "g-album" : "g-photo" ?> ui-state-active" -->
     <?= $child->thumb_img(array("class" => "g-thumbnail", "ref" => $child->id), 90, true) ?>
     <span<?= $child->is_album() ? " class=\"ui-icon ui-icon-note\"" : "" ?>></span>
-  </div>
+  <!-- /div -->
 </li>
 <? endforeach ?>
 
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 12fa695d..630e8bbd 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -447,3 +447,4 @@ td {
 .rtl #g-view-menu #g-slideshow-link {
   background-image: url('../images/ico-view-slideshow-rtl.png');
 }
+