diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css
index 9c947d5c91..9eac22615e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css
@@ -263,12 +263,18 @@ div.ajax-loading {
     background-image: url(../images/iconLoading.gif);
 }
 
-div.ajax-complete {
-    background-image: url(../images/iconCommit.png);
+div.ajax-complete:before {
+    font-family: FontAwesome;
+    content: "\f00c";
+    font-size: 16px;
+    color: #70B59A;
 }
 
-div.ajax-error {
-    background-image: url(../images/iconDelete.png);
+div.ajax-error:before {
+    font-family: FontAwesome;
+    content: "\f1f8";
+    font-size: 16px;
+    color: #004849;
 }
 
 .refresh-button {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
index e6d2cde471..d8c3e0da49 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
@@ -39,10 +39,6 @@
 
 /* controller-service settings */
 
-#controller-service-configuration .setting-input {
-    font-size: 11px !important;
-}
-
 #controller-service-name {
     width: 250px;
     float: left;
@@ -82,10 +78,6 @@ ul.referencing-component-listing li {
     white-space: nowrap;
 }
 
-div.referencing-component-state {
-    margin-top: -2px;
-}
-
 div.referencing-component-bulletins {
     float: left;
     margin-left: 5px;
@@ -95,10 +87,16 @@ div.referencing-component-bulletins {
     display: none;
 }
 
+div.referencing-component-bulletins:before {
+    font-family: FontAwesome;
+    content: "\f24a";
+    font-size: 16px;
+    color: #004849;
+}
+
 div.service.expansion-button {
     float: left;
     margin-right: 4px;
-    margin-top: 2px;
     width: 10px;
     height: 10px;
 }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css
index fbc0de5835..ee45bfced3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css
@@ -54,7 +54,6 @@
     left: 0px;
     padding-top: 100px;
     padding-left: 100px;
-    font-family: Verdana, Geneva, sans-serif;
     z-index: 1300;
     width: 412px;
 }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
index 782862b2a9..b78a14df79 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
@@ -57,12 +57,21 @@ div.context-menu-provenance {
     white-space: normal;
 }
 
-.collapsed {
-    background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top left;
+.collapsed:before {
+    font-family: FontAwesome;
+    content: "\f0da";
+    font-size: 16px;
+    color: #004849;
+    float: left;
+    margin-right: 3px;
 }
 
-.expanded {
-    background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top right;
+.expanded:before {
+    font-family: FontAwesome;
+    content: "\f0d7";
+    font-size: 16px;
+    color: #004849;
+    float: left;
 }
 
 #new-template-description {
@@ -98,6 +107,12 @@ div.has-errors, div.invalid {
     color: #ba554a !important;
 }
 
+div.has-errors:before, div.invalid:before {
+    font-family: FontAwesome;
+    content: "\f071";
+    color: #ba554a;
+}
+
 div.transmitting {
     float: left;
 }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
index 912d2ccc21..e03a698261 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
@@ -69,7 +69,13 @@ div.processor-configuration-warning-icon {
     margin-right: 8px;
     width: 18px;
     height: 16px;
-    background-image: url(../images/iconAlert.png);
+}
+
+div.processor-configuration-warning-icon:before {
+    font-family: FontAwesome;
+    content: "\f071";
+    font-size: 16px;
+    color: #ba554a;
 }
 
 #auto-terminate-relationship-names {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css
index 44a6027737..847bdb7605 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css
@@ -94,7 +94,13 @@ div.remote-port-removed {
     margin-top: 17px;
     width: 18px;
     height: 18px;
-    background-image: url("../images/iconPortRemoved.png");
+}
+
+div.remote-port-removed:before {
+    font-family: FontAwesome;
+    content: "\f071";
+    font-size: 16px;
+    color: #ba554a;
 }
 
 div.remote-port-edit-container {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css
index 63def4d203..50793c33df 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css
@@ -51,28 +51,12 @@
     font-size: 16px;
 }
 
-div.undock-normal {
-    background: transparent url(../images/iconPopOut.png) no-repeat left;
-}
-
-div.undock-hover {
-    background: transparent url(../images/iconPopOut.png) no-repeat right;
-}
-
 #shell-close-button {
     float: left;
     color: #004849;
     font-size: 16px;
 }
 
-div.close-normal {
-    background: transparent url(../images/iconClose.png) no-repeat left;
-}
-
-div.close-hover {
-    background: transparent url(../images/iconClose.png) no-repeat right;
-}
-
 #shell {
     position: absolute;
     top: 48px;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css
index a7e234af54..3f0e5cfe0f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css
@@ -334,7 +334,6 @@ span.sorted {
 }
 
 #cluster-processor-icon {
-    background-image: url(../images/iconProcessor.png);
     width: 28px;
     height: 26px;
     float: left;
@@ -342,6 +341,13 @@ span.sorted {
     margin-top: -2px;
 }
 
+#cluster-processor-icon:before {
+    font-family: flowfont;
+    content: "\e808";
+    font-size: 16px;
+    color: #ad9897;
+}
+
 #cluster-processor-details {
     float: left;
 }
@@ -400,7 +406,6 @@ span.sorted {
 }
 
 #cluster-input-port-icon {
-    background-image: url(../images/iconInputPort.png);
     background-size: cover;
     width: 40px;
     height: 26px;
@@ -409,6 +414,13 @@ span.sorted {
     margin-top: -2px;
 }
 
+#cluster-input-port-icon:before {
+    font-family: flowfont;
+    content: "\e832";
+    font-size: 16px;
+    color: #ad9897;
+}
+
 #cluster-input-port-details {
     float: left;
 }
