diff --git a/app/src/main/java/com/codigoparallevar/minicards/bridge/ProgramakerBridgeService.java b/app/src/main/java/com/codigoparallevar/minicards/bridge/ProgramakerBridgeService.java
index 1cfc94e..c97733e 100644
--- a/app/src/main/java/com/codigoparallevar/minicards/bridge/ProgramakerBridgeService.java
+++ b/app/src/main/java/com/codigoparallevar/minicards/bridge/ProgramakerBridgeService.java
@@ -21,6 +21,12 @@ import com.codigoparallevar.minicards.types.functional.Tuple2;
 import com.codigoparallevar.minicards.ui_helpers.DoAsync;
 import com.programaker.api.ProgramakerApi;
 
+enum ServiceState {
+    LOADING,
+    RUNNING,
+    STOPPED,
+}
+
 public class ProgramakerBridgeService extends Service {
     public static final String BridgeUserNotificationChannel = "PROGRAMAKER_BRIDGE_USER_NOTIFICATION";
     public static final CharSequence BridgeUserNotificationChannelName = "User notifications";
@@ -41,10 +47,10 @@ public class ProgramakerBridgeService extends Service {
 
     @Override
     public void onCreate() {
-        setBridgeStatusNotification(getString(R.string.bridge_service_not_started), true);
+        setBridgeStatusNotification(getString(R.string.bridge_service_not_started), ServiceState.LOADING);
     }
 
-    private void setBridgeStatusNotification(String title, boolean stopped) {
+    private void setBridgeStatusNotification(String title, ServiceState state) {
         NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         assert notificationManager != null;
 
@@ -72,13 +78,19 @@ public class ProgramakerBridgeService extends Service {
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT);
 
 
-        if (stopped) {
+        if (state == ServiceState.STOPPED) {
             builder.addAction(R.drawable.ic_start, getString(R.string.start_bridge), startPendingIntent)
                     .setSmallIcon(R.drawable.ic_vector_stopped_icon);
         }
         else {
-            builder.addAction(R.drawable.ic_cancel, getString(R.string.stop_bridge), stopPendingIntent)
-                    .setSmallIcon(R.drawable.ic_vector_icon);
+            builder.addAction(R.drawable.ic_cancel, getString(R.string.stop_bridge), stopPendingIntent);
+
+            if (state == ServiceState.RUNNING) {
+                builder.setSmallIcon(R.drawable.ic_vector_icon);
+            }
+            else {
+                builder.setSmallIcon(R.drawable.ic_vector_icon_loading);
+            }
         }
 
         Notification notification = builder.build();
@@ -148,7 +160,7 @@ public class ProgramakerBridgeService extends Service {
                         bridgeId);
                 ProgramakerBridgeService.this.bridge.start(
                         () -> { // On ready
-                            setBridgeStatusNotification(getString(R.string.bridge_service_online), false);
+                            setBridgeStatusNotification(getString(R.string.bridge_service_online), ServiceState.RUNNING);
                             if (config.getBridgeConnectionId() == null) {
                                 new DoAsync().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
                                         new Tuple2<>(
@@ -178,14 +190,14 @@ public class ProgramakerBridgeService extends Service {
         }, "ServiceStartArguments");
         thread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);
 
-        setBridgeStatusNotification(getString(R.string.bridge_service_starting), false);
+        setBridgeStatusNotification(getString(R.string.bridge_service_starting), ServiceState.LOADING);
         thread.start();
     }
 
     private void onBridgeFailedAfterConnected() {
         if (!stopped) {
             Log.e(LogTag, "Bridge stopped after connected. Waiting 10s then restarting");
-            setBridgeStatusNotification(getString(R.string.bridge_service_failed_restarting), false);
+            setBridgeStatusNotification(getString(R.string.bridge_service_failed_restarting), ServiceState.LOADING);
             try {
                 Thread.sleep(WAIT_TIME_BEFORE_RESTART_MILLIS);
             } catch (InterruptedException e) {
@@ -208,6 +220,6 @@ public class ProgramakerBridgeService extends Service {
         if (bridge != null) {
             bridge.stop();
         }
-        setBridgeStatusNotification(getString(R.string.bridge_service_failed_stopping), true);
+        setBridgeStatusNotification(getString(R.string.bridge_service_failed_stopping), ServiceState.STOPPED);
     }
 }
diff --git a/app/src/main/res/drawable/ic_vector_icon.xml b/app/src/main/res/drawable/ic_vector_icon.xml
index 38f9ad0..2b0607a 100644
--- a/app/src/main/res/drawable/ic_vector_icon.xml
+++ b/app/src/main/res/drawable/ic_vector_icon.xml
@@ -1,12 +1,32 @@
 <vector android:alpha="0.99" android:autoMirrored="true"
-    android:height="328.6dp" android:viewportHeight="328.6"
-    android:viewportWidth="322" android:width="322dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
-        android:pathData="M90.79,152.763 L287.19,286.563 173.29,25.493c0,0 -12.3,-23.91 -26,0.37 -13.6,24.3 -56.5,126.9 -56.5,126.9z"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="30.2362"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M32.25,290.863 L132.09,230.763 74.8,191.163Z"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="30.2362"/>
+    android:height="328.9dp" android:viewportHeight="328.9"
+    android:viewportWidth="321.8" android:width="321.8dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="m160.24,33.827 l27.3,-12.96c0,0 -10.7,-20.629 -26.8,-20.865C144.54,-0.233 132.84,20.867 132.84,20.867Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M187.54,20.867 L160.24,33.827 252.34,244.877 109.44,147.877 71.93,158.577 321.84,328.877Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M71.93,158.577 L109.44,147.877 160.24,33.827 252.34,244.877 321.84,328.877 187.54,20.867h-54.7z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M321.84,328.877 L252.34,244.877 109.44,147.877 160.24,33.827 297.94,273.877 187.54,20.867L132.84,20.867L71.93,158.577Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="m68.01,168.477 l13.26,45.9 -16.92,39.7 39.79,-23.9 55.6,1.7 -159.74,96.2z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M0,328.077 L64.35,254.077 104.14,230.177 81.27,214.377 68.01,168.477 159.74,231.877Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M159.74,231.877 L104.14,230.177 81.27,214.377 64.35,254.077 0,328.077 68.01,168.477Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_vector_icon_loading.xml b/app/src/main/res/drawable/ic_vector_icon_loading.xml
new file mode 100644
index 0000000..b1665fb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_vector_icon_loading.xml
@@ -0,0 +1,41 @@
+<vector android:alpha="0.99" android:autoMirrored="true"
+    android:height="328.9dp" android:viewportHeight="328.9"
+    android:viewportWidth="321.8" android:width="321.8dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M187.5,20.87L160.2,33.83L243.2,224.2A48.11,48.11 0,0 1,265.3 218.8A48.11,48.11 0,0 1,274.1 219.6L187.5,20.87zM109.4,147.9L71.93,158.6L160.3,218.8A48.11,48.11 0,0 1,204.3 248.8L218,258.2A48.11,48.11 0,0 1,232.7 231.6L109.4,147.9zM306,292.6A48.11,48.11 0,0 1,290.7 307.7L321.8,328.9L306,292.6z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M132.8,20.87L71.93,158.6L109.4,147.9L160.2,33.83L243.3,224.1A48.11,48.11 0,0 1,265.3 218.8A48.11,48.11 0,0 1,274.2 219.6L187.5,20.87L132.8,20.87zM306,292.6A48.11,48.11 0,0 1,299 301.2L321.8,328.9L306,292.6z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M132.8,20.87L71.93,158.6L160.3,218.8A48.11,48.11 0,0 1,204.3 248.8L218,258.2A48.11,48.11 0,0 1,232.7 231.6L109.4,147.9L160.2,33.83L266.3,218.8A48.11,48.11 0,0 1,274.2 219.6L187.5,20.87L132.8,20.87zM298.9,301.3A48.11,48.11 0,0 1,290.7 307.7L321.8,328.9L298.9,301.3z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M54.33,266.877m-29.26,0a29.26,29.26 0,1 1,58.52 0a29.26,29.26 0,1 1,-58.52 0"
+        android:strokeLineCap="square" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M68.01,168.5L46.29,219.5A48.11,48.11 0,0 1,54.33 218.8A48.11,48.11 0,0 1,76.98 224.4L81.27,214.4L68.01,168.5zM104.1,230.2L92.27,237.3A48.11,48.11 0,0 1,102.4 266.4L112.1,260.6A48.11,48.11 0,0 1,127.8 230.9L104.1,230.2zM14.55,293.9L0,328.1L31.41,309.2A48.11,48.11 0,0 1,14.55 293.9z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M68.01,168.5L46.29,219.5A48.11,48.11 0,0 1,54.33 218.8A48.11,48.11 0,0 1,76.98 224.4L81.27,214.4L104.1,230.2L127.8,230.9A48.11,48.11 0,0 1,144.4 221.3L68.01,168.5zM14.55,293.9L0,328.1L22.14,302.6A48.11,48.11 0,0 1,14.55 293.9z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M68.01,168.5L81.27,214.4L104.1,230.2L92.27,237.3A48.11,48.11 0,0 1,102.4 266.4L112.1,260.6A48.11,48.11 0,0 1,144.4 221.3L68.01,168.5zM22.14,302.6L0,328.1L31.41,309.2A48.11,48.11 0,0 1,22.14 302.6z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M265.34,266.877m-29.26,0a29.26,29.26 0,1 1,58.52 0a29.26,29.26 0,1 1,-58.52 0"
+        android:strokeLineCap="square" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M159.74,266.877m-29.26,0a29.26,29.26 0,1 1,58.52 0a29.26,29.26 0,1 1,-58.52 0"
+        android:strokeLineCap="square" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="m160.24,33.827 l27.3,-12.96c0,0 -10.7,-20.629 -26.8,-20.865C144.54,-0.233 132.84,20.867 132.84,20.867Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_vector_stopped_icon.xml b/app/src/main/res/drawable/ic_vector_stopped_icon.xml
index 130730a..64131b0 100644
--- a/app/src/main/res/drawable/ic_vector_stopped_icon.xml
+++ b/app/src/main/res/drawable/ic_vector_stopped_icon.xml
@@ -1,16 +1,35 @@
 <vector android:alpha="0.99" android:autoMirrored="true"
-    android:height="328.6dp" android:viewportHeight="328.6"
-    android:viewportWidth="322" android:width="322dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
-        android:pathData="M90.79,152.763 L287.19,286.563 173.29,25.493c0,0 -12.3,-23.91 -26,0.37 -13.6,24.3 -56.5,126.9 -56.5,126.9z"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="30.2362"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M32.25,290.863 L132.09,230.763 74.8,191.163Z"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="30.2362"/>
-    <path android:fillColor="#000000"
-        android:pathData="M-14.73,211.691l338.429,-119.798l12.181,33.237l-338.429,119.798z"
-        android:strokeColor="#ff00ff" android:strokeLineCap="square"
-        android:strokeLineJoin="miter" android:strokeWidth="0"/>
+    android:height="328.9dp" android:viewportHeight="328.9"
+    android:viewportWidth="321.8" android:width="321.8dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M132.8,20.87L98.26,99.06L127.2,108L160.2,33.83L202.8,131.3L240.8,143L187.5,20.87L132.8,20.87zM238.5,213.2L252.3,244.9L321.8,328.9L276.5,224.9L238.5,213.2z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M132.8,20.87L98.26,99.06L127.2,108L160.2,33.83L219,136.3L240.9,143.1L187.5,20.87L132.8,20.87zM80.45,164.4L321.8,328.9L252.3,244.9L178.2,194.5L80.45,164.4zM268.4,222.4L297.9,273.9L276.6,224.9L268.4,222.4z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M46.593,103.207l254.65,78.584l-8.625,27.949l-254.65,-78.584z"
+        android:strokeLineCap="square" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="m160.24,33.827 l27.3,-12.96c0,0 -10.7,-20.629 -26.8,-20.865C144.54,-0.233 132.84,20.867 132.84,20.867Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M187.5,20.87L160.2,33.83L202.8,131.3L240.8,143L187.5,20.87zM80.45,164.4L321.8,328.9L276.5,224.9L238.5,213.2L252.3,244.9L178.2,194.5L80.45,164.4z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="m68.01,168.477 l13.26,45.9 -16.92,39.7 39.79,-23.9 55.6,1.7 -159.74,96.2z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M0,328.077 L64.35,254.077 104.14,230.177 81.27,214.377 68.01,168.477 159.74,231.877Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M159.74,231.877 L104.14,230.177 81.27,214.377 64.35,254.077 0,328.077 68.01,168.477Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
 </vector>
diff --git a/asset-src/ic_vector_icon.svg b/asset-src/ic_vector_icon.svg
index aa13b0a..1b1d9bd 100644
--- a/asset-src/ic_vector_icon.svg
+++ b/asset-src/ic_vector_icon.svg
@@ -9,9 +9,9 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    id="svg2693"
-   width="322"
-   height="328.6"
-   viewBox="0 0 322 328.6"
+   width="321.8"
+   height="328.9"
+   viewBox="0 0 321.8 328.9"
    sodipodi:docname="ic_vector_icon.svg"
    inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
   <metadata
@@ -42,9 +42,9 @@
      inkscape:window-height="746"
      id="namedview2695"
      showgrid="false"
-     inkscape:zoom="0.7865"
-     inkscape:cx="222.3"
-     inkscape:cy="190.6"
+     inkscape:zoom="1.53"
+     inkscape:cx="148.9"
+     inkscape:cy="166.6"
      inkscape:window-x="0"
      inkscape:window-y="20"
      inkscape:window-maximized="1"
@@ -57,16 +57,34 @@
      inkscape:groupmode="layer"
      inkscape:label="Image"
      id="g2701"
-     transform="translate(-14.41,-8.837)">
+     transform="translate(-14.56,-8.523)">
     <path
-       style="fill:none;stroke:#000000;stroke-width:30.2362;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 105.2,161.6 301.6,295.4 187.7,34.33 c 0,0 -12.3,-23.91 -26,0.37 -13.6,24.3 -56.5,126.9 -56.5,126.9 z"
-       id="path3270"
-       sodipodi:nodetypes="cccsc" />
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 174.8,42.35 27.3,-12.96 c 0,0 -10.7,-20.629 -26.8,-20.865 C 159.1,8.29 147.4,29.39 147.4,29.39 Z"
+       id="path2082" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:30.2362;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 46.66,299.7 146.5,239.6 89.21,200 Z"
-       id="path3312"
-       sodipodi:nodetypes="cccc" />
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 202.1,29.39 174.8,42.35 266.9,253.4 124,156.4 86.49,167.1 336.4,337.4 Z"
+       id="path2074" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 86.49,167.1 124,156.4 174.8,42.35 266.9,253.4 336.4,337.4 202.1,29.39 h -54.7 z"
+       id="path2072" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 336.4,337.4 266.9,253.4 124,156.4 174.8,42.35 312.5,282.4 202.1,29.39 H 147.4 L 86.49,167.1 Z"
+       id="path2048" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 82.57,177 13.26,45.9 -16.92,39.7 39.79,-23.9 55.6,1.7 -159.74,96.2 z"
+       id="path2044" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 14.56,336.6 78.91,262.6 118.7,238.7 95.83,222.9 82.57,177 174.3,240.4 Z"
+       id="path2040" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 174.3,240.4 118.7,238.7 95.83,222.9 78.91,262.6 14.56,336.6 82.57,177 Z"
+       id="path2046" />
   </g>
 </svg>
diff --git a/asset-src/ic_vector_icon_as_paths.svg b/asset-src/ic_vector_icon_as_paths.svg
new file mode 100644
index 0000000..a83ffa5
--- /dev/null
+++ b/asset-src/ic_vector_icon_as_paths.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ic_vector_icon_as_paths.svg"
+   viewBox="0 0 321.8 328.9"
+   height="328.9"
+   width="321.8"
+   id="svg2693"
+   version="1.1">
+  <metadata
+     id="metadata2699">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2697" />
+  <sodipodi:namedview
+     showguides="false"
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:current-layer="g2701"
+     inkscape:window-maximized="1"
+     inkscape:window-y="20"
+     inkscape:window-x="0"
+     inkscape:cy="10.4"
+     inkscape:cx="226.4"
+     inkscape:zoom="0.5569"
+     showgrid="false"
+     id="namedview2695"
+     inkscape:window-height="746"
+     inkscape:window-width="1364"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0" />
+  <g
+     transform="translate(-14.56,-8.523)"
+     id="g2701"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <path
+       id="path2082"
+       d="m 174.8,42.35 27.3,-12.96 c 0,0 -10.7,-20.629 -26.8,-20.865 C 159.1,8.29 147.4,29.39 147.4,29.39 Z"
+       style="fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path2074"
+       d="M 202.1,29.39 174.8,42.35 266.9,253.4 124,156.4 86.49,167.1 336.4,337.4 Z"
+       style="fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path2072"
+       d="M 86.49,167.1 124,156.4 174.8,42.35 266.9,253.4 336.4,337.4 202.1,29.39 h -54.7 z"
+       style="fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path2048"
+       d="M 336.4,337.4 266.9,253.4 124,156.4 174.8,42.35 312.5,282.4 202.1,29.39 H 147.4 L 86.49,167.1 Z"
+       style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path2044"
+       d="m 82.57,177 13.26,45.9 -16.92,39.7 39.79,-23.9 55.6,1.7 -159.74,96.2 z"
+       style="fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path2040"
+       d="M 14.56,336.6 78.91,262.6 118.7,238.7 95.83,222.9 82.57,177 174.3,240.4 Z"
+       style="fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path2046"
+       d="M 174.3,240.4 118.7,238.7 95.83,222.9 78.91,262.6 14.56,336.6 82.57,177 Z"
+       style="fill:#800000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/asset-src/ic_vector_icon_loading.svg b/asset-src/ic_vector_icon_loading.svg
new file mode 100644
index 0000000..4603c87
--- /dev/null
+++ b/asset-src/ic_vector_icon_loading.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ic_vector_icon_as_paths.svg"
+   viewBox="0 0 321.8 328.9"
+   height="328.9"
+   width="321.8"
+   id="svg2693"
+   version="1.1">
+  <metadata
+     id="metadata2699">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2697" />
+  <sodipodi:namedview
+     showguides="false"
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:current-layer="g2701"
+     inkscape:window-maximized="1"
+     inkscape:window-y="20"
+     inkscape:window-x="0"
+     inkscape:cy="10.4"
+     inkscape:cx="226.4"
+     inkscape:zoom="0.5569"
+     showgrid="false"
+     id="namedview2695"
+     inkscape:window-height="746"
+     inkscape:window-width="1364"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     inkscape:document-rotation="0" />
+  <g
+     transform="translate(-14.56,-8.523)"
+     id="g2701"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <path
+       transform="translate(14.56,8.523)"
+       d="M 187.5 20.87 L 160.2 33.83 L 243.2 224.2 A 48.11 48.11 0 0 1 265.3 218.8 A 48.11 48.11 0 0 1 274.1 219.6 L 187.5 20.87 z M 109.4 147.9 L 71.93 158.6 L 160.3 218.8 A 48.11 48.11 0 0 1 204.3 248.8 L 218 258.2 A 48.11 48.11 0 0 1 232.7 231.6 L 109.4 147.9 z M 306 292.6 A 48.11 48.11 0 0 1 290.7 307.7 L 321.8 328.9 L 306 292.6 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2074" />
+    <path
+       transform="translate(14.56,8.523)"
+       d="M 132.8 20.87 L 71.93 158.6 L 109.4 147.9 L 160.2 33.83 L 243.3 224.1 A 48.11 48.11 0 0 1 265.3 218.8 A 48.11 48.11 0 0 1 274.2 219.6 L 187.5 20.87 L 132.8 20.87 z M 306 292.6 A 48.11 48.11 0 0 1 299 301.2 L 321.8 328.9 L 306 292.6 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2072" />
+    <path
+       transform="translate(14.56,8.523)"
+       d="M 132.8 20.87 L 71.93 158.6 L 160.3 218.8 A 48.11 48.11 0 0 1 204.3 248.8 L 218 258.2 A 48.11 48.11 0 0 1 232.7 231.6 L 109.4 147.9 L 160.2 33.83 L 266.3 218.8 A 48.11 48.11 0 0 1 274.2 219.6 L 187.5 20.87 L 132.8 20.87 z M 298.9 301.3 A 48.11 48.11 0 0 1 290.7 307.7 L 321.8 328.9 L 298.9 301.3 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2048" />
+    <circle
+       style="fill:#000000;fill-opacity:1;stroke-width:0;stroke-linecap:square;paint-order:fill markers stroke"
+       id="path4129-0"
+       cx="68.89"
+       cy="275.4"
+       r="29.26" />
+    <path
+       transform="translate(14.56,8.523)"
+       d="M 68.01 168.5 L 46.29 219.5 A 48.11 48.11 0 0 1 54.33 218.8 A 48.11 48.11 0 0 1 76.98 224.4 L 81.27 214.4 L 68.01 168.5 z M 104.1 230.2 L 92.27 237.3 A 48.11 48.11 0 0 1 102.4 266.4 L 112.1 260.6 A 48.11 48.11 0 0 1 127.8 230.9 L 104.1 230.2 z M 14.55 293.9 L 0 328.1 L 31.41 309.2 A 48.11 48.11 0 0 1 14.55 293.9 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2044" />
+    <path
+       transform="translate(14.56,8.523)"
+       d="M 68.01 168.5 L 46.29 219.5 A 48.11 48.11 0 0 1 54.33 218.8 A 48.11 48.11 0 0 1 76.98 224.4 L 81.27 214.4 L 104.1 230.2 L 127.8 230.9 A 48.11 48.11 0 0 1 144.4 221.3 L 68.01 168.5 z M 14.55 293.9 L 0 328.1 L 22.14 302.6 A 48.11 48.11 0 0 1 14.55 293.9 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2046" />
+    <path
+       transform="translate(14.56,8.523)"
+       d="M 68.01 168.5 L 81.27 214.4 L 104.1 230.2 L 92.27 237.3 A 48.11 48.11 0 0 1 102.4 266.4 L 112.1 260.6 A 48.11 48.11 0 0 1 144.4 221.3 L 68.01 168.5 z M 22.14 302.6 L 0 328.1 L 31.41 309.2 A 48.11 48.11 0 0 1 22.14 302.6 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2040" />
+    <circle
+       style="fill:#000000;fill-opacity:1;stroke-width:0;stroke-linecap:square;paint-order:fill markers stroke"
+       id="path4129-0-5-6"
+       cx="279.9"
+       cy="275.4"
+       r="29.26" />
+    <circle
+       r="29.26"
+       cy="275.4"
+       cx="174.3"
+       id="path4129-0-5"
+       style="fill:#000000;fill-opacity:1;stroke-width:0;stroke-linecap:square;paint-order:fill markers stroke" />
+    <path
+       id="path2082"
+       d="m 174.8,42.35 27.3,-12.96 c 0,0 -10.7,-20.629 -26.8,-20.865 C 159.1,8.29 147.4,29.39 147.4,29.39 Z"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/asset-src/ic_vector_stopped_icon.svg b/asset-src/ic_vector_stopped_icon.svg
index b5637a2..a7e3b39 100644
--- a/asset-src/ic_vector_stopped_icon.svg
+++ b/asset-src/ic_vector_stopped_icon.svg
@@ -7,13 +7,13 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="ic_vector_stopped_icon.svg"
-   viewBox="0 0 322 328.6"
-   height="328.6"
-   width="322"
+   version="1.1"
    id="svg2693"
-   version="1.1">
+   width="321.8"
+   height="328.9"
+   viewBox="0 0 321.8 328.9"
+   sodipodi:docname="ic_vector_stopped_icon.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
   <metadata
      id="metadata2699">
     <rdf:RDF>
@@ -29,52 +29,73 @@
   <defs
      id="defs2697" />
   <sodipodi:namedview
-     fit-margin-bottom="0"
-     fit-margin-right="0"
-     fit-margin-left="0"
-     fit-margin-top="0"
-     inkscape:current-layer="g2701"
-     inkscape:window-maximized="1"
-     inkscape:window-y="20"
-     inkscape:window-x="0"
-     inkscape:cy="145.1"
-     inkscape:cx="194.7"
-     inkscape:zoom="0.9615"
-     showgrid="false"
-     id="namedview2695"
-     inkscape:window-height="746"
-     inkscape:window-width="1364"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
+     inkscape:document-rotation="0"
      pagecolor="#ffffff"
-     inkscape:document-rotation="0" />
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1364"
+     inkscape:window-height="746"
+     id="namedview2695"
+     showgrid="false"
+     inkscape:zoom="1.322"
+     inkscape:cx="162.3"
+     inkscape:cy="166.8"
+     inkscape:window-x="0"
+     inkscape:window-y="20"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g2701"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
   <g
-     transform="translate(-14.41,-8.837)"
-     id="g2701"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g2701"
+     transform="translate(-14.56,-8.523)">
     <path
-       sodipodi:nodetypes="cccsc"
-       id="path3270"
-       d="M 105.2,161.6 301.6,295.4 187.7,34.33 c 0,0 -12.3,-23.91 -26,0.37 -13.6,24.3 -56.5,126.9 -56.5,126.9 z"
-       style="fill:none;stroke:#000000;stroke-width:30.2362;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       transform="translate(14.56,8.523)"
+       d="M 132.8 20.87 L 98.26 99.06 L 127.2 108 L 160.2 33.83 L 202.8 131.3 L 240.8 143 L 187.5 20.87 L 132.8 20.87 z M 238.5 213.2 L 252.3 244.9 L 321.8 328.9 L 276.5 224.9 L 238.5 213.2 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2072" />
     <path
-       sodipodi:nodetypes="cccc"
-       id="path3312"
-       d="M 46.66,299.7 146.5,239.6 89.21,200 Z"
-       style="fill:none;stroke:#000000;stroke-width:30.2362;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       transform="translate(14.56,8.523)"
+       d="M 132.8 20.87 L 98.26 99.06 L 127.2 108 L 160.2 33.83 L 219 136.3 L 240.9 143.1 L 187.5 20.87 L 132.8 20.87 z M 80.45 164.4 L 321.8 328.9 L 252.3 244.9 L 178.2 194.5 L 80.45 164.4 z M 268.4 222.4 L 297.9 273.9 L 276.6 224.9 L 268.4 222.4 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2048" />
     <rect
-       transform="matrix(0.9427,-0.3337,0.3441,0.9389,0,0)"
-       y="207.8"
-       x="-76.19"
-       height="35.4"
-       width="359"
-       id="rect936"
-       style="fill:#000000;stroke:#ff00ff;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1.6;stroke-dasharray:none;paint-order:fill markers stroke" />
+       transform="rotate(17.15)"
+       style="fill:#000000;fill-opacity:1;stroke-width:0;stroke-linecap:square;paint-order:fill markers stroke"
+       id="rect3049-0"
+       width="266.5"
+       height="29.25"
+       x="91.38"
+       y="88.73" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 174.8,42.35 27.3,-12.96 c 0,0 -10.7,-20.629 -26.8,-20.865 C 159.1,8.29 147.4,29.39 147.4,29.39 Z"
+       id="path2082" />
+    <path
+       transform="translate(14.56,8.523)"
+       d="M 187.5 20.87 L 160.2 33.83 L 202.8 131.3 L 240.8 143 L 187.5 20.87 z M 80.45 164.4 L 321.8 328.9 L 276.5 224.9 L 238.5 213.2 L 252.3 244.9 L 178.2 194.5 L 80.45 164.4 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2074" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 82.57,177 13.26,45.9 -16.92,39.7 39.79,-23.9 55.6,1.7 -159.74,96.2 z"
+       id="path2044" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 14.56,336.6 78.91,262.6 118.7,238.7 95.83,222.9 82.57,177 174.3,240.4 Z"
+       id="path2040" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 174.3,240.4 118.7,238.7 95.83,222.9 78.91,262.6 14.56,336.6 82.57,177 Z"
+       id="path2046" />
   </g>
 </svg>