diff --git a/client/galaxy/scripts/mvc/tool/tool-form-base.js b/client/galaxy/scripts/mvc/tool/tool-form-base.js
index 058ba302c4e..d44f9b8d935 100644
--- a/client/galaxy/scripts/mvc/tool/tool-form-base.js
+++ b/client/galaxy/scripts/mvc/tool/tool-form-base.js
@@ -245,6 +245,12 @@ export default FormBase.extend({
             .addClass("ui-form-help")
             .append(options.help);
         $tmpl.find("a").attr("target", "_blank");
+        $tmpl.find("img").each( function() {
+            var img_src = $(this).attr("src");
+            if (img_src.indexOf("admin_toolshed") !== -1){
+                $(this).attr("src", Galaxy.root + img_src);
+            }
+        });
         return $tmpl;
     },
 
diff --git a/lib/galaxy/tools/parameters/grouping.py b/lib/galaxy/tools/parameters/grouping.py
index d22d6d7572a..ed050edc971 100644
--- a/lib/galaxy/tools/parameters/grouping.py
+++ b/lib/galaxy/tools/parameters/grouping.py
@@ -338,7 +338,7 @@ class UploadDataset(Group):
         def get_url_paste_urls_or_filename(group_incoming, override_name=None, override_info=None):
             url_paste_file = group_incoming.get('url_paste', None)
             if url_paste_file is not None:
-                url_paste = open(url_paste_file, 'r').read(1024)
+                url_paste = open(url_paste_file, 'r').read()
 
                 def start_of_url(content):
                     start_of_url_paste = content.lstrip()[0:8].lower()