diff --git a/client/galaxy/scripts/components/DataDialog/DataDialog.test.js b/client/galaxy/scripts/components/DataDialog/DataDialog.test.js
index 305e81ebe9c..b8264857e1d 100644
--- a/client/galaxy/scripts/components/DataDialog/DataDialog.test.js
+++ b/client/galaxy/scripts/components/DataDialog/DataDialog.test.js
@@ -153,11 +153,9 @@ describe("DataDialog.vue", () => {
         emitted = wrapper.emitted();
         expect(wrapper.classes()).contain("data-dialog-modal");
         expect(wrapper.find(".fa-spinner").text()).to.equals("");
-        expect(wrapper.find(".btn-secondary").text()).to.equals("Clear");
-        expect(wrapper.find(".btn-primary").text()).to.equals("Ok");
         expect(wrapper.contains(".fa-spinner")).to.equals(true);
         return Vue.nextTick().then(() => {
-            expect(wrapper.findAll(".fa-copy").length).to.equals(2);
+            expect(wrapper.findAll(".fa-folder").length).to.equals(2);
             expect(wrapper.findAll(".fa-file-o").length).to.equals(2);
         });
     });
@@ -169,11 +167,9 @@ describe("DataDialog.vue", () => {
         emitted = wrapper.emitted();
         expect(wrapper.classes()).contain("data-dialog-modal");
         expect(wrapper.find(".fa-spinner").text()).to.equals("");
-        expect(wrapper.find(".btn-secondary").text()).to.equals("Clear");
-        expect(wrapper.find(".btn-primary").text()).to.equals("Ok");
         expect(wrapper.contains(".fa-spinner")).to.equals(true);
         return Vue.nextTick().then(() => {
-            expect(wrapper.findAll(".fa-copy").length).to.equals(2);
+            expect(wrapper.findAll(".fa-folder").length).to.equals(2);
             expect(wrapper.findAll(".fa-file-o").length).to.equals(2);
         });
     });
diff --git a/client/galaxy/scripts/components/DataDialog/DataDialog.vue b/client/galaxy/scripts/components/DataDialog/DataDialog.vue
index 4599630f32d..5b75fc5a1ad 100644
--- a/client/galaxy/scripts/components/DataDialog/DataDialog.vue
+++ b/client/galaxy/scripts/components/DataDialog/DataDialog.vue
@@ -20,7 +20,14 @@
                 <div class="fa fa-caret-left mr-1" />
                 Back
             </b-btn>
-            <b-btn size="sm" class="float-right ml-1" variant="primary" @click="finalize" :disabled="!hasValue">
+            <b-btn
+                v-if="multiple"
+                size="sm"
+                class="float-right ml-1"
+                variant="primary"
+                @click="finalize"
+                :disabled="!hasValue"
+            >
                 Ok
             </b-btn>
             <b-btn size="sm" class="float-right" @click="modalShow = false"> Cancel </b-btn>
@@ -117,6 +124,8 @@ export default {
                 } else {
                     this.finalize();
                 }
+            } else {
+                this.load(record.url);
             }
         },
         /** Called when selection is complete, values are formatted and parsed to external callback **/
diff --git a/client/galaxy/scripts/components/DataDialog/DataDialogSearch.vue b/client/galaxy/scripts/components/DataDialog/DataDialogSearch.vue
index 89ce707703f..ed57a831ead 100644
--- a/client/galaxy/scripts/components/DataDialog/DataDialogSearch.vue
+++ b/client/galaxy/scripts/components/DataDialog/DataDialogSearch.vue
@@ -2,7 +2,7 @@
     <b-input-group>
         <b-input v-model="filter" placeholder="Type to Search" />
         <b-input-group-append>
-            <b-btn :disabled="!filter" @click="filter = ''">Clear</b-btn>
+            <b-btn :disabled="!filter" @click="filter = ''"><i class="fa fa-times"/></b-btn>
         </b-input-group-append>
     </b-input-group>
 </template>
diff --git a/client/galaxy/scripts/components/DataDialog/DataDialogTable.vue b/client/galaxy/scripts/components/DataDialog/DataDialogTable.vue
index 8baff146d25..3542664d104 100644
--- a/client/galaxy/scripts/components/DataDialog/DataDialogTable.vue
+++ b/client/galaxy/scripts/components/DataDialog/DataDialogTable.vue
@@ -12,7 +12,7 @@
             @filtered="filtered"
         >
             <template slot="label" slot-scope="data">
-                <i v-if="data.item.isDataset" class="fa fa-file-o" /> <i v-else class="fa fa-copy" />
+                <i v-if="data.item.isDataset" class="fa fa-file-o" /> <i v-else class="fa fa-folder" />
                 {{ data.value ? data.value : "-" }}
             </template>
             <template slot="details" slot-scope="data">
