diff --git a/assets/images/cloudflare_icon.svg b/assets/images/cloudflare_icon.svg
new file mode 100644
index 0000000..fd43c59
--- /dev/null
+++ b/assets/images/cloudflare_icon.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated by Pixelmator Pro 3.6.12 -->
+<svg width="64" height="64" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+    <path id="Path" fill="#a8aaad" stroke="none" d="M 42.855877 61.142857 C 44.416851 57.42857 42.28825 55.714287 40.159645 55.714287 L 19.157429 55.428574 C 18.5898 55.428574 18.5898 54.571426 19.299335 54.428574 L 40.585365 54.142857 C 42.997784 54 45.835918 52 46.687363 49.428574 C 46.687363 49.428574 48.10643 46.428574 47.964523 46 C 46.701538 39.865341 41.50692 35.346867 35.294304 34.97897 C 29.081684 34.611076 23.396662 38.485283 21.427938 44.428574 C 16.035477 40.857143 10.359201 45.714287 11.636364 51 C 4.824834 51.428574 2.412417 57.57143 3.121951 61.285713 L 42.855877 61.142857 Z"/>
+    <path id="path1" fill="#c8cacd" stroke="none" d="M 49.951218 46.571426 C 49.383591 46.571426 49.099777 46.428574 48.95787 46.714287 L 48.248337 49.714287 C 47.538803 52 48.674057 54 51.086475 54.142857 L 55.627495 54.428574 C 56.195122 54.428574 56.195122 55.285713 55.485588 55.428574 L 50.802662 55.571426 C 45.694012 56.142857 44.274944 61.142857 44.274944 61.142857 L 61.019955 61.285713 C 61.998119 57.796459 61.295238 54.047386 59.121029 51.157082 C 56.946815 48.266785 53.552643 46.56942 49.951218 46.571426"/>
+</svg>
diff --git a/classes/class-base.php b/classes/class-base.php
index 4f76862..22399d7 100644
--- a/classes/class-base.php
+++ b/classes/class-base.php
@@ -445,7 +445,7 @@ public function add_toolbar_button( $wp_admin_bar ) {
 					'id'     => 'set_cloudflare_zone_id',
 					'title'  => \esc_html__( 'Set Cloudflare zone settings', 'pp-cf-utils' ),
 					'parent' => 'cloudflare',
-					'href'   => \admin_url( 'options-general.php?page=pp-cf-utils' ),
+					'href'   => \admin_url( 'options-general.php?page=pp-cloudflare-utils' ),
 				]
 			);
 			return;
@@ -496,7 +496,7 @@ public function toolbar_icon_styles() {
 				height: 20px;
 				padding: 4px;
 				display: inline-block;
-				background-image: url(' . \esc_url( \plugin_dir_url( __FILE__ ) . 'cloudflare_icon.svg' ) . ') !important;
+				background-image: url(' . \esc_url( PP_CF_UTILS_URL . '/assets/images/cloudflare_icon.svg' ) . ') !important;
 				background-size: contain;
 			}'
 		);
@@ -552,11 +552,20 @@ public function ajax_clear_cloudflare_cache() {
 		\check_ajax_referer( 'clear_cloudflare_cache_nonce', 'nonce' );
 
 		if ( isset( $_POST['url'] ) && ! empty( $_POST['url'] ) ) {
-			$this->clear_cloudflare_cache( \sanitize_text_field( \wp_unslash( $_POST['url'] ) ) );
+			$result = $this->clear_cloudflare_cache( \sanitize_text_field( \wp_unslash( $_POST['url'] ) ) );
 		} else {
-			$this->clear_cloudflare_cache();
+			$result = $this->clear_cloudflare_cache();
+		}
+
+		// $result is:
+		// $wp_error->get_message() if request failed or
+		// response code if request was successfuly made.
+
+		if ( $result === 200 ) {
+			\wp_send_json_success( [ 'message' => \esc_html__( 'Cloudflare cache cleared successfully.', 'pp-cf-utils' ) ] );
+		} else {
+			\wp_send_json_error( [ 'message' => \esc_html__( 'Cloudflare cache clear failed, check error log for more details.', 'pp-cf-utils' ) ] );
 		}
-		\wp_send_json_success( [ 'message' => \esc_html__( 'Cloudflare cache cleared successfully.', 'pp-cf-utils' ) ] );
 	}
 
 	/**
diff --git a/cloudflare-utils.php b/cloudflare-utils.php
index 955729b..942e5cc 100644
--- a/cloudflare-utils.php
+++ b/cloudflare-utils.php
@@ -14,8 +14,11 @@
 	exit;
 }
 
+define( 'PP_CF_UTILS_DIR', __DIR__ );
+define( 'PP_CF_UTILS_URL', untrailingslashit( plugin_dir_url( __FILE__ ) ) );
+
 /**
  * Load the plugin.
  */
-require_once __DIR__ . '/classes/class-base.php';
+require_once PP_CF_UTILS_DIR . '/classes/class-base.php';
 new PP_Cloudflare_Utils\Base();
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 759a087..f92a63d 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -107,6 +107,7 @@
 		<properties>
 			<property name="prefixes" type="array">
 				<element value="PP_Cloudflare_Utils"/>
+				<element value="PP_CF_UTILS"/>
 			</property>
 		</properties>
 	</rule>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index fb7c8cb..5346d96 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -4,4 +4,6 @@ parameters:
   paths:
     - ./cloudflare-utils.php
     - ./classes
+  bootstrapFiles:
+    - ./cloudflare-utils.php
   ignoreErrors:
\ No newline at end of file