diff --git a/assets/css/style.css b/assets/css/style.css
index 34c5321..df77e71 100755
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -4,6 +4,9 @@
     height:40px;
     margin-right: 10px;
     vertical-align: middle;
+    fill: currentColor;
+    stroke: currentColor;
+    color: black;
 }
 
 .select2-selection svg,
@@ -14,6 +17,9 @@
     margin-top: 3px;
     float: left;
     size: 2px;
+    fill: currentColor;
+    stroke: currentColor;
+    color: black;
 }
 
 .acf_svg__span {
diff --git a/assets/css/style.min.css b/assets/css/style.min.css
index 5e55734..42c85a5 100755
--- a/assets/css/style.min.css
+++ b/assets/css/style.min.css
@@ -1 +1 @@
-.acf_svg__icon,.select2-results svg{width:40px;height:40px;margin-right:10px;vertical-align:middle}.acf_svg__icon.small,.select2-selection svg{width:25px;height:19px;margin-right:10px;margin-top:3px;float:left;size:2px}.acf_svg__span{font-size:1.2em}
\ No newline at end of file
+.acf_svg__icon,.select2-results svg{width:40px;height:40px;margin-right:10px;vertical-align:middle;fill:currentColor;stroke:currentColor;color:#000}.acf_svg__icon.small,.select2-selection svg{width:25px;height:19px;margin-right:10px;margin-top:3px;float:left;size:2px;fill:currentColor;stroke:currentColor;color:#000}.acf_svg__span{font-size:1.2em}
\ No newline at end of file
diff --git a/fields/acf-base.php b/fields/acf-base.php
index 6f36a46..c196704 100644
--- a/fields/acf-base.php
+++ b/fields/acf-base.php
@@ -108,6 +108,7 @@ public function get_all_svg_files() {
 		 * @since 2.0.0
 		 */
 		$media_svg_files = $this->get_medias_svg();
+		$media_svg_files = apply_filters( 'acf_svg_icon_wp_media_svgs' , $media_svg_files);
 
 		/**
 		 * The path to the svg file.
@@ -298,11 +299,14 @@ public function input_admin_enqueue_scripts() {
 		// Min version ?
 		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG === true ? '' : '.min';
 
-		wp_localize_script( 'acf-input-svg-icon', 'svg_icon_format_data', $this->parse_svg() );
-		wp_register_style( 'acf-input-svg-icon', ACF_SVG_ICON_URL . 'assets/css/style' . $suffix . '.css', array( 'select2' ), ACF_SVG_ICON_VER );
-
-		wp_enqueue_script( 'acf-input-svg-icon' );
-		wp_enqueue_style( 'acf-input-svg-icon' );
+		// Only enqueue if we find svgs
+		if($files = $this->parse_svg()) {
+			wp_localize_script( 'acf-input-svg-icon', 'svg_icon_format_data', $this->parse_svg() );
+			wp_register_style( 'acf-input-svg-icon', ACF_SVG_ICON_URL . 'assets/css/style' . $suffix . '.css', array( 'select2' ), ACF_SVG_ICON_VER );
+			
+			wp_enqueue_script( 'acf-input-svg-icon' );
+			wp_enqueue_style( 'acf-input-svg-icon' );
+		}
 	}
 
 	/**