diff --git a/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg b/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
new file mode 100755
index 00000000000..7c3078468a0
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet">
+	<g>
+		<path d="M255.95919,134.393266 C255.95919,112.8718 242.586628,94.2755811 222.736732,86.9624613 C223.572517,82.3656432 223.99041,77.9777714 223.99041,73.172007 C223.99041,33.263268 191.603737,0.876594931 151.694998,0.876594931 C128.501961,0.876594931 106.771548,11.9507476 93.1900399,30.9648589 C86.503759,25.741202 78.3548541,23.0249004 69.7880568,23.0249004 C48.6844827,23.0249004 31.3419417,40.1584951 31.3419417,61.4710155 C31.3419417,66.0678336 32.1777268,70.6646517 33.6403507,74.8435772 C13.5815081,81.7388044 0,100.961862 0,122.274382 C0,143.795849 13.3725618,162.601014 33.4314044,169.914134 C32.5956193,174.302005 32.1777268,178.898824 32.1777268,183.704588 C32.1777268,223.404381 64.5643998,255.791054 104.264193,255.791054 C127.666176,255.791054 149.187642,244.507955 162.76915,225.70279 C169.455431,230.926447 177.813282,233.851695 186.38008,233.851695 C207.483654,233.851695 224.826195,216.7181 224.826195,195.405579 C224.826195,190.808761 223.99041,186.211943 222.527786,182.033018 C242.168736,174.928844 255.95919,155.705787 255.95919,134.393266 L255.95919,134.393266 Z" fill="#FFFFFF"></path>
+		<path d="M100.085267,110.364444 L157.127601,136.482729 L214.796773,85.91773 C215.632559,81.7388044 216.050451,77.5598788 216.050451,73.172007 C216.050451,37.6511398 187.215865,8.81655348 151.694998,8.81655348 C130.382477,8.81655348 110.532581,19.2638674 98.6226431,36.8153547 L89.0111143,86.5445688 L100.085267,110.364444 L100.085267,110.364444 Z" fill="#F4BD19"></path>
+		<path d="M40.9534704,170.749919 C40.1176853,174.928844 39.6997928,179.316716 39.6997928,183.704588 C39.6997928,219.225455 68.7433254,248.268988 104.264193,248.268988 C125.785659,248.268988 145.635556,237.612728 157.75444,220.06124 L167.157022,170.332026 L154.411299,146.094258 L97.1600191,119.975973 L40.9534704,170.749919 L40.9534704,170.749919 Z" fill="#3CBEB1"></path>
+		<path d="M40.5355779,71.9183293 L79.6085318,81.1119656 L88.3842755,36.6064084 C82.9516722,32.4274829 76.4743376,30.3380201 69.5791105,30.3380201 C52.654462,30.3380201 38.6550614,44.1284744 38.6550614,61.2620692 C38.6550614,64.8141559 39.2819002,68.5751889 40.5355779,71.9183293 L40.5355779,71.9183293 Z" fill="#E9478C"></path>
+		<path d="M37.1924374,81.3209118 C19.6409501,86.9624613 7.522066,103.88711 7.522066,122.274382 C7.522066,140.243762 18.5962187,156.332626 35.3119209,162.601014 L90.264792,112.8718 L80.2353706,91.3503332 L37.1924374,81.3209118 L37.1924374,81.3209118 Z" fill="#2C458F"></path>
+		<path d="M167.783861,219.852294 C173.216464,224.03122 179.693799,226.329629 186.38008,226.329629 C203.304728,226.329629 217.304129,212.539174 217.304129,195.405579 C217.304129,191.644546 216.67729,188.09246 215.423612,184.749319 L176.350658,175.555683 L167.783861,219.852294 L167.783861,219.852294 Z" fill="#95C63D"></path>
+		<path d="M175.72382,165.317315 L218.766753,175.346737 C236.31824,169.496241 248.437124,152.780539 248.437124,134.393266 C248.437124,116.423886 237.362971,100.543969 220.647269,94.0666348 L164.231774,143.377956 L175.72382,165.317315 L175.72382,165.317315 Z" fill="#176655"></path>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/public/app/plugins/datasource/elasticsearch/img/logo_large.png b/public/app/plugins/datasource/elasticsearch/img/logo_large.png
deleted file mode 100644
index 5ded1d8f438..00000000000
Binary files a/public/app/plugins/datasource/elasticsearch/img/logo_large.png and /dev/null differ
diff --git a/public/app/plugins/datasource/elasticsearch/plugin.json b/public/app/plugins/datasource/elasticsearch/plugin.json
index d4b07ac8e00..62d6a93b3b0 100644
--- a/public/app/plugins/datasource/elasticsearch/plugin.json
+++ b/public/app/plugins/datasource/elasticsearch/plugin.json
@@ -11,8 +11,8 @@
     },
     "keywords": ["elasticsearch"],
     "logos": {
-      "small": "img/logo_large.png",
-      "large": "img/logo_large.png"
+      "small": "img/elasticsearch.svg",
+      "large": "img/elasticsearch.svg"
     },
     "links": [
       {"name": "elastic.co", "url": "https://www.elastic.co/products/elasticsearch"}