diff --git a/epicyon-follow.css b/epicyon-follow.css
index c8eaa8753..e1edcd628 100644
--- a/epicyon-follow.css
+++ b/epicyon-follow.css
@@ -201,6 +201,10 @@ input[type=text] {
     width: 15%;
 }
 
+.container {
+    width: 100%;
+}
+
 @media screen and (min-width: 400px) {
     .hashtagswarm {
         font-size: var(--hashtag-size1);
@@ -246,8 +250,9 @@ input[type=text] {
 	padding: 10px;
 	margin: 20px 30px;
     }
-    figure img.common_emoji {
+    .container img {
 	width: 5%;
+	min-width: 5%;
     }
     figcaption {
         font-size: var(--font-size);
@@ -299,8 +304,9 @@ input[type=text] {
         padding: 20px;
         margin: 30px 40px;
     }
-    figure img.common_emoji {
+    .container img {
 	width: 5%;
+	min-width: 5%;
     }
     figcaption {
         font-size: var(--font-size);
@@ -355,8 +361,9 @@ input[type=text] {
         padding: 20px;
         margin: 30px 40px;
     }
-    figure img.common_emoji {
+    .container img {
 	width: 5%;
+	min-width: 5%;
     }
     figcaption {
         font-size: var(--font-size);
diff --git a/webapp_search.py b/webapp_search.py
index ff87847c8..9a4ba9550 100644
--- a/webapp_search.py
+++ b/webapp_search.py
@@ -363,7 +363,7 @@ def _html_common_emoji(base_dir: str, no_of_emoji: int) -> str:
         line_ctr += 1
     if html_str:
         html_str = \
-            '<div class="container">' + html_str + '</div>\n'
+            '<center><div class="container">' + html_str + '</div></center>\n'
     return html_str
 
 
@@ -404,10 +404,10 @@ def html_search_emoji_text_entry(css_cache: {}, translate: {},
         '    <button type="submit" class="button" name="submitSearch">' + \
         translate['Submit'] + '</button>\n'
     emoji_str += '  </form>\n'
-    emoji_str += _html_common_emoji(base_dir, 8)
     emoji_str += '  </center>\n'
     emoji_str += '  </div>\n'
     emoji_str += '</div>\n'
+    emoji_str += _html_common_emoji(base_dir, 8)
     emoji_str += html_footer()
     return emoji_str