diff --git a/static/css/search.css b/static/css/search.css
index 16801313b..8cc3822a4 100644
--- a/static/css/search.css
+++ b/static/css/search.css
@@ -145,10 +145,10 @@
 	background-color: var(--content-background);
 	border-color: var(--border);
     height: 2em;
-    margin-top: 30px;
-    margin-bottom: 15px;
+    margin: 30px auto 15px auto;
     top: 80px;
-    width: 100%;
+    width: calc(100% - 20px);
+    display: block;
 }
 
 .mod-info {
@@ -189,13 +189,14 @@
 
 .search-error {
     text-align: center;
+    word-break: break-word;
 }
 .result {
     display: flex;
     min-height: 100px;
-    margin: 15px auto;
+    margin: 15px 5px;
     padding: 5px;
-    width: 100%;
+    width: calc(100% - 20px);
     flex-direction: row;
     align-items: center;
     background-color: var(--content-background);
@@ -204,6 +205,11 @@
 .result-image {
     object-fit: scale-down;
     padding: 0 10px 0 5px;
+    min-width: 75px;
+}
+.badge-image {
+    object-fit: scale-down;
+    padding: 0 10px 0 5px;
 }
 
 .result-info {
@@ -223,8 +229,12 @@
     display: inline;
     padding-right: 5px;
 }
+.result-name > * {
+    margin: 0;
+}
 .result-author-container {
     white-space: nowrap;
+    display: inline-block;
 }
 
 @media screen and (max-width: 1340px) {
diff --git a/templates/search-results.hbs b/templates/search-results.hbs
index 0c8865d8d..8035d1b93 100644
--- a/templates/search-results.hbs
+++ b/templates/search-results.hbs
@@ -4,7 +4,7 @@
         <div class="result-info">
             <div class="result-title">
                 <a class="result-name" href="{{this.page_url}}"><h2>{{this.title}}</h2></a><!--
-                --><p class="muted result-author-container">by <a class="result-author" href="{{this.author_url}}">{{this.author}}</a></p>
+                --><span class="muted result-author-container">by <a class="result-author" href="{{this.author_url}}">{{this.author}}</a></span>
             </div>
             <p>{{this.description}}</p>
             <div class="mod-info">
@@ -37,14 +37,12 @@
                                             c2.3,2.2,2.8,5.7,0.8,8.3c-1.9,2.6-7.3,3.2-7.3,3.2L39,49.1v6.4h10.3l0.3-6.3l8.9-6.3c-0.9,0.8-3.1,2.8-6.2,7.7
                                             c-0.7,1.1-1.3,2.3-1.7,3.5c2.2-1.9,6.8-3.2,12.2-3.2c5.3,0,9.9,1.3,12.1,3.2c-0.4-1.2-1-2.4-1.7-3.5c-3.2-4.9-5.3-6.9-6.2-7.7
                                             l8.9,6.3l0.3,6.3h9.6v-6.4l-4.5-5.5c0,0-6.7-0.4-8.4-3.2C67.7,32.6,74.8,20.4,91.6,16.7z"/>
-                            </svg><!--
-                            --><span>Forge</span>
+                            </svg>
                         </div>
                     {{/contains}}
                     {{#contains this.keywords "fabric"}}
                         <div class="loader-fabric" title="Fabric">
-                            <img alt="fabric" src="/static/images/icon/fabric.png"/><!--
-                            --><span>Fabric</span>
+                            <img alt="fabric" src="/static/images/icon/fabric.png"/>
                         </div>
                     {{/contains}}
                 </div>
@@ -53,74 +51,74 @@
         <div class="result-badges">
             {{#contains this.keywords "technology"}}
                 <div class="tech-badge result-badge" title="Tech">
-                    <img alt="tech" src="/static/images/icon/tech.svg" class="result-image"/>
+                    <img alt="tech" src="/static/images/icon/tech.svg" class="badge-image"/>
                     <p>TECH</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "adventure"}}
                 <div class="adventure-badge result-badge" title="Adventure">
-                    <img alt="adventure" src="/static/images/icon/adventure.svg" class="result-image"/>
+                    <img alt="adventure" src="/static/images/icon/adventure.svg" class="badge-image"/>
                     <p>ADVENTURE</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "magic"}}
                 <div class="magic-badge result-badge" title="Magic">
-                    <img alt="magic" src="/static/images/icon/magic.svg" class="result-image"/>
+                    <img alt="magic" src="/static/images/icon/magic.svg" class="badge-image"/>
                     <p>MAGIC</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "utility"}}
                 <div class="utility-badge result-badge" title="Utility">
-                    <img alt="util" src="/static/images/icon/util.svg" class="result-image"/>
+                    <img alt="util" src="/static/images/icon/util.svg" class="badge-image"/>
                     <p>UTILITY</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "decoration"}}
