diff --git a/source/css/_common/_component/group-pictures.styl b/source/css/_common/_component/group-pictures.styl
index a61717ff0..e5e20483c 100644
--- a/source/css/_common/_component/group-pictures.styl
+++ b/source/css/_common/_component/group-pictures.styl
@@ -1,14 +1,35 @@
-.posts-expand .group-picture {
+.post .group-picture {
   img {
+    box-sizing: border-box;
     padding: 0 3px;
     border: none;
   }
 }
 
-.posts-expand .group-picture-row {
+.post .group-picture-row {
   overflow: hidden;
   margin-top: 6px;
   &:first-child { margin-top: 0; }
 }
 
-.posts-expand .group-picture-column { float: left; }
+.post .group-picture-column { float: left; }
+
+.page-post-detail .post-body .group-picture-column {
+  float: none;
+  margin-top: 10px;
+  width: auto !important;
+  img { margin: 0 auto; }
+}
+
+.page-archive {
+  .group-picture-container { overflow: hidden; }
+  .group-picture-row {
+    float: left;
+    &:first-child { margin-top: 6px; }
+  }
+
+  .group-picture-column {
+    max-width: 150px;
+    max-height: 150px;
+  }
+}
diff --git a/source/js/fancy-box.js b/source/js/fancy-box.js
index 0cdded8d5..e198ec359 100644
--- a/source/js/fancy-box.js
+++ b/source/js/fancy-box.js
@@ -1,15 +1,19 @@
 $(document).ready(function() {
-  $('.content img').each(function () {
+  $('.content img').not('.group-picture img').each(function () {
     var $image = $(this);
     var $imageWrapLink = $image.parent('a');
 
     if ($imageWrapLink.size() < 1) {
       $imageWrapLink = $image.wrap('<a href="' + this.getAttribute('src') + '"></a>').parent('a');
     }
+
     $imageWrapLink.addClass('fancybox');
-    if(this.title){
-      $imageWrapLink.attr("title",this.title); //make sure img title tag will show correctly in fancybox
+
+    //make sure img title tag will show correctly in fancybox
+    if (this.title) {
+      $imageWrapLink.attr("title", this.title);
     }
+
   });
 });
 $('.fancybox').fancybox({