diff --git a/ui/web/src/main/resources/static/css/sourceList.css b/ui/web/src/main/resources/static/css/sourceList.css
index e7f28f1..813cd35 100644
--- a/ui/web/src/main/resources/static/css/sourceList.css
+++ b/ui/web/src/main/resources/static/css/sourceList.css
@@ -221,20 +221,33 @@ div.sourceBlock div.fileName {
 }
 div.decisionBlock {
     position: absolute;
-    width: 70px;
+    width: auto;
     right:  0;
     top: 0;
-    height: 22px;
+    height: 20px;
     background-color: #ededed;
     margin-right: 10px;
     text-align: center;
     align-content: center;
 }
 div.decisionBlock .decisionButton{
+    float: right;
     background-color: #add5a5;
     padding: 3px;
     cursor: pointer;
+    width: 19px;
+    height: 19px;
+}
+div.sourceBlock div.sourceBlockBody div.decisionBlock .decisionButton {
+    display: none;
+}
+div.sourceBlock:hover div.sourceBlockBody div.decisionBlock .decisionButton {
+    display: block;
+}
+div.sourceBlock div.sourceBlockBody div.decisionBlock .decisionButton.decision_selected {
+    display: block;
 }
+
 span.btn_LATER {
     /*background-size: 16px 16px;*/
     /*background-repeat: no-repeat;*/
diff --git a/ui/web/src/main/resources/templates/main/importProgress.html b/ui/web/src/main/resources/templates/main/importProgress.html
index 9717de5..d7cccd3 100644
--- a/ui/web/src/main/resources/templates/main/importProgress.html
+++ b/ui/web/src/main/resources/templates/main/importProgress.html
@@ -139,34 +139,7 @@
             </div>
         </div>
         <div id="templates">
-            <div class="sourceBlock">
-                <div class="sourceBlockBody">
-                    <div class="matchingProperties">
-                        <div class="status"></div>
-                        <div class="filePath"></div>
-                        <div class="folderStats">
-                            <span class="message"></span>
-                            <span class="data">
-                                Files <span class="badge files"></span>
-                                Matched  <span class="badge matched"></span>
-                                Matchable <span class="badge matchable"></span>
-                                Dups <span class="badge duplicates"></span>
-                            </span>
-                        </div>
-                        <div class="fileName"></div>
-                        <div class="fileSize"></div>
-                        <div class="timeStamp"></div>
-                    </div>
-                    <div class="source_image" title="SimpleHint">
-                        <a href="#" class="source_anch"><img class="img-thumbnail" /></a>
-                    </div>
-                    <div class="decisionBlock">
-                        <span class="decisionButton btn_LATER glyphicon glyphicon-time" value="later" ></span>
-                        <span class="decisionButton btn_APPROVE glyphicon glyphicon-star" value="approve" grade="PICTURE"></span>
-                        <span class="decisionButton btn_DUPLICATE glyphicon glyphicon-remove" value="duplicate" grade="IMPORT"></span>
-                    </div>
-                </div>
-            </div>
+            <div th:replace="support/sourceBlock" ></div>
         </div>
     </section>
 </body>
diff --git a/ui/web/src/main/resources/templates/support/sourceBlock.html b/ui/web/src/main/resources/templates/support/sourceBlock.html
new file mode 100644
index 0000000..fe8c045
--- /dev/null
+++ b/ui/web/src/main/resources/templates/support/sourceBlock.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<div xmlns:th="http://www.thymeleaf.org"
+     xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" class="sourceBlock">
+    <div class="sourceBlockBody">
+        <div class="matchingProperties">
+            <div class="status"></div>
+            <div class="filePath"></div>
+            <div class="folderStats">
+                <span class="message"></span>
+                <span class="data">
+                    Files <span class="badge files"></span>
+                    Matched  <span class="badge matched"></span>
+                    Matchable <span class="badge matchable"></span>
+                    Dups <span class="badge duplicates"></span>
+                </span>
+            </div>
+            <div class="fileName"></div>
+            <div class="fileSize"></div>
+            <div class="timeStamp"></div>
+        </div>
+        <div class="source_image" title="SimpleHint">
+            <a href="#" class="source_anch"><img class="img-thumbnail" /></a>
+        </div>
+        <div class="decisionBlock">
+            <span class="decisionButton btn_LATER glyphicon glyphicon-time" value="later" ></span>
+            <span class="decisionButton btn_APPROVE glyphicon glyphicon-star" value="approve" grade="PICTURE"></span>
+            <span class="decisionButton btn_DUPLICATE glyphicon glyphicon-remove" value="duplicate" grade="IMPORT"></span>
+        </div>
+    </div>
+</div>
\ No newline at end of file