-                <div class="decoration-badge result-badge" title="Fecoration">
-                    <img alt="decoration" src="/static/images/icon/decoration.svg" class="result-image"/>
+                <div class="decoration-badge result-badge" title="Decoration">
+                    <img alt="decoration" src="/static/images/icon/decoration.svg" class="badge-image"/>
                     <p>DECORATION</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "library"}}
                 <div class="library-badge result-badge" title="Library">
-                    <img alt="library" src="/static/images/icon/library.svg" class="result-image"/>
+                    <img alt="library" src="/static/images/icon/library.svg" class="badge-image"/>
                     <p>LIBRARY</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "worldgen"}}
                 <div class="world-badge result-badge" title="World">
-                    <img alt="world" src="/static/images/icon/world.svg" class="result-image"/>
+                    <img alt="world" src="/static/images/icon/world.svg" class="badge-image"/>
                     <p>WORLDGEN</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "cursed"}}
                 <div class="cursed-badge result-badge" title="Cursed">
-                    <img alt="cursed" src="/static/images/icon/cursed.png" class="result-image"/>
+                    <img alt="cursed" src="/static/images/icon/cursed.png" class="badge-image"/>
                     <p>CURSED</p>
                     <p>CURSED</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "storage"}}
                 <div class="storage-badge result-badge" title="Storage">
-                    <img alt="storage" src="/static/images/icon/storage.svg" class="result-image"/>
+                    <img alt="storage" src="/static/images/icon/storage.svg" class="badge-image"/>
                     <p>STORAGE</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "food"}}
                 <div class="food-badge result-badge" title="Food">
-                    <img alt="food" src="/static/images/icon/food.svg" class="result-image"/>
+                    <img alt="food" src="/static/images/icon/food.svg" class="badge-image"/>
                     <p>FOOD</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "equipment"}}
                 <div class="equipment-badge result-badge" title="Equipment">
