diff --git a/pom.xml b/pom.xml
index 36ad1dfa6ac842355a9f7a188b57d943a7cec28d..35b8776e46421f29d4a17e98fa15cc70ebfad0b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,6 +304,7 @@
 									<includes>
 										<include>bin/fess</include>
 										<include>bin/fess.in.sh</include>
+										<include>bin/generate-thumbnail</include>
 									</includes>
 								</resource>
 							</resources>
@@ -348,6 +349,7 @@
 									<includes>
 										<include>bin/fess</include>
 										<include>bin/fess.in.sh</include>
+										<include>bin/generate-thumbnail</include>
 									</includes>
 								</resource>
 							</resources>
@@ -490,6 +492,7 @@
 							<paths>
 								<path>${project.basedir}/src/main/assemblies/files/fess</path>
 								<path>${project.basedir}/src/main/assemblies/files/fess.in.sh</path>
+								<path>${project.basedir}/src/main/assemblies/files/generate-thumbnail</path>
 							</paths>
 							<dst>${packaging.fess.bin.dir}</dst>
 							<mapper>
@@ -736,6 +739,7 @@
 									<includes>
 										<include>fess</include>
 										<include>fess.in.sh</include>
+										<include>generate-thumbnail</include>
 									</includes>
 								</source>
 							</sources>
diff --git a/src/main/assemblies/files/generate-thumbnail b/src/main/assemblies/files/generate-thumbnail
index 2248ce372e8721ae5f7b663095556709f8a744eb..0316b3923e4ff73ac921f7210d4abfb456576523 100755
--- a/src/main/assemblies/files/generate-thumbnail
+++ b/src/main/assemblies/files/generate-thumbnail
@@ -1,14 +1,17 @@
 #!/bin/sh
+
 CMD_TYPE=$1
 URL=$2
 OUTPUT_FILE=$3
+
 if [ x"$CMD_TYPE" = "xmsoffice" ] ; then
   TARGET_FILE=`echo $URL | sed -e "s#^file:/*#/#g"`
   TMP_FILE=/tmp/thumbnail.$$.pdf
   unoconv -o $TMP_FILE -f pdf $TARGET_FILE
   convert -thumbnail 200x150! $TMP_FILE $OUTPUT_FILE
   rm $TMP_FILE
- else
-   echo "Unsupported type: $CMD_TYPE"
-   exit 1
- fi
+else
+  echo "Unsupported type: $CMD_TYPE"
+  exit 1
+fi
+
diff --git a/src/main/resources/fess_thumbnail.xml b/src/main/resources/fess_thumbnail.xml
index e0b23c3c696dd3db05ef78ae28c70ed92877d075..930554d8255e0bdc1b221d784a4b9c4c80c4d79f 100644
--- a/src/main/resources/fess_thumbnail.xml
+++ b/src/main/resources/fess_thumbnail.xml
@@ -6,11 +6,9 @@
 		<postConstruct name="add">
 			<arg>htmlThumbnailGenerator</arg>
 		</postConstruct>
-<!--
 		<postConstruct name="add">
 			<arg>msofficeThumbnailGenerator</arg>
 		</postConstruct>
--->
 	</component>
 	<component name="htmlThumbnailGenerator" class="org.codelibs.fess.thumbnail.impl.WebDriverGenerator">
 		<property name="webDriverCapabilities">
@@ -29,8 +27,7 @@
 <!--
 	<component name="htmlThumbnailGenerator" class="org.codelibs.fess.thumbnail.impl.CommandGenerator">
 		<property name="commandList">
-			["bash", 
-			"/usr/share/fess/bin/generate-thumbnail",
+			["/usr/share/fess/bin/generate-thumbnail",
 			"html",
 			"${url}",
 			"${outputFile}"]
@@ -44,11 +41,9 @@
 		</postConstruct>
 	</component>
 -->
-<!--
 	<component name="msofficeThumbnailGenerator" class="org.codelibs.fess.thumbnail.impl.CommandGenerator">
 		<property name="commandList">
-			["bash",
-			"/usr/share/fess/bin/generate-thumbnail",
+			["/usr/share/fess/bin/generate-thumbnail",
 			"msoffice",
 			"${url}",
 			"${outputFile}"]
@@ -96,5 +91,4 @@
 			</arg>
 		</postConstruct>
 	</component>
--->
 </components>
diff --git a/src/main/webapp/WEB-INF/view/searchResults.jsp b/src/main/webapp/WEB-INF/view/searchResults.jsp
index e860f63dddd0e1ad8624b9494a334eb34010717d..1f34c72fb71449b941a8e22ea64106584e0bc3fd 100644
--- a/src/main/webapp/WEB-INF/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/view/searchResults.jsp
@@ -28,7 +28,7 @@
 			<c:forEach var="doc" varStatus="s" items="${documentItems}">
 				<li id="result${s.index}">
 					<c:if test="${thumbnailSupport}">
-						<div class="col-md-3 thumbnailBox">
+						<div class="thumbnailBox">
 							<a class="link" href="${doc.url_link}" data-uri="${doc.url_link}"
 								data-id="${doc.doc_id}" data-order="${s.index}">
 								<img
@@ -37,11 +37,11 @@
 							</a>
 						</div>
 					</c:if>
-					<h3 class="col-md-9 title ellipsis">
+					<h3 class="title ellipsis">
 						<a class="link" href="${doc.url_link}" data-uri="${doc.url_link}"
 							data-id="${doc.doc_id}" data-order="${s.index}">${f:h(doc.content_title)}</a>
 					</h3>
-					<div class="col-md-9 body">
+					<div class="body">
 						<div class="description">${doc.content_description}</div>
 						<div class="site ellipsis">
 							<cite>${f:h(doc.site_path)}</cite>