diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png
old mode 100755
new mode 100644
index 1f6a7e5365..d3175cf8ae
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js
index ed4a4b1ccb..e7d96c59bf 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js
@@ -284,6 +284,7 @@ nf.ng.Canvas.GlobalMenuCtrl = function (serviceProvider) {
                     // store the content viewer url if available
                     if (!nf.Common.isBlank(aboutDetails.contentViewerUrl)) {
                         $('#nifi-content-viewer-url').text(aboutDetails.contentViewerUrl);
+                        nf.QueueListing.initFlowFileDetailsDialog();
                     }
                 }).fail(nf.Common.handleAjaxError);
 
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
index adec624f22..b6c375b9d7 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
@@ -1837,6 +1837,8 @@ nf.ControllerService = (function () {
 
                 // show the border if necessary
                 updateReferencingComponentsBorder(referenceContainer);
+
+                $('#controller-service-properties').propertytable('resetTableSize');
             }).fail(nf.Common.handleAjaxError);
         },
 
@@ -1952,6 +1954,8 @@ nf.ControllerService = (function () {
 
                 // show the border if necessary
                 updateReferencingComponentsBorder(referenceContainer);
+
+                $('#controller-service-properties').propertytable('resetTableSize');
             });
         },
 
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
index 24d7495519..49d20d10e6 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
@@ -166,61 +166,6 @@ nf.QueueListing = (function () {
         });
     };
 
-    /**
-     * Initializes the flowfile details dialog.
-     */
-    var initFlowFileDetailsDialog = function () {
-        $('#content-download').on('click', downloadContent);
-
-        // only show if content viewer is configured
-        if (nf.Common.isContentViewConfigured()) {
-            $('#content-view').show();
-            $('#content-view').on('click', viewContent);
-        }
-
-        $('#flowfile-details-tabs').tabbs({
-            tabStyle: 'tab',
-            selectedTabStyle: 'selected-tab',
-            scrollableTabContentStyle: 'scrollable',
-            tabs: [{
-                name: 'Details',
-                tabContentId: 'flowfile-details-tab-content'
-            }, {
-                name: 'Attributes',
-                tabContentId: 'flowfile-attributes-tab-content'
-            }]
-        });
-
-        $('#flowfile-details-dialog').modal({
-            scrollableContentStyle: 'scrollable',
-            headerText: 'FlowFile',
-            buttons: [{
-                buttonText: 'Ok',
-                color: {
-                    base: '#728E9B',
-                    hover: '#004849',
-                    text: '#ffffff'
-                },
-                handler: {
-                    click: function () {
-                        $('#flowfile-details-dialog').modal('hide');
-                    }
-                }
-            }],
-            handler: {
-                close: function () {
-                    // clear the details
-                    $('#flowfile-attributes-container').empty();
-                    $('#flowfile-cluster-node-id').text('');
-                    $('#additional-flowfile-details').empty();
-                },
-                open: function () {
-                    nf.Common.toggleScrollable($('#' + this.find('.tab-container').attr('id') + '-content').get(0));
-                }
-            }
-        });
-    };
-
     /**
      * Performs a listing on the specified connection.
      *
@@ -497,7 +442,6 @@ nf.QueueListing = (function () {
     return {
         init: function () {
             initializeListingRequestStatusDialog();
-            initFlowFileDetailsDialog();
 
             // define mouse over event for the refresh button
             $('#queue-listing-refresh-button').click(function () {
@@ -685,6 +629,61 @@ nf.QueueListing = (function () {
             $('#displayed-flowfiles').text('0');
         },
 
+        /**
+         * Initializes the flowfile details dialog.
+         */
+        initFlowFileDetailsDialog: function () {
+            $('#content-download').on('click', downloadContent);
+
+            // only show if content viewer is configured
+            if (nf.Common.isContentViewConfigured()) {
+                $('#content-view').show();
+                $('#content-view').on('click', viewContent);
+            }
+
+            $('#flowfile-details-tabs').tabbs({
+                tabStyle: 'tab',
+                selectedTabStyle: 'selected-tab',
+                scrollableTabContentStyle: 'scrollable',
+                tabs: [{
+                    name: 'Details',
+                    tabContentId: 'flowfile-details-tab-content'
+                }, {
+                    name: 'Attributes',
+                    tabContentId: 'flowfile-attributes-tab-content'
+                }]
+            });
+
+            $('#flowfile-details-dialog').modal({
+                scrollableContentStyle: 'scrollable',
+                headerText: 'FlowFile',
+                buttons: [{
+                    buttonText: 'Ok',
+                    color: {
+                        base: '#728E9B',
+                        hover: '#004849',
+                        text: '#ffffff'
+                    },
+                    handler: {
+                        click: function () {
+                            $('#flowfile-details-dialog').modal('hide');
+                        }
+                    }
+                }],
+                handler: {
+                    close: function () {
+                        // clear the details
+                        $('#flowfile-attributes-container').empty();
+                        $('#flowfile-cluster-node-id').text('');
+                        $('#additional-flowfile-details').empty();
+                    },
+                    open: function () {
+                        nf.Common.toggleScrollable($('#' + this.find('.tab-container').attr('id') + '-content').get(0));
+                    }
+                }
+            });
+        },
+
         /**
          * Update the size of the grid based on its container's current size.
          */