-                    <img alt="equipment" src="/static/images/icon/equipment.svg" class="result-image"/>
+                    <img alt="equipment" src="/static/images/icon/equipment.svg" class="badge-image"/>
                     <p>EQUIPMENT</p>
                 </div>
             {{/contains}}
             {{#contains this.keywords "misc"}}
                 <div class="misc-badge result-badge" title="Misc">
-                    <img alt="misc" src="/static/images/icon/misc.svg" class="result-image"/>
+                    <img alt="misc" src="/static/images/icon/misc.svg" class="badge-image"/>
                     <p>MISC</p>
                 </div>
             {{/contains}}
diff --git a/templates/search.hbs b/templates/search.hbs
index 59cb3fb1e..391bf179f 100644
--- a/templates/search.hbs
+++ b/templates/search.hbs
@@ -46,51 +46,51 @@
                 <p>Categories</p>
             </a>
             <a class="tech-badge category-badge category-active" id="technology" onclick="activateCategory(this)">
-                <img alt="tech" src="/static/images/icon/tech.svg" class="result-image"/>
+                <img alt="tech" src="/static/images/icon/tech.svg" class="badge-image"/>
                 <p>TECH</p>
             </a>
             <a class="adventure-badge category-badge" id="adventure" onclick="activateCategory(this)">
-                <img alt="adventure" src="/static/images/icon/adventure.svg" class="result-image"/>
+                <img alt="adventure" src="/static/images/icon/adventure.svg" class="badge-image"/>
                 <p>ADVENTURE</p>
             </a>
             <a class="magic-badge category-badge" id="magic" onclick="activateCategory(this)">
-                <img alt="magic" src="/static/images/icon/magic.svg" class="result-image"/>
+                <img alt="magic" src="/static/images/icon/magic.svg" class="badge-image"/>
                 <p>MAGIC</p>
             </a>
             <a class="utility-badge category-badge" id="utility" onclick="activateCategory(this)">
-                <img alt="util" src="/static/images/icon/util.svg" class="result-image"/>
+                <img alt="util" src="/static/images/icon/util.svg" class="badge-image"/>
                 <p>UTILITY</p>
             </a>
             <a class="decoration-badge category-badge" id="decoration" onclick="activateCategory(this)">
-                <img alt="decoration" src="/static/images/icon/decoration.svg" class="result-image"/>
+                <img alt="decoration" src="/static/images/icon/decoration.svg" class="badge-image"/>
                 <p>DECORATION</p>
             </a>
             <a class="library-badge category-badge" id="library" onclick="activateCategory(this)">
-                <img alt="library" src="/static/images/icon/library.svg" class="result-image"/>
+                <img alt="library" src="/static/images/icon/library.svg" class="badge-image"/>
                 <p>LIBRARY</p>
             </a>
             <a class="world-badge category-badge" id="worldgen" onclick="activateCategory(this)">
-                <img alt="world" src="/static/images/icon/world.svg" class="result-image"/>
+                <img alt="world" src="/static/images/icon/world.svg" class="badge-image"/>
                 <p>WORLDGEN</p>
             </a>
             <a class="cursed-badge category-badge" id="cursed" onclick="activateCategory(this)">
-                <img alt="cursed" src="/static/images/icon/cursed.png" class="result-image"/>
+                <img alt="cursed" src="/static/images/icon/cursed.png" class="badge-image"/>
                 <p>CURSED</p>
             </a>
             <a class="storage-badge category-badge" id="storage" onclick="activateCategory(this)">
-                <img alt="storage" src="/static/images/icon/storage.svg" class="result-image"/>
+                <img alt="storage" src="/static/images/icon/storage.svg" class="badge-image"/>
                 <p>STORAGE</p>
             </a>
             <a class="food-badge category-badge" id="food" onclick="activateCategory(this)">
-                <img alt="food" src="/static/images/icon/food.svg" class="result-image"/>
+                <img alt="food" src="/static/images/icon/food.svg" class="badge-image"/>
                 <p>FOOD</p>
             </a>
             <a class="equipment-badge category-badge" id="equipment" onclick="activateCategory(this)">
-                <img alt="equipment" src="/static/images/icon/equipment.svg" class="result-image"/>
+                <img alt="equipment" src="/static/images/icon/equipment.svg" class="badge-image"/>
                 <p>EQUIPMENT</p>
             </a>
             <a class="misc-badge category-badge" id="misc" onclick="activateCategory(this)">
-                <img alt="misc" src="/static/images/icon/misc.svg" class="result-image"/>
+                <img alt="misc" src="/static/images/icon/misc.svg" class="badge-image"/>
                 <p>MISC</p>
             </a>
         </div>
@@ -100,11 +100,11 @@
                 <p>Loaders</p>
             </a>
             <a class="forge-badge category-badge" id="forge" onclick="activateCategory(this)">
-                <img alt="forge" src="/static/images/icon/forge-alt.svg" class="result-image"/>
+                <img alt="forge" src="/static/images/icon/forge-alt.svg" class="badge-image"/>
                 <p>FORGE</p>
             </a>
             <a class="fabric-badge category-badge" id="fabric" onclick="activateCategory(this)">
-                <img alt="fabric" src="/static/images/icon/fabric.png" class="result-image"/>
+                <img alt="fabric" src="/static/images/icon/fabric.png" class="badge-image"/>
                 <p>FABRIC</p>
             </a>
         </div>