@@ -21,17 +21,6 @@
             <template slot="time" slot-scope="data">
                 {{ data.value ? data.value : "-" }}
             </template>
-            <template slot="arrow" slot-scope="data">
-                <b-button
-                    variant="link"
-                    size="sm"
-                    class="py-0"
-                    v-if="!data.item.isDataset"
-                    @click.stop="load(data.item.url)"
-                >
-                    View
-                </b-button>
-            </template>
         </b-table>
         <div v-if="nItems === 0">
             <div v-if="filter">
@@ -77,11 +66,6 @@ export default {
                 },
                 time: {
                     sortable: true
-                },
-                arrow: {
-                    label: "",
-                    sortable: false,
-                    class: "text-right"
                 }
             },
             nItems: 0,
@@ -105,10 +89,6 @@ export default {
         /** Collects selected datasets in value array **/
         clicked: function(record) {
             this.$emit("clicked", record);
-        },
-        /** Performs server request to retrieve data records **/
-        load: function(url) {
-            this.$emit("load", url);
         }
     }
 };
diff --git a/client/galaxy/scripts/entry/panels/tool-panel.js b/client/galaxy/scripts/entry/panels/tool-panel.js
index 4edba0fd48a..35953f419d8 100644
--- a/client/galaxy/scripts/entry/panels/tool-panel.js
+++ b/client/galaxy/scripts/entry/panels/tool-panel.js
@@ -46,7 +46,7 @@ var ToolPanel = Backbone.View.extend({
         const panel_buttons = [this.upload_button];
 
         // add favorite filter button
-        if (Galaxy.user && Galaxy.user.id){
+        if (Galaxy.user && Galaxy.user.id) {
             this.favorite_button = new Buttons.ButtonLink({
                 cls: "panel-header-button",
                 title: _l("Show favorites"),
diff --git a/client/galaxy/scripts/mvc/ui/ui-select-content.js b/client/galaxy/scripts/mvc/ui/ui-select-content.js
index 9c3658f2178..d9baa250c59 100644
--- a/client/galaxy/scripts/mvc/ui/ui-select-content.js
+++ b/client/galaxy/scripts/mvc/ui/ui-select-content.js
@@ -356,7 +356,7 @@ const View = Backbone.View.extend({
                     },
                     {
                         multiple: cnf.multiple,
-                        library: cnf.library,
+                        library: !!cnf.library,
                         format: null
                     }
                 );
diff --git a/client/galaxy/scripts/mvc/upload/composite/composite-view.js b/client/galaxy/scripts/mvc/upload/composite/composite-view.js
index 5430625aec9..dbae23f2cd4 100644
--- a/client/galaxy/scripts/mvc/upload/composite/composite-view.js
+++ b/client/galaxy/scripts/mvc/upload/composite/composite-view.js
@@ -29,7 +29,7 @@ export default Backbone.View.extend({
             onclick: function() {
                 self._eventReset();
             }
-        })
+        });
         this.btnStart = new Ui.Button({
             title: _l("Start"),
             onclick: function() {
@@ -63,7 +63,7 @@ export default Backbone.View.extend({
                         self.collection.add({
                             id: self.collection.size(),
                             file_desc: item.description || item.name,
-                            optional: item.optional,
+                            optional: item.optional
                         });
                     });
                 }
@@ -113,7 +113,11 @@ export default Backbone.View.extend({
             this.select_genome.enable();
             this.select_extension.enable();
         }
-        if (this.collection.where({ status: "ready" }).length + this.collection.where({ optional: true }).length == this.collection.length && this.collection.length > 0) {
+        if (
+            this.collection.where({ status: "ready" }).length + this.collection.where({ optional: true }).length ==
+                this.collection.length &&
+            this.collection.length > 0
+        ) {
             this.btnStart.enable();
             this.btnStart.$el.addClass("btn-primary");
         } else {
diff --git a/client/galaxy/scripts/mvc/workflow/workflow-view.js b/client/galaxy/scripts/mvc/workflow/workflow-view.js
index 50465e6963f..b6bde09ec82 100644
--- a/client/galaxy/scripts/mvc/workflow/workflow-view.js
+++ b/client/galaxy/scripts/mvc/workflow/workflow-view.js
@@ -287,7 +287,9 @@ export default Backbone.View.extend({
                 $("#workflow-version-switch").unbind("change");
                 if (this.value != self.workflow.workflow_version) {
                     if (self.workflow && self.workflow.has_changes) {
-                        const r = window.confirm("There are unsaved changes to your workflow which will be lost. Continue ?");
+                        const r = window.confirm(
+                            "There are unsaved changes to your workflow which will be lost. Continue ?"
+                        );
                         if (r == false) {
                             // We rebuild the version select list, to reset the selected version
                             self.build_version_select();