diff --git a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
index 252a2755..6421558c 100644
--- a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
+++ b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
@@ -1674,6 +1674,10 @@ input.search-query,
 	min-height:24px;
 }
 
+#working_area_files .entry {
+  height: 30px;
+}
+
 .safety_glasses_heads_up {
 	background-image:url(../img/safety_glasses_heads_up500.png);
 	background-repeat: no-repeat;
diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
index a5c77a83..8b557e00 100644
--- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
@@ -209,8 +209,8 @@
 
 												<script type="text/html" id="wa_template_machinecode">
 													<div class="file_list_entry">
-														<div class="title muted" data-bind="text: name" style="color:#ADADAD;"></div>
-														<div class="btn-group action-buttons">
+														<span class="title muted" data-bind="text: name" style="color:#ADADAD;"></span>
+														<div class="btn-group action-buttons pull-right">
 															<div class="btn btn-mini" data-bind="click: function(){ $root.removeGcode($data); }"><i class="icon-remove" title="{{ _('Remove') }}"></i></div>
 														</div>
 													</div>
@@ -218,8 +218,8 @@
 
 												<script type="text/html" id="wa_template_model_svg">
 													<div class="file_list_entry">
-														<div class="title muted" data-bind="text: name"></div>
-														<div class="btn-group action-buttons">
+														<span class="title muted" data-bind="text: name"></span>
+														<div class="btn-group action-buttons pull-right">
 															<div class="btn btn-mini" data-bind="click: function() { $root.removeSVG($data); }"><i class="icon-remove" title="{{ _('Remove') }}"></i></div>
 														</div>
 													</div>