diff --git a/stylesheets/style.css b/stylesheets/style.css
index 4b71246e..db434302 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -923,10 +923,14 @@ form.ban-appeal textarea {
   display:inline!important;
 }
 pre {
-  margin:0
+  margin: 0;
   display: inline!important;
 }
 
+.theme-catalog .controls > span {
+  margin-right: 1em;
+}
+
 .theme-catalog div.thread img {
   float: none!important;
   margin: auto;
@@ -936,13 +940,20 @@ pre {
   border: 2px solid rgba(153,153,153,0);
 }
 
+/* Still for the catalog theme */
+#Grid {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  align-content: center;
+  gap: 0.2em;
+}
+
 .theme-catalog div.thread {
   display: inline-block;
   vertical-align: top;
   text-align: center;
   font-weight: normal;
-  margin-top: 2px;
-  margin-bottom: 2px;
   padding: 2px;
   height: 300px;
   width: 205px;
@@ -961,7 +972,6 @@ pre {
 
 .theme-catalog div.threads {
   text-align: center;
-  margin-left: -20px;
 }
 
 .theme-catalog div.thread:hover {
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index d166b563..9f476a7c 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -33,28 +33,34 @@
                 </div>
         </details>
         {% endif %}
-	<div class="controls">
-		<ul style="display: none">
-			<li id="sort-bump-order" class="sort" data-sort="data-bump" data-order="asc">{% trans 'Bump order' %}</li>
-			<li id="sort-creation-date" class="sort" data-sort="data-time" data-order="asc">{% trans 'Creation date' %}</li>
-			<li id="sort-reply-count" class="sort" data-sort="data-reply" data-order="asc">{% trans 'Reply count' %}</li>
-			<li id="sort-random" class="sort" data-sort="random">{% trans 'Random' %}</li>
-		</ul>
+	<div class="theme-catalog controls">
+		<span>
+			<ul style="display: none">
+				<li id="sort-bump-order" class="sort" data-sort="data-bump" data-order="asc">{% trans 'Bump order' %}</li>
+				<li id="sort-creation-date" class="sort" data-sort="data-time" data-order="asc">{% trans 'Creation date' %}</li>
+				<li id="sort-reply-count" class="sort" data-sort="data-reply" data-order="asc">{% trans 'Reply count' %}</li>
+				<li id="sort-random" class="sort" data-sort="random">{% trans 'Random' %}</li>
+			</ul>
+		</span>
 
-		<span>{% trans 'Sort by' %}: </span>
-		<select id="sort_by" style="display: inline-block">
-			<option selected value="bump:desc">{% trans 'Bump order' %}</option>
-			<option value="time:desc">{% trans 'Creation date' %}</option>
-			<option value="reply:desc">{% trans 'Reply count' %}</option>
-			<option value="random">{% trans 'Random' %}</option>
-		</select>
+		<span>
+			<span>{% trans 'Sort by' %}: </span>
+			<select id="sort_by" style="display: inline-block">
+				<option selected value="bump:desc">{% trans 'Bump order' %}</option>
+				<option value="time:desc">{% trans 'Creation date' %}</option>
+				<option value="reply:desc">{% trans 'Reply count' %}</option>
+				<option value="random">{% trans 'Random' %}</option>
+			</select>
+		</span>
 
-		<span>{% trans 'Image size' %}: </span>
-		<select id="image_size" style="display: inline-block">
-			<option value="vsmall">{% trans 'Very small' %}</option>
-			<option selected value="small">{% trans 'Small' %}</option>
-			<option value="large">{% trans 'Large' %}</option>
-		</select>
+		<span>
+			<span>{% trans 'Image size' %}: </span>
+			<select id="image_size" style="display: inline-block">
+				<option value="vsmall">{% trans 'Small' %}</option>
+				<option selected value="small">{% trans 'Medium' %}</option>
+				<option value="large">{% trans 'Large' %}</option>
+			</select>
+		</span>
 	</div>
 	<br></br>
         <div class="threads">