diff --git a/src/clients/networkmanager.rs b/src/clients/networkmanager.rs
index 5f4fa65..a1b760f 100644
--- a/src/clients/networkmanager.rs
+++ b/src/clients/networkmanager.rs
@@ -25,13 +25,13 @@ pub struct Client {
 
 #[derive(Clone, Debug)]
 pub enum ClientState {
-    Unknown,
     WiredConnected,
     WifiConnected,
     CellularConnected,
     VpnConnected,
     WifiDisconnected,
     Offline,
+    Unknown,
 }
 
 impl Client {
@@ -116,7 +116,7 @@ pub fn create_client() -> Result<Arc<Client>> {
         let client = client.clone();
         spawn_blocking(move || {
             if let Err(error) = client.run() {
-                error!("{}", error)
+                error!("{}", error);
             };
         });
     }
@@ -136,17 +136,10 @@ fn determine_state(
         }
     } else {
         match primary_connection_type {
-            "802-11-olpc-mesh" => ClientState::WifiConnected,
-            "802-11-wireless" => ClientState::WifiConnected,
-            "802-3-ethernet" => ClientState::WiredConnected,
-            "adsl" => ClientState::WiredConnected,
-            "cdma" => ClientState::CellularConnected,
-            "gsm" => ClientState::CellularConnected,
-            "pppoe" => ClientState::WiredConnected,
-            "vpn" => ClientState::VpnConnected,
-            "wifi-p2p" => ClientState::WifiConnected,
-            "wimax" => ClientState::CellularConnected,
-            "wireguard" => ClientState::VpnConnected,
+            "802-3-ethernet" | "adsl" | "pppoe" => ClientState::WiredConnected,
+            "802-11-olpc-mesh" | "802-11-wireless" | "wifi-p2p" => ClientState::WifiConnected,
+            "cdma" | "gsm" | "wimax" => ClientState::CellularConnected,
+            "vpn" | "wireguard" => ClientState::VpnConnected,
             _ => ClientState::Unknown,
         }
     }
diff --git a/src/modules/networkmanager.rs b/src/modules/networkmanager.rs
index 1d93777..972fccb 100644
--- a/src/modules/networkmanager.rs
+++ b/src/modules/networkmanager.rs
@@ -2,7 +2,7 @@ use color_eyre::Result;
 use futures_lite::StreamExt;
 use futures_signals::signal::SignalExt;
 use gtk::prelude::ContainerExt;
-use gtk::{Image, Orientation};
+use gtk::{Box, Image, Orientation};
 use serde::Deserialize;
 use tokio::sync::mpsc::Receiver;
 
@@ -26,7 +26,7 @@ const fn default_icon_size() -> i32 {
     24
 }
 
-impl Module<gtk::Box> for NetworkManagerModule {
+impl Module<Box> for NetworkManagerModule {
     type SendMessage = ClientState;
     type ReceiveMessage = ();
 
@@ -53,28 +53,28 @@ impl Module<gtk::Box> for NetworkManagerModule {
         self,
         context: WidgetContext<ClientState, ()>,
         info: &ModuleInfo,
-    ) -> Result<ModuleParts<gtk::Box>> {
-        let container = gtk::Box::new(Orientation::Horizontal, 0);
+    ) -> Result<ModuleParts<Box>> {
+        let container = Box::new(Orientation::Horizontal, 0);
         let icon = Image::new();
         icon.add_class("icon");
         container.add(&icon);
 
         let icon_theme = info.icon_theme.clone();
 
-        let initial_icon_name = "icon:content-loading-symbolic";
+        let initial_icon_name = "content-loading-symbolic";
         ImageProvider::parse(initial_icon_name, &icon_theme, false, self.icon_size)
             .map(|provider| provider.load_into_image(icon.clone()));
 
         let widget_receiver = context.subscribe();
         glib_recv!(widget_receiver, state => {
             let icon_name = match state {
-                ClientState::Unknown => "dialog-question-symbolic",
                 ClientState::WiredConnected => "network-wired-symbolic",
                 ClientState::WifiConnected => "network-wireless-symbolic",
                 ClientState::CellularConnected => "network-cellular-symbolic",
                 ClientState::VpnConnected => "network-vpn-symbolic",
                 ClientState::WifiDisconnected => "network-wireless-acquiring-symbolic",
                 ClientState::Offline => "network-wireless-disabled-symbolic",
+                ClientState::Unknown => "dialog-question-symbolic",
             };
             ImageProvider::parse(icon_name, &icon_theme, false, self.icon_size)
                 .map(|provider| provider.load_into_image(icon.clone()));