diff --git a/weather-widget/README.md b/weather-widget/README.md
index 3bf62288..3989e821 100644
--- a/weather-widget/README.md
+++ b/weather-widget/README.md
@@ -25,7 +25,7 @@ It is possible to customize widget by providing a table with all or some of the
 
 | Name | Default | Description |
 |---|---|---|
-| coordinates | Required | Table with two elements: latitude and longitude, e.g. `{46.204400, 6.143200}` | 
+| coordinates | Required | Table with two elements: latitude and longitude, e.g. `{46.204400, 6.143200}` or "ipBased" if you want to set it automatically| 
 | api_key | Required | Get it [here](https://openweathermap.org/appid) |
 | font_name | `beautiful.font:gsub("%s%d+$", "")` | **Name** of the font to use e.g. 'Play' |
 | both_units_widget | false | Show temperature in both units - '28°C (83°F) |
diff --git a/weather-widget/icons/weather-underground-icons/broken-clouds-night.png b/weather-widget/icons/weather-underground-icons/broken-clouds-night.png
deleted file mode 100644
index 061d1cde..00000000
Binary files a/weather-widget/icons/weather-underground-icons/broken-clouds-night.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/broken-clouds-night.svg b/weather-widget/icons/weather-underground-icons/broken-clouds-night.svg
new file mode 100644
index 00000000..7af604b5
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/broken-clouds-night.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="weather-icon-mostlycloudy" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#72B8D4;}
+</style>
+<path class="st0" d="M49.3,57.8H16.9c-5.6,0-10.2-4.6-10.2-10.2c0-4.4,2.8-8.3,6.9-9.6v-0.2c0-5.1,4.2-9.3,9.3-9.3
+	c1.2,0,2.4,0.2,3.5,0.8c2.4-3.7,6.6-5.9,11.1-5.9c7.3,0,13.4,6,13.4,13.4c0,0.8-0.1,1.5-0.2,2.3c4.6,0.7,8.2,4.6,8.2,9.4
+	C58.7,53.5,54.5,57.8,49.3,57.8z M22.8,31.4c-3.5,0-6.3,2.8-6.3,6.3c0,0.3,0,0.7,0.1,1.1l0.2,1.4l-1.4,0.2c-3.4,0.7-5.8,3.7-5.8,7.1
+	c0,4,3.3,7.3,7.3,7.3h32.4c3.6,0,6.6-3,6.6-6.6s-3-6.6-6.6-6.6H49l-2.2,0.1l0.7-2.1c0.3-1,0.5-2.1,0.5-3.2C48,30.6,43.3,26,37.6,26
+	c-3.8,0-7.4,2.2-9.2,5.6L27.6,33l-1.3-0.8C25.2,31.6,24,31.4,22.8,31.4z"/>
+<path class="st1" d="M57.3,19.8c-3.3,0-6.4-1.5-8-3.9c-1.3-2-1.6-5.1-0.6-7.7l0,0h-0.3c-2.8,0-5.5,1-7.5,3s-3.2,4.7-3.2,7.5
+	c0,0.4,0,0.8,0.1,1.2v0.4h0.4c0.5,0,1.1,0.1,1.6,0.2l0.6,0.1L40.3,20c-0.1-0.5-0.1-0.9-0.1-1.3c0-3.4,2.2-6.5,5.4-7.7
+	c-0.2,2.7,0.5,5.2,2.2,7.3c1.8,2.3,4.5,3.8,7.7,4.2c-1,1.9-2.3,3.1-3.9,3.8L51,26.5l0.4,0.5c0.3,0.4,0.6,0.8,0.9,1.2l0.2,0.3
+	l0.3-0.2c3.2-1.5,5.4-4.5,5.9-8l0.1-0.5H57.3z"/>
+</svg>
diff --git a/weather-widget/icons/weather-underground-icons/broken-clouds.png b/weather-widget/icons/weather-underground-icons/broken-clouds.png
deleted file mode 100755
index 5967d929..00000000
Binary files a/weather-widget/icons/weather-underground-icons/broken-clouds.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/broken-clouds.svg b/weather-widget/icons/weather-underground-icons/broken-clouds.svg
new file mode 100644
index 00000000..be14b7c6
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/broken-clouds.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-mostlycloudy" class="weather-icon weather-icon-white mostlycloudy" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#F4A71D;} .st1{fill:#FFFFFF;}</style><g id="mostlycloudy"><path class="st0" d="M43.1 13.9c-.7 0-1.2-.6-1.2-1.2V9.2c0-.7.6-1.2 1.2-1.2.7 0 1.2.6 1.2 1.2v3.4c0 .7-.5 1.3-1.2 1.3zM57.6 25h-3.4c-.7 0-1.2-.5-1.2-1.2s.5-1.2 1.2-1.2h3.4c.7 0 1.2.5 1.2 1.2.1.7-.5 1.2-1.2 1.2zM51.3 17.1c-.3 0-.6-.1-.9-.4-.5-.5-.5-1.3 0-1.7l2.4-2.4c.5-.5 1.3-.5 1.7 0 .5.5.5 1.3 0 1.7l-2.4 2.4c-.1.3-.5.4-.8.4zM53.7 35.4c-.3 0-.6-.1-.9-.4l-2.4-2.4c-.5-.5-.5-1.3 0-1.7.5-.5 1.3-.5 1.7 0l2.4 2.4c.5.5.5 1.3 0 1.7-.1.3-.5.4-.8.4zM35.3 17.2c-.3 0-.6-.1-.9-.4L32 14.5c-.5-.5-.5-1.3 0-1.7.5-.5 1.3-.5 1.7 0l2.4 2.4c.5.5.5 1.3 0 1.7-.2.2-.5.3-.8.3z"/><path class="st1" d="M45.6 57.8H16c-5.1 0-9.3-4.2-9.3-9.3 0-4 2.6-7.6 6.3-8.8v-.2c0-4.7 3.8-8.5 8.5-8.5 1.1 0 2.2.2 3.2.7 2.2-3.4 6-5.4 10.1-5.4 6.7 0 12.2 5.5 12.2 12.2 0 .7-.1 1.4-.2 2.1 4.2.6 7.5 4.2 7.5 8.6-.1 4.7-3.9 8.6-8.7 8.6zM21.4 33.7c-3.2 0-5.8 2.6-5.8 5.8 0 .3 0 .6.1 1l.2 1.3-1.3.2c-3.1.6-5.3 3.4-5.3 6.5 0 3.7 3 6.7 6.7 6.7h29.6c3.3 0 6-2.7 6-6s-2.7-6-6-6h-.3l-2 .1.6-1.9c.3-.9.5-1.9.5-2.9 0-5.3-4.3-9.5-9.5-9.5-3.5 0-6.8 2-8.4 5.1l-.7 1.3-1.2-.7c-1-.8-2.1-1-3.2-1z"/><path class="st0" d="M44.6 16c-4.2-.8-8.2 2-8.9 6.2-.1.4-.1.7-.1 1.1-.1.5.3 1 .9 1.1 1.1.1 1-1 1.2-1.7.6-3.1 3.5-5.1 6.6-4.6 3.1.6 5.1 3.5 4.6 6.6-.1.7-.3 1.4-.7 2-.5.7-1.3 1.3-2 1.8-.6.4-.3 1.3.4 1.4.8.2 1.5-.4 2.1-1 .7-.6 1.3-1.5 1.7-2.4.2-.5.4-1 .5-1.5.7-4.3-2.1-8.3-6.3-9z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/clear-sky-night.png b/weather-widget/icons/weather-underground-icons/clear-sky-night.png
deleted file mode 100644
index cc40d0f9..00000000
Binary files a/weather-widget/icons/weather-underground-icons/clear-sky-night.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/clear-sky-night.svg b/weather-widget/icons/weather-underground-icons/clear-sky-night.svg
new file mode 100644
index 00000000..2af0c4c0
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/clear-sky-night.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#72B8D4;}
+</style>
+<path class="st0" d="M50.5,35.1C39,35.1,26.3,26,32.1,11.2l0,0c-12.4-0.1-20.9,10-20.9,20.8c0,11.5,9.3,20.9,20.9,20.9
+	c10.5,0,19.2-7.6,20.7-17.7C52.8,35.1,51.3,35.1,50.5,35.1z M32.4,49.8c-9.9,0-17.9-8-17.9-17.9c0-8.2,5.8-15.1,13.3-17.3l0,0.1
+	c-1.8,12.5,7.1,23,20.7,24.2l0,0C45,45.7,40.2,49.5,32.4,49.8z"/>
+</svg>
diff --git a/weather-widget/icons/weather-underground-icons/clear-sky.png b/weather-widget/icons/weather-underground-icons/clear-sky.png
deleted file mode 100755
index acf8e5cd..00000000
Binary files a/weather-widget/icons/weather-underground-icons/clear-sky.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/clear-sky.svg b/weather-widget/icons/weather-underground-icons/clear-sky.svg
new file mode 100644
index 00000000..8f6fc4e1
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/clear-sky.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-clear" class="weather-icon weather-icon-white clear" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#F4A71D;}</style><g id="clear"><path class="st0" d="M32.9 19.2c-.7 0-1.3-.6-1.3-1.3v-4.6c0-.7.6-1.3 1.3-1.3.7 0 1.3.6 1.3 1.3v4.6c0 .7-.6 1.3-1.3 1.3zM32.9 53.8c-.7 0-1.3-.6-1.3-1.3v-4.6c0-.7.6-1.3 1.3-1.3.7 0 1.3.6 1.3 1.3v4.6c0 .7-.6 1.3-1.3 1.3zM17.9 34.2h-4.6c-.7 0-1.3-.6-1.3-1.3 0-.7.6-1.3 1.3-1.3h4.6c.7 0 1.3.6 1.3 1.3 0 .7-.6 1.3-1.3 1.3zM52.5 34.2h-4.6c-.7 0-1.3-.6-1.3-1.3 0-.7.6-1.3 1.3-1.3h4.6c.7 0 1.3.6 1.3 1.3 0 .7-.6 1.3-1.3 1.3zM44 23.5c-.3 0-.7-.1-.9-.4-.5-.5-.5-1.4 0-1.9l3.2-3.2c.5-.5 1.4-.5 1.9 0s.5 1.4 0 1.9L45 23.1c-.3.3-.7.4-1 .4zM19.1 48.4c-.3 0-.7-.1-.9-.4-.5-.5-.5-1.4 0-1.9l3.2-3.2c.5-.5 1.4-.5 1.9 0s.5 1.4 0 1.9L20 48c-.2.3-.6.4-.9.4zM47.2 48.2c-.3 0-.7-.1-.9-.4l-3.2-3.2c-.5-.5-.5-1.4 0-1.9s1.4-.5 1.9 0l3.2 3.2c.5.5.5 1.4 0 1.9-.3.3-.6.4-1 .4zM22.3 23.7c-.3 0-.7-.1-.9-.4l-3.2-3.2c-.5-.5-.5-1.4 0-1.9s1.4-.5 1.9 0l3.2 3.2c.5.5.5 1.4 0 1.9-.3.3-.6.4-1 .4zM32.9 24.5c4.6 0 8.4 3.8 8.4 8.4 0 4.6-3.8 8.4-8.4 8.4-4.6 0-8.4-3.8-8.4-8.4 0-4.6 3.8-8.4 8.4-8.4m0-2.7c-6.1 0-11.1 5-11.1 11.1S26.8 44 32.9 44 44 39 44 32.9s-5-11.1-11.1-11.1z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/few-clouds-night.png b/weather-widget/icons/weather-underground-icons/few-clouds-night.png
deleted file mode 100644
index 9c34fab9..00000000
Binary files a/weather-widget/icons/weather-underground-icons/few-clouds-night.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/few-clouds-night.svg b/weather-widget/icons/weather-underground-icons/few-clouds-night.svg
new file mode 100644
index 00000000..88890f95
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/few-clouds-night.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="weather-icon-mostlysunny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#72B8D4;}
+</style>
+<path class="st0" d="M40.2,58.2H15.1c-4.6,0-8.4-3.8-8.4-8.4c0-3.5,2.1-6.7,5.4-7.9c0.1-4.1,3.5-7.5,7.8-7.5c0.9,0,1.8,0.1,2.5,0.5
+	c2-2.8,5.3-4.5,8.8-4.5c6,0,10.9,4.9,10.9,10.9c0,0.5,0,0.9-0.1,1.4c3.5,0.8,6.3,3.9,6.3,7.8C48.1,54.7,44.6,58.2,40.2,58.2z
+	 M19.8,37.7c-2.4,0-4.4,2-4.4,4.4c0,0.3,0,0.5,0.1,0.8l0.3,1.6l-1.6,0.4c-2.4,0.5-4.1,2.6-4.1,5c0,2.8,2.3,5.1,5.1,5.1h25.1
+	c2.5,0,4.5-2,4.5-4.5s-2-4.5-4.5-4.5H40l-2.5,0.1l0.8-2.4c0.3-0.8,0.4-1.5,0.4-2.4c0-4.1-3.4-7.5-7.5-7.5c-2.8,0-5.4,1.5-6.7,4
+	l-0.9,1.6L22,38.6C21.4,38,20.5,37.7,19.8,37.7z"/>
+<path class="st1" d="M58.1,24.7c0,0-1.1,0-1.6,0c-5,0-9.8-2.3-12.3-5.9c-2.1-3.1-2.4-7.4-0.9-11.4l0,0H43c-4.1,0-8.1,1.5-10.9,4.4
+	c-2.9,2.9-4.6,6.9-4.6,11.1c0,1.3,0.2,2.7,0.5,4l0.1,0.4l0.4-0.1c0.7-0.2,1.5-0.3,2.3-0.4h0.5l-0.1-0.4c-0.3-1.1-0.5-2.3-0.5-3.4
+	c0-5.3,3.6-10.2,8.8-12c-0.5,4.1,0.6,8,3.1,11.1c2.7,3.5,6.9,5.7,11.7,6.2c-2.2,4.2-5,6.4-9,7.1l-0.4,0.1l0.2,0.4
+	c0.3,0.7,0.5,1.4,0.6,2.1l0.1,0.4l0.4-0.1c6.5-1.3,11.5-6.4,12.4-12.9l0.1-0.4L58.1,24.7z"/>
+</svg>
diff --git a/weather-widget/icons/weather-underground-icons/few-clouds.png b/weather-widget/icons/weather-underground-icons/few-clouds.png
deleted file mode 100755
index 7580fc5a..00000000
Binary files a/weather-widget/icons/weather-underground-icons/few-clouds.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/few-clouds.svg b/weather-widget/icons/weather-underground-icons/few-clouds.svg
new file mode 100644
index 00000000..03e9b1bb
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/few-clouds.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-mostlysunny" class="weather-icon weather-icon-white mostlysunny" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#F4A71D;} .st1{fill:#FFFFFF;}</style><g id="mostlysunny"><path class="st0" d="M35.5 15.3c-.7 0-1.3-.6-1.3-1.3V9c0-.7.6-1.3 1.3-1.3.7 0 1.3.6 1.3 1.3v5c0 .7-.6 1.3-1.3 1.3zM19.2 31.6h-5c-.7 0-1.3-.6-1.3-1.3 0-.7.6-1.3 1.3-1.3h5c.7 0 1.3.6 1.3 1.3 0 .7-.6 1.3-1.3 1.3zM56.7 31.6h-5c-.7 0-1.3-.6-1.3-1.3 0-.7.6-1.3 1.3-1.3h5c.7 0 1.3.6 1.3 1.3 0 .7-.6 1.3-1.3 1.3zM47.5 20c-.3 0-.7-.1-.9-.4-.5-.5-.5-1.4 0-1.9l3.5-3.5c.5-.5 1.4-.5 1.9 0s.5 1.4 0 1.9l-3.5 3.5c-.3.2-.7.4-1 .4zM51 46.8c-.3 0-.7-.1-.9-.4l-3.5-3.5c-.5-.5-.5-1.4 0-1.9s1.3-.5 1.9 0l3.5 3.5c.5.5.5 1.4 0 1.9-.3.2-.7.4-1 .4zM24 20.2c-.3 0-.7-.1-.9-.4l-3.5-3.5c-.5-.5-.5-1.4 0-1.9s1.3-.5 1.9 0l3.5 3.5c.5.5.5 1.4 0 1.9-.3.3-.7.4-1 .4z"/><path class="st1" d="M33.4 58.2h-20c-3.7 0-6.7-3-6.7-6.7 0-2.8 1.7-5.3 4.3-6.3.1-3.3 2.8-6 6.2-6 .7 0 1.4.1 2 .4 1.6-2.2 4.2-3.6 7-3.6 4.8 0 8.7 3.9 8.7 8.7 0 .4 0 .7-.1 1.1 2.8.6 5 3.1 5 6.2-.1 3.4-2.9 6.2-6.4 6.2zM17.1 41.9c-1.9 0-3.5 1.6-3.5 3.5 0 .2 0 .4.1.6l.2 1.3-1.3.3c-1.9.4-3.3 2.1-3.3 4 0 2.2 1.8 4.1 4.1 4.1h20c2 0 3.6-1.6 3.6-3.6s-1.6-3.6-3.6-3.6h-.2l-2 .1.6-1.9c.2-.6.3-1.2.3-1.9 0-3.3-2.7-6-6-6-2.2 0-4.3 1.2-5.3 3.2l-.7 1.3-1.2-.7c-.5-.5-1.2-.7-1.8-.7z"/><path class="st0" d="M47.5 30.3c0-6.6-5.4-12-12-12s-12 5.4-12 12c0 .7.1 1.4.2 2 0 .8.7 1.4 1.4 1.3.4 0 1-.3 1.1-.7.2-.5.1-1 0-1.5-.1-.4-.1-.8-.1-1.1 0-5.2 4.2-9.4 9.4-9.4s9.3 4.2 9.3 9.4c0 .4-.1.8-.1 1.2-.1.4-.1.8-.2 1.2-.2.7-.5 1.5-.8 2.1-.4.7-.8 1.3-1.3 1.9-.5.6-1.1 1.1-1.7 1.4-.7.4-1.4.7-2.1 1-.3.1-.6.1-.9.3-.3.1-.5.4-.6.7-.1.2-.1.3-.1.5 0 .7.6 1.3 1.4 1.4 5.1-1.1 9.1-6.1 9.1-11.7z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/mist-night.png b/weather-widget/icons/weather-underground-icons/mist-night.png
deleted file mode 100755
index 102142a2..00000000
Binary files a/weather-widget/icons/weather-underground-icons/mist-night.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/mist-night.svg b/weather-widget/icons/weather-underground-icons/mist-night.svg
new file mode 100644
index 00000000..f2ea9eae
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/mist-night.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-fog" class="weather-icon weather-icon-white fog" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#FFFFFF;}</style><g id="fog"><path class="st0" d="M41.7 38.5c-3.2 0-6.1-.9-8.7-2.7-7.2-5.1-13.2-5.3-19.6-.9-.5.3-1.1.2-1.4-.3-.3-.5-.2-1.1.3-1.4 7.1-4.9 14.1-4.6 21.9.9 6.2 4.4 13.3 1.9 18.2-1 .5-.3 1.1-.1 1.4.4.3.5.1 1.1-.4 1.4-4 2.4-8 3.6-11.7 3.6z"/><path class="st0" d="M41.7 46.3c-3.2 0-6.1-.9-8.7-2.7-7.2-5.1-13.2-5.3-19.6-.9-.5.3-1.1.2-1.4-.3-.3-.5-.2-1.1.3-1.4 7.1-4.9 14.1-4.6 21.9.9 6.2 4.3 13.3 1.9 18.2-1 .5-.3 1.1-.1 1.4.4.3.5.1 1.1-.4 1.4-4 2.4-8 3.6-11.7 3.6zM41.7 30.8c-3.2 0-6.1-.9-8.7-2.7-7.2-5.1-13.2-5.3-19.6-.9-.5.3-1.1.2-1.4-.3-.3-.5-.2-1.1.3-1.4 7.1-4.9 14.1-4.6 21.9.9 6.2 4.4 13.3 1.9 18.2-1 .5-.3 1.1-.1 1.4.4.3.5.1 1.1-.4 1.4-4 2.4-8 3.6-11.7 3.6z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/mist.png b/weather-widget/icons/weather-underground-icons/mist.png
deleted file mode 100755
index 102142a2..00000000
Binary files a/weather-widget/icons/weather-underground-icons/mist.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/mist.svg b/weather-widget/icons/weather-underground-icons/mist.svg
new file mode 100644
index 00000000..f2ea9eae
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/mist.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-fog" class="weather-icon weather-icon-white fog" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#FFFFFF;}</style><g id="fog"><path class="st0" d="M41.7 38.5c-3.2 0-6.1-.9-8.7-2.7-7.2-5.1-13.2-5.3-19.6-.9-.5.3-1.1.2-1.4-.3-.3-.5-.2-1.1.3-1.4 7.1-4.9 14.1-4.6 21.9.9 6.2 4.4 13.3 1.9 18.2-1 .5-.3 1.1-.1 1.4.4.3.5.1 1.1-.4 1.4-4 2.4-8 3.6-11.7 3.6z"/><path class="st0" d="M41.7 46.3c-3.2 0-6.1-.9-8.7-2.7-7.2-5.1-13.2-5.3-19.6-.9-.5.3-1.1.2-1.4-.3-.3-.5-.2-1.1.3-1.4 7.1-4.9 14.1-4.6 21.9.9 6.2 4.3 13.3 1.9 18.2-1 .5-.3 1.1-.1 1.4.4.3.5.1 1.1-.4 1.4-4 2.4-8 3.6-11.7 3.6zM41.7 30.8c-3.2 0-6.1-.9-8.7-2.7-7.2-5.1-13.2-5.3-19.6-.9-.5.3-1.1.2-1.4-.3-.3-.5-.2-1.1.3-1.4 7.1-4.9 14.1-4.6 21.9.9 6.2 4.4 13.3 1.9 18.2-1 .5-.3 1.1-.1 1.4.4.3.5.1 1.1-.4 1.4-4 2.4-8 3.6-11.7 3.6z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/rain-night.png b/weather-widget/icons/weather-underground-icons/rain-night.png
deleted file mode 100755
index 49f0903c..00000000
Binary files a/weather-widget/icons/weather-underground-icons/rain-night.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/rain-night.svg b/weather-widget/icons/weather-underground-icons/rain-night.svg
new file mode 100644
index 00000000..46e73365
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/rain-night.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-rain" class="weather-icon weather-icon-white rain" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#2885C7;} .st1{fill:#FFFFFF;}</style><g id="rain"><path class="st0" d="M25.5 59.3c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l9.3-21.9c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-9.3 21.9c-.2.5-.7.8-1.2.8zM34 53.5c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l6.6-16c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-6.6 16c-.2.5-.7.8-1.2.8zM21.9 53.5c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l6.6-16c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-6.6 16c-.2.5-.6.8-1.2.8z"/><path class="st1" d="M50.9 22.4c.1-.8.2-1.6.2-2.4 0-7.4-6-13.4-13.4-13.4-4.5 0-8.7 2.3-11.2 6-1.2-.5-2.4-.8-3.7-.8-5.1 0-9.3 4.2-9.3 9.3v.3c-4.1 1.4-7 5.2-7 9.7 0 5.6 4.6 10.2 10.2 10.2h5c1.6 0 1.5-2.7 0-2.7h-5c-4.2 0-7.5-3.4-7.5-7.5 0-3.6 2.5-6.7 6.1-7.4l1.3-.3-.2-1.3c-.1-.4-.1-.7-.1-1.1 0-3.6 3-6.6 6.6-6.6 1.2 0 2.4.3 3.5 1l1.2.7.7-1.3c1.9-3.5 5.5-5.7 9.5-5.7 5.9 0 10.7 4.8 10.7 10.7 0 1.1-.2 2.2-.5 3.3l-.6 1.9 2.1-.1h.3c3.8 0 6.8 3.1 6.8 6.8 0 3.8-3.1 6.8-6.8 6.8h-5.7c-1.7 0-2 2.7 0 2.7h5.7c5.2 0 9.5-4.3 9.5-9.5-.1-4.7-3.7-8.7-8.4-9.3z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/rain.png b/weather-widget/icons/weather-underground-icons/rain.png
deleted file mode 100755
index 49f0903c..00000000
Binary files a/weather-widget/icons/weather-underground-icons/rain.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/rain.svg b/weather-widget/icons/weather-underground-icons/rain.svg
new file mode 100644
index 00000000..46e73365
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/rain.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-rain" class="weather-icon weather-icon-white rain" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#2885C7;} .st1{fill:#FFFFFF;}</style><g id="rain"><path class="st0" d="M25.5 59.3c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l9.3-21.9c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-9.3 21.9c-.2.5-.7.8-1.2.8zM34 53.5c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l6.6-16c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-6.6 16c-.2.5-.7.8-1.2.8zM21.9 53.5c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l6.6-16c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-6.6 16c-.2.5-.6.8-1.2.8z"/><path class="st1" d="M50.9 22.4c.1-.8.2-1.6.2-2.4 0-7.4-6-13.4-13.4-13.4-4.5 0-8.7 2.3-11.2 6-1.2-.5-2.4-.8-3.7-.8-5.1 0-9.3 4.2-9.3 9.3v.3c-4.1 1.4-7 5.2-7 9.7 0 5.6 4.6 10.2 10.2 10.2h5c1.6 0 1.5-2.7 0-2.7h-5c-4.2 0-7.5-3.4-7.5-7.5 0-3.6 2.5-6.7 6.1-7.4l1.3-.3-.2-1.3c-.1-.4-.1-.7-.1-1.1 0-3.6 3-6.6 6.6-6.6 1.2 0 2.4.3 3.5 1l1.2.7.7-1.3c1.9-3.5 5.5-5.7 9.5-5.7 5.9 0 10.7 4.8 10.7 10.7 0 1.1-.2 2.2-.5 3.3l-.6 1.9 2.1-.1h.3c3.8 0 6.8 3.1 6.8 6.8 0 3.8-3.1 6.8-6.8 6.8h-5.7c-1.7 0-2 2.7 0 2.7h5.7c5.2 0 9.5-4.3 9.5-9.5-.1-4.7-3.7-8.7-8.4-9.3z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/scattered-clouds-night.png b/weather-widget/icons/weather-underground-icons/scattered-clouds-night.png
deleted file mode 100755
index 63cb1b22..00000000
Binary files a/weather-widget/icons/weather-underground-icons/scattered-clouds-night.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/scattered-clouds-night.svg b/weather-widget/icons/weather-underground-icons/scattered-clouds-night.svg
new file mode 100644
index 00000000..27c6d484
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/scattered-clouds-night.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-cloudy" class="weather-icon weather-icon-white cloudy" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#FFFFFF;}</style><path class="st0" d="M49.7 50.2H16.8c-5.6 0-10.2-4.6-10.2-10.2 0-4.4 2.9-8.3 7-9.7V30c0-5.1 4.2-9.3 9.3-9.3 1.3 0 2.5.3 3.7.8 2.5-3.7 6.6-6 11.2-6 7.4 0 13.4 6 13.4 13.4 0 .8-.1 1.6-.2 2.4 4.7.6 8.3 4.6 8.3 9.4-.1 5.2-4.4 9.5-9.6 9.5zM22.9 23.4c-3.6 0-6.6 3-6.6 6.6 0 .3 0 .7.1 1.1l.2 1.3-1.3.2c-3.5.7-6.1 3.8-6.1 7.4 0 4.2 3.4 7.5 7.5 7.5h32.9c3.8 0 6.8-3.1 6.8-6.8 0-3.8-3.1-6.8-6.8-6.8h-.3l-2 .1.6-1.9c.3-1.1.5-2.2.5-3.3 0-5.9-4.8-10.7-10.7-10.7-4 0-7.6 2.2-9.5 5.7l-.7 1.3-1.2-.7c-1-.7-2.2-1-3.4-1z" id="cloudy"/></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/scattered-clouds.png b/weather-widget/icons/weather-underground-icons/scattered-clouds.png
deleted file mode 100755
index 63cb1b22..00000000
Binary files a/weather-widget/icons/weather-underground-icons/scattered-clouds.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/scattered-clouds.svg b/weather-widget/icons/weather-underground-icons/scattered-clouds.svg
new file mode 100644
index 00000000..27c6d484
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/scattered-clouds.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-cloudy" class="weather-icon weather-icon-white cloudy" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#FFFFFF;}</style><path class="st0" d="M49.7 50.2H16.8c-5.6 0-10.2-4.6-10.2-10.2 0-4.4 2.9-8.3 7-9.7V30c0-5.1 4.2-9.3 9.3-9.3 1.3 0 2.5.3 3.7.8 2.5-3.7 6.6-6 11.2-6 7.4 0 13.4 6 13.4 13.4 0 .8-.1 1.6-.2 2.4 4.7.6 8.3 4.6 8.3 9.4-.1 5.2-4.4 9.5-9.6 9.5zM22.9 23.4c-3.6 0-6.6 3-6.6 6.6 0 .3 0 .7.1 1.1l.2 1.3-1.3.2c-3.5.7-6.1 3.8-6.1 7.4 0 4.2 3.4 7.5 7.5 7.5h32.9c3.8 0 6.8-3.1 6.8-6.8 0-3.8-3.1-6.8-6.8-6.8h-.3l-2 .1.6-1.9c.3-1.1.5-2.2.5-3.3 0-5.9-4.8-10.7-10.7-10.7-4 0-7.6 2.2-9.5 5.7l-.7 1.3-1.2-.7c-1-.7-2.2-1-3.4-1z" id="cloudy"/></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/shower-rain-night.png b/weather-widget/icons/weather-underground-icons/shower-rain-night.png
deleted file mode 100755
index 49f0903c..00000000
Binary files a/weather-widget/icons/weather-underground-icons/shower-rain-night.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/shower-rain-night.svg b/weather-widget/icons/weather-underground-icons/shower-rain-night.svg
new file mode 100644
index 00000000..46e73365
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/shower-rain-night.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-rain" class="weather-icon weather-icon-white rain" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#2885C7;} .st1{fill:#FFFFFF;}</style><g id="rain"><path class="st0" d="M25.5 59.3c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l9.3-21.9c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-9.3 21.9c-.2.5-.7.8-1.2.8zM34 53.5c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l6.6-16c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-6.6 16c-.2.5-.7.8-1.2.8zM21.9 53.5c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l6.6-16c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-6.6 16c-.2.5-.6.8-1.2.8z"/><path class="st1" d="M50.9 22.4c.1-.8.2-1.6.2-2.4 0-7.4-6-13.4-13.4-13.4-4.5 0-8.7 2.3-11.2 6-1.2-.5-2.4-.8-3.7-.8-5.1 0-9.3 4.2-9.3 9.3v.3c-4.1 1.4-7 5.2-7 9.7 0 5.6 4.6 10.2 10.2 10.2h5c1.6 0 1.5-2.7 0-2.7h-5c-4.2 0-7.5-3.4-7.5-7.5 0-3.6 2.5-6.7 6.1-7.4l1.3-.3-.2-1.3c-.1-.4-.1-.7-.1-1.1 0-3.6 3-6.6 6.6-6.6 1.2 0 2.4.3 3.5 1l1.2.7.7-1.3c1.9-3.5 5.5-5.7 9.5-5.7 5.9 0 10.7 4.8 10.7 10.7 0 1.1-.2 2.2-.5 3.3l-.6 1.9 2.1-.1h.3c3.8 0 6.8 3.1 6.8 6.8 0 3.8-3.1 6.8-6.8 6.8h-5.7c-1.7 0-2 2.7 0 2.7h5.7c5.2 0 9.5-4.3 9.5-9.5-.1-4.7-3.7-8.7-8.4-9.3z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/shower-rain.png b/weather-widget/icons/weather-underground-icons/shower-rain.png
deleted file mode 100755
index 49f0903c..00000000
Binary files a/weather-widget/icons/weather-underground-icons/shower-rain.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/shower-rain.svg b/weather-widget/icons/weather-underground-icons/shower-rain.svg
new file mode 100644
index 00000000..46e73365
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/shower-rain.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-rain" class="weather-icon weather-icon-white rain" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#2885C7;} .st1{fill:#FFFFFF;}</style><g id="rain"><path class="st0" d="M25.5 59.3c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l9.3-21.9c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-9.3 21.9c-.2.5-.7.8-1.2.8zM34 53.5c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l6.6-16c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-6.6 16c-.2.5-.7.8-1.2.8zM21.9 53.5c-.2 0-.3 0-.5-.1-.7-.3-1-1.1-.7-1.7l6.6-16c.3-.7 1.1-1 1.7-.7.7.3 1 1.1.7 1.7l-6.6 16c-.2.5-.6.8-1.2.8z"/><path class="st1" d="M50.9 22.4c.1-.8.2-1.6.2-2.4 0-7.4-6-13.4-13.4-13.4-4.5 0-8.7 2.3-11.2 6-1.2-.5-2.4-.8-3.7-.8-5.1 0-9.3 4.2-9.3 9.3v.3c-4.1 1.4-7 5.2-7 9.7 0 5.6 4.6 10.2 10.2 10.2h5c1.6 0 1.5-2.7 0-2.7h-5c-4.2 0-7.5-3.4-7.5-7.5 0-3.6 2.5-6.7 6.1-7.4l1.3-.3-.2-1.3c-.1-.4-.1-.7-.1-1.1 0-3.6 3-6.6 6.6-6.6 1.2 0 2.4.3 3.5 1l1.2.7.7-1.3c1.9-3.5 5.5-5.7 9.5-5.7 5.9 0 10.7 4.8 10.7 10.7 0 1.1-.2 2.2-.5 3.3l-.6 1.9 2.1-.1h.3c3.8 0 6.8 3.1 6.8 6.8 0 3.8-3.1 6.8-6.8 6.8h-5.7c-1.7 0-2 2.7 0 2.7h5.7c5.2 0 9.5-4.3 9.5-9.5-.1-4.7-3.7-8.7-8.4-9.3z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/snow-night.png b/weather-widget/icons/weather-underground-icons/snow-night.png
deleted file mode 100755
index 0a7f006b..00000000
Binary files a/weather-widget/icons/weather-underground-icons/snow-night.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/snow-night.svg b/weather-widget/icons/weather-underground-icons/snow-night.svg
new file mode 100644
index 00000000..86b432ec
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/snow-night.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-snow" class="weather-icon weather-icon-white snow" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#72B8D4;}</style><path class="st0" d="M51.6 32h-5.2l2.2-2.2c.4-.4.4-1 0-1.4-.4-.4-1-.4-1.4 0L43.6 32h-8.3l5.9-5.9h5.1c.5 0 1-.4 1-1 0-.5-.4-1-1-1h-3.1l3.7-3.7c.4-.4.4-1 0-1.4-.4-.4-1-.4-1.4 0l-3.7 3.7v-3.1c0-.5-.4-1-1-1-.5 0-1 .4-1 1v5.1l-5.9 5.9v-8.3l3.6-3.6c.4-.4.4-1 0-1.4-.4-.4-1-.4-1.4 0l-2.2 2.2v-5.2c0-.5-.4-1-1-1-.5 0-1 .4-1 1v5.2l-2.2-2.2c-.4-.4-1-.4-1.4 0-.4.4-.4 1 0 1.4l3.6 3.6v8.3L26 24.7v-5.1c0-.5-.4-1-1-1-.5 0-1 .4-1 1v3.1L20.3 19c-.4-.4-1-.4-1.4 0-.4.4-.4 1 0 1.4l3.7 3.7h-3.1c-.5 0-1 .4-1 1 0 .5.4 1 1 1h5.1l5.9 5.9h-8.3l-3.6-3.6c-.4-.4-1-.4-1.4 0-.4.4-.4 1 0 1.4l2.2 2.2h-5.2c-.5 0-1 .4-1 1 0 .5.4 1 1 1h5.2l-2.2 2.2c-.4.4-.4 1 0 1.4.2.2.4.3.7.3.2 0 .5-.1.7-.3l3.6-3.6h8.3l-5.9 5.9h-5.1c-.5 0-1 .4-1 1 0 .5.4 1 1 1h3.1L19 45.4c-.4.4-.4 1 0 1.4.2.2.4.3.7.3.2 0 .5-.1.7-.3l3.7-3.7v3.1c0 .5.4 1 1 1 .5 0 1-.4 1-1v-5.1l5.9-5.9v8.3l-3.6 3.6c-.4.4-.4 1 0 1.4.2.2.4.3.7.3.3 0 .5-.1.7-.3l2.2-2.2v5.2c0 .5.4 1 1 1 .5 0 1-.4 1-1v-5.2l2.2 2.2c.2.2.4.3.7.3.3 0 .5-.1.7-.3.4-.4.4-1 0-1.4L34 43.5v-8.3l5.9 5.9v5.1c0 .5.4 1 1 1 .5 0 1-.4 1-1v-3.1l3.7 3.7c.2.2.4.3.7.3.3 0 .5-.1.7-.3.4-.4.4-1 0-1.4l-3.7-3.7h3.1c.5 0 1-.4 1-1 0-.5-.4-1-1-1h-5.1l-5.9-5.9h8.3l3.6 3.6c.2.2.4.3.7.3.3 0 .5-.1.7-.3.4-.4.4-1 0-1.4l-2.2-2.2h5.2c.5 0 1-.4 1-1-.2-.4-.6-.8-1.1-.8z" id="snow"/></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/snow.png b/weather-widget/icons/weather-underground-icons/snow.png
deleted file mode 100755
index 0a7f006b..00000000
Binary files a/weather-widget/icons/weather-underground-icons/snow.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/snow.svg b/weather-widget/icons/weather-underground-icons/snow.svg
new file mode 100644
index 00000000..86b432ec
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/snow.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-snow" class="weather-icon weather-icon-white snow" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#72B8D4;}</style><path class="st0" d="M51.6 32h-5.2l2.2-2.2c.4-.4.4-1 0-1.4-.4-.4-1-.4-1.4 0L43.6 32h-8.3l5.9-5.9h5.1c.5 0 1-.4 1-1 0-.5-.4-1-1-1h-3.1l3.7-3.7c.4-.4.4-1 0-1.4-.4-.4-1-.4-1.4 0l-3.7 3.7v-3.1c0-.5-.4-1-1-1-.5 0-1 .4-1 1v5.1l-5.9 5.9v-8.3l3.6-3.6c.4-.4.4-1 0-1.4-.4-.4-1-.4-1.4 0l-2.2 2.2v-5.2c0-.5-.4-1-1-1-.5 0-1 .4-1 1v5.2l-2.2-2.2c-.4-.4-1-.4-1.4 0-.4.4-.4 1 0 1.4l3.6 3.6v8.3L26 24.7v-5.1c0-.5-.4-1-1-1-.5 0-1 .4-1 1v3.1L20.3 19c-.4-.4-1-.4-1.4 0-.4.4-.4 1 0 1.4l3.7 3.7h-3.1c-.5 0-1 .4-1 1 0 .5.4 1 1 1h5.1l5.9 5.9h-8.3l-3.6-3.6c-.4-.4-1-.4-1.4 0-.4.4-.4 1 0 1.4l2.2 2.2h-5.2c-.5 0-1 .4-1 1 0 .5.4 1 1 1h5.2l-2.2 2.2c-.4.4-.4 1 0 1.4.2.2.4.3.7.3.2 0 .5-.1.7-.3l3.6-3.6h8.3l-5.9 5.9h-5.1c-.5 0-1 .4-1 1 0 .5.4 1 1 1h3.1L19 45.4c-.4.4-.4 1 0 1.4.2.2.4.3.7.3.2 0 .5-.1.7-.3l3.7-3.7v3.1c0 .5.4 1 1 1 .5 0 1-.4 1-1v-5.1l5.9-5.9v8.3l-3.6 3.6c-.4.4-.4 1 0 1.4.2.2.4.3.7.3.3 0 .5-.1.7-.3l2.2-2.2v5.2c0 .5.4 1 1 1 .5 0 1-.4 1-1v-5.2l2.2 2.2c.2.2.4.3.7.3.3 0 .5-.1.7-.3.4-.4.4-1 0-1.4L34 43.5v-8.3l5.9 5.9v5.1c0 .5.4 1 1 1 .5 0 1-.4 1-1v-3.1l3.7 3.7c.2.2.4.3.7.3.3 0 .5-.1.7-.3.4-.4.4-1 0-1.4l-3.7-3.7h3.1c.5 0 1-.4 1-1 0-.5-.4-1-1-1h-5.1l-5.9-5.9h8.3l3.6 3.6c.2.2.4.3.7.3.3 0 .5-.1.7-.3.4-.4.4-1 0-1.4l-2.2-2.2h5.2c.5 0 1-.4 1-1-.2-.4-.6-.8-1.1-.8z" id="snow"/></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/thunderstorm-night.png b/weather-widget/icons/weather-underground-icons/thunderstorm-night.png
deleted file mode 100755
index 21021043..00000000
Binary files a/weather-widget/icons/weather-underground-icons/thunderstorm-night.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/thunderstorm-night.svg b/weather-widget/icons/weather-underground-icons/thunderstorm-night.svg
new file mode 100644
index 00000000..36cdab10
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/thunderstorm-night.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-chancetstorms" class="weather-icon weather-icon-white chancetstorms" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#FFFFFF;} .st1{fill:#F4A71D;}</style><g id="chancetstorms"><path class="st0" d="M50.9 22.4c.1-.8.2-1.6.2-2.4 0-7.4-6-13.4-13.4-13.4-4.5 0-8.7 2.3-11.2 6-1.2-.5-2.4-.8-3.6-.8-5.1 0-9.3 4.2-9.3 9.3v.3c-4.1 1.4-7 5.2-7 9.7 0 5.6 4.6 10.2 10.2 10.2h5c1.6 0 1.5-2.7 0-2.7h-5c-4.2 0-7.5-3.4-7.5-7.5 0-3.6 2.5-6.7 6.1-7.4l1.3-.3-.2-1.3c-.1-.4-.1-.7-.1-1.1 0-3.6 3-6.6 6.6-6.6 1.2 0 2.4.3 3.5 1l1.2.7.7-1.3c1.9-3.5 5.5-5.7 9.5-5.7 5.9 0 10.7 4.8 10.7 10.7 0 1.1-.2 2.2-.5 3.3l-.6 1.9 2.1-.1h.3c3.8 0 6.8 3.1 6.8 6.8 0 3.8-3.1 6.8-6.8 6.8h-5.7c-1.7 0-2 2.7 0 2.7h5.7c5.2 0 9.5-4.3 9.5-9.5-.2-4.7-3.9-8.7-8.5-9.3z"/><path class="st1" d="M27.2 59.2c-.2 0-.5-.1-.7-.2-.6-.4-.8-1.2-.4-1.8L34 44.1h-8.3L35 30.9c.4-.6 1.2-.7 1.8-.3.6.4.7 1.3.3 1.9l-6.4 9.1h7.9l-10.2 17c-.3.4-.7.6-1.2.6z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/icons/weather-underground-icons/thunderstorm.png b/weather-widget/icons/weather-underground-icons/thunderstorm.png
deleted file mode 100755
index 21021043..00000000
Binary files a/weather-widget/icons/weather-underground-icons/thunderstorm.png and /dev/null differ
diff --git a/weather-widget/icons/weather-underground-icons/thunderstorm.svg b/weather-widget/icons/weather-underground-icons/thunderstorm.svg
new file mode 100644
index 00000000..36cdab10
--- /dev/null
+++ b/weather-widget/icons/weather-underground-icons/thunderstorm.svg
@@ -0,0 +1 @@
+<svg id="weather-icon-chancetstorms" class="weather-icon weather-icon-white chancetstorms" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.st0{fill:#FFFFFF;} .st1{fill:#F4A71D;}</style><g id="chancetstorms"><path class="st0" d="M50.9 22.4c.1-.8.2-1.6.2-2.4 0-7.4-6-13.4-13.4-13.4-4.5 0-8.7 2.3-11.2 6-1.2-.5-2.4-.8-3.6-.8-5.1 0-9.3 4.2-9.3 9.3v.3c-4.1 1.4-7 5.2-7 9.7 0 5.6 4.6 10.2 10.2 10.2h5c1.6 0 1.5-2.7 0-2.7h-5c-4.2 0-7.5-3.4-7.5-7.5 0-3.6 2.5-6.7 6.1-7.4l1.3-.3-.2-1.3c-.1-.4-.1-.7-.1-1.1 0-3.6 3-6.6 6.6-6.6 1.2 0 2.4.3 3.5 1l1.2.7.7-1.3c1.9-3.5 5.5-5.7 9.5-5.7 5.9 0 10.7 4.8 10.7 10.7 0 1.1-.2 2.2-.5 3.3l-.6 1.9 2.1-.1h.3c3.8 0 6.8 3.1 6.8 6.8 0 3.8-3.1 6.8-6.8 6.8h-5.7c-1.7 0-2 2.7 0 2.7h5.7c5.2 0 9.5-4.3 9.5-9.5-.2-4.7-3.9-8.7-8.5-9.3z"/><path class="st1" d="M27.2 59.2c-.2 0-.5-.1-.7-.2-.6-.4-.8-1.2-.4-1.8L34 44.1h-8.3L35 30.9c.4-.6 1.2-.7 1.8-.3.6.4.7 1.3.3 1.9l-6.4 9.1h7.9l-10.2 17c-.3.4-.7.6-1.2.6z"/></g></svg>
\ No newline at end of file
diff --git a/weather-widget/weather.lua b/weather-widget/weather.lua
index 4e8e659c..a106e282 100644
--- a/weather-widget/weather.lua
+++ b/weather-widget/weather.lua
@@ -123,6 +123,28 @@ local function uvi_index_color(uvi)
     return '<span weight="bold" foreground="' .. color .. '">' .. uvi .. '</span>'
 end
 
+local function get_coordinates(val)
+    local coordinates = val
+    if val == "ipBased" then
+        local geofile = "/tmp/geo.json"
+        if not gears.filesystem.file_readable(geofile) then
+            local handle = os.execute("curl -H 'Accept:application/json' ipinfo.io/json -s -o " .. geofile)
+            if handle then
+                show_warning("fail to get coordinates from ip")
+            end
+        end
+        local file = io.open( geofile,"r")
+        local result = file:read("*all")
+        result = json.decode(result)
+        file:close()
+        coordinates = {}
+        for match in result.loc:gmatch("[^,%s]+") do
+            coordinates[#coordinates + 1] = tonumber(match)
+        end
+    end
+    return coordinates
+end
+
 local function worker(user_args)
 
     local args = user_args or {}
@@ -135,7 +157,7 @@ local function worker(user_args)
         return
     end
 
-    local coordinates = args.coordinates
+    local coordinates = get_coordinates(args.coordinates)
     local api_key = args.api_key
     local font_name = args.font_name or beautiful.font:gsub("%s%d+$", "")
     local units = args.units or 'metric'