diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMedit.php b/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
index cb2592dd1..e0265c32b 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
@@ -113,7 +113,7 @@ if (strpos($strSelectedTemplate,"User-") !== false) {
 	<table>
 		<tr>
 			<td>_(Icon)_:</td>
-			<td>
+			<td class="template_img_parent">
 				<input type="hidden" name="template[icon]" id="template_icon" value="<?=htmlspecialchars($arrLoad['icon'])?>" />
 				<img id="template_img" src="<?=htmlspecialchars($strIconURL)?>" width="48" height="48" title="_(Change Icon)_..."/>
 				<div id="template_img_chooser_outer">
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
index 9dc9c0085..7e65606bc 100644
--- a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
@@ -23,14 +23,15 @@ span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
 .basic{display:none}
 .advanced{/*Empty placeholder*/}
 .switch-button-label.off{color:inherit}
+.template_img_parent{position:relative}
 #template_img{cursor:pointer}
 #template_img:hover{opacity:0.5}
 #template_img:hover i{opacity:1.0}
 .template_img_chooser_inner{display:inline-block;width:80px;margin-bottom:15px;margin-right:10px;text-align:center;}
 .template_img_chooser_inner img{width:48px;height:48px}
 .template_img_chooser_inner p{text-align:center;line-height:8px;}
-#template_img_chooser{width:560px;height:300px;overflow-y:scroll;position:relative}
-#template_img_chooser div:hover{background-color:#eee;cursor:pointer;}
+#template_img_chooser{width:560px;height:300px;overflow-y:scroll;position:relative;display:grid;grid-template-columns: repeat(6, minmax(0, 1fr));}
+#template_img_chooser div:hover{color:#ff8c2f;cursor:pointer;}
 #form_content{display:none}
 #vmform .four{overflow:hidden}
 #vmform .four label{float:left;display:table-cell;width:15%;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
index 9dc9c0085..018ef7190 100644
--- a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
@@ -23,6 +23,7 @@ span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
 .basic{display:none}
 .advanced{/*Empty placeholder*/}
 .switch-button-label.off{color:inherit}
+.template_img_parent{position:relative}
 #template_img{cursor:pointer}
 #template_img:hover{opacity:0.5}
 #template_img:hover i{opacity:1.0}
@@ -30,7 +31,7 @@ span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
 .template_img_chooser_inner img{width:48px;height:48px}
 .template_img_chooser_inner p{text-align:center;line-height:8px;}
 #template_img_chooser{width:560px;height:300px;overflow-y:scroll;position:relative}
-#template_img_chooser div:hover{background-color:#eee;cursor:pointer;}
+#template_img_chooser div:hover{color:#ff8c2f;cursor:pointer;}
 #form_content{display:none}
 #vmform .four{overflow:hidden}
 #vmform .four label{float:left;display:table-cell;width:15%;}