@@ -467,7 +479,6 @@ span.sorted {
 }
 
 #cluster-output-port-icon {
-    background-image: url(../images/iconOutputPort.png);
     background-size: cover;
     width: 40px;
     height: 26px;
@@ -476,6 +487,13 @@ span.sorted {
     margin-top: -2px;
 }
 
+#cluster-output-port-icon:before {
+    font-family: flowfont;
+    content: "\e833";
+    font-size: 16px;
+    color: #ad9897;
+}
+
 #cluster-output-port-details {
     float: left;
 }
@@ -534,13 +552,19 @@ span.sorted {
 }
 
 #cluster-remote-process-group-icon {
-    background-image: url(../images/iconRemoteProcessGroup.png);
     width: 30px;
     height: 22px;
     float: left;
     margin-right: 5px;
 }
 
+#cluster-remote-process-group-icon:before {
+    font-family: flowfont;
+    content: "\e805";
+    font-size: 16px;
+    color: #ad9897;
+}
+
 #cluster-remote-process-group-details {
     float: left;
 }
@@ -599,7 +623,6 @@ span.sorted {
 }
 
 #cluster-connection-icon {
-    background-image: url(../images/iconConnection.png);
     width: 28px;
     height: 28px;
     float: left;
@@ -607,6 +630,13 @@ span.sorted {
     margin-top: -4px;
 }
 
+#cluster-connection-icon:before {
+    font-family: flowfont;
+    content: "\e834";
+    font-size: 16px;
+    color: #ad9897;
+}
+
 #cluster-connection-details {
     float: left;
 }
@@ -665,7 +695,6 @@ span.sorted {
 }
 
 #cluster-process-group-icon {
-    background-image: url(../images/iconProcessGroup.png);
     width: 29px;
     height: 20px;
     float: left;
@@ -673,6 +702,13 @@ span.sorted {
     margin-top: 1px;
 }
 
+#cluster-process-group-icon:before {
+    font-family: flowfont;
+    content: "\e804";
+    font-size: 16px;
+    color: #ad9897;
+}
+
 #cluster-process-group-details {
     float: left;
 }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconAlert.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconAlert.png
deleted file mode 100755
index 5020c31a5e..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconAlert.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconClose.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconClose.png
deleted file mode 100755
index b43a46e660..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconClose.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png
deleted file mode 100755
index 0bcc2a74dc..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png
deleted file mode 100755
index 3494703e1e..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCommit.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCommit.png
deleted file mode 100755
index cb2e5bb879..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCommit.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconConnection.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconConnection.png
deleted file mode 100755
index 4b6180b3a3..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconConnection.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDelete.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDelete.png
deleted file mode 100755
index dc13227369..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDelete.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDetails.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDetails.png
deleted file mode 100755
index fe6b61facb..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDetails.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png
deleted file mode 100755
index 1a118b2f38..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png
deleted file mode 100755
index f653c47c7a..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInfo.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInfo.png
deleted file mode 100755
index f192ff5724..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInfo.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInputPort.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInputPort.png
deleted file mode 100755
index d4efd97786..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInputPort.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png
deleted file mode 100755
index f3d8a6675b..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPopOut.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPopOut.png
deleted file mode 100755
index 4335432cbf..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPopOut.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png
deleted file mode 100755
index c13a65f60a..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessGroup.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessGroup.png
deleted file mode 100644
index 4ff5ac55ee..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessGroup.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessor.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessor.png
deleted file mode 100755
index 2ca062c85d..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessor.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png
deleted file mode 100755
index 5205470984..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRun.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRun.png
deleted file mode 100755
index 02715e010e..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRun.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png
deleted file mode 100755
index 25e4331e22..0000000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png and /dev/null differ
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css
index 4128e32621..560ba2e647 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css
@@ -100,7 +100,7 @@ div.string-check-container {
 div.string-check {
     width: 12px;
     height: 12px;
-    margin-top: 4px;
+    margin-top: 3px;
 }
 
 span.string-check-label {
@@ -110,7 +110,6 @@ span.string-check-label {
 }
 
 div.value pre {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
     overflow: hidden;
 }
 
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
index df2870a7cb..6b816b6fa5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
@@ -349,7 +349,7 @@ nf.ContextMenu = (function () {
      * {
      *      click: refresh (function),
      *      text: 'Start' (string),
-     *      img: 'images/iconRun.png'
+     *      clazz: 'fa fa-refresh'
      * }
      * 
      * @param {jQuery} contextMenu The context menu