diff --git a/src/main/webapp/WEB-INF/orig/view/advance.jsp b/src/main/webapp/WEB-INF/orig/view/advance.jsp
index 0c05adfd9..0c00063d5 100644
--- a/src/main/webapp/WEB-INF/orig/view/advance.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/advance.jsp
@@ -331,7 +331,7 @@
 			</div>
 
 			<div class="row">
-				<button type="submit" name="search" id="searchButton" class="btn btn-primary btn-lg mx-auto">
+				<button type="submit" name="search" id="searchButton" class="btn btn-primary mx-auto">
 					<i class="fa fa-search"></i>
 					<la:message key="labels.index_form_search_btn" />
 				</button>
diff --git a/src/main/webapp/WEB-INF/orig/view/index.jsp b/src/main/webapp/WEB-INF/orig/view/index.jsp
index 7b965f0a4..67cbf4246 100644
--- a/src/main/webapp/WEB-INF/orig/view/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/index.jsp
@@ -143,7 +143,7 @@
 								<i class="fa fa-search"></i>
 								<la:message key="labels.index_form_search_btn" />
 							</button>
-							<button type="button" class="btn"
+							<button type="button" class="btn btn-outline-secondary"
 								data-toggle="control-options" data-target="#searchOptions"
 								id="searchOptionsButton">
 								<i class="fa fa-cog"></i>
diff --git a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
index 372b76862..1e8ff159b 100644
--- a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
@@ -178,7 +178,7 @@
 	<nav id="subfooter" class="mx-auto">
 		<ul class="pagination">
 			<c:if test="${existPrevPage}">
-				<li class="page-item"><la:link class="page-link" aria-label="Previous"
+				<li class="page-item"><la:link styleClass="page-link" aria-label="Previous"
 						href="/search/prev?q=${f:u(q)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
 						<span aria-hidden="true">&laquo;</span>
 						<span class="sr-only"><la:message key="labels.prev_page" /></span>
@@ -197,12 +197,12 @@
 						<c:when test="${pageNumber == currentPageNumber && pageNumber >= currentPageNumber - 2 && pageNumber <= currentPageNumber + 2}">class="page-item active"</c:when>
 						<c:otherwise>class="page-item"</c:otherwise>
 					</c:choose>>
-					<la:link class="page-link"
+					<la:link styleClass="page-link"
 						href="/search/move?q=${f:u(q)}&pn=${f:u(pageNumber)}&num=${f:u(pageSize)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(pageNumber)}</la:link>
 				</li>
 			</c:forEach>
 			<c:if test="${existNextPage}">
-				<li class="page-item"><la:link class="page-link" aria-label="Next"
+				<li class="page-item"><la:link styleClass="page-link" aria-label="Next"
 						href="/search/next?q=${f:u(q)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
 						<span class="sr-only"><la:message key="labels.next_page" /></span>
 						<span aria-hidden="true">&raquo;</span>
diff --git a/src/main/webapp/WEB-INF/view/advance.jsp b/src/main/webapp/WEB-INF/view/advance.jsp
index 0c05adfd9..0c00063d5 100644
--- a/src/main/webapp/WEB-INF/view/advance.jsp
+++ b/src/main/webapp/WEB-INF/view/advance.jsp
@@ -331,7 +331,7 @@
 			</div>
 
 			<div class="row">
-				<button type="submit" name="search" id="searchButton" class="btn btn-primary btn-lg mx-auto">
+				<button type="submit" name="search" id="searchButton" class="btn btn-primary mx-auto">
 					<i class="fa fa-search"></i>
 					<la:message key="labels.index_form_search_btn" />
 				</button>
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
index 7b965f0a4..67cbf4246 100644
--- a/src/main/webapp/WEB-INF/view/index.jsp
+++ b/src/main/webapp/WEB-INF/view/index.jsp
@@ -143,7 +143,7 @@
 								<i class="fa fa-search"></i>
 								<la:message key="labels.index_form_search_btn" />
 							</button>
-							<button type="button" class="btn"
+							<button type="button" class="btn btn-outline-secondary"
 								data-toggle="control-options" data-target="#searchOptions"
 								id="searchOptionsButton">
 								<i class="fa fa-cog"></i>
diff --git a/src/main/webapp/WEB-INF/view/searchResults.jsp b/src/main/webapp/WEB-INF/view/searchResults.jsp
index 372b76862..1e8ff159b 100644
--- a/src/main/webapp/WEB-INF/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/view/searchResults.jsp
@@ -178,7 +178,7 @@
 	<nav id="subfooter" class="mx-auto">
 		<ul class="pagination">
 			<c:if test="${existPrevPage}">
-				<li class="page-item"><la:link class="page-link" aria-label="Previous"
+				<li class="page-item"><la:link styleClass="page-link" aria-label="Previous"
 						href="/search/prev?q=${f:u(q)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
 						<span aria-hidden="true">&laquo;</span>
 						<span class="sr-only"><la:message key="labels.prev_page" /></span>
@@ -197,12 +197,12 @@
 						<c:when test="${pageNumber == currentPageNumber && pageNumber >= currentPageNumber - 2 && pageNumber <= currentPageNumber + 2}">class="page-item active"</c:when>
 						<c:otherwise>class="page-item"</c:otherwise>
 					</c:choose>>
-					<la:link class="page-link"
+					<la:link styleClass="page-link"
 						href="/search/move?q=${f:u(q)}&pn=${f:u(pageNumber)}&num=${f:u(pageSize)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(pageNumber)}</la:link>
 				</li>
 			</c:forEach>
 			<c:if test="${existNextPage}">
-				<li class="page-item"><la:link class="page-link" aria-label="Next"
+				<li class="page-item"><la:link styleClass="page-link" aria-label="Next"
 						href="/search/next?q=${f:u(q)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
 						<span class="sr-only"><la:message key="labels.next_page" /></span>
 						<span aria-hidden="true">&raquo;</span>