diff --git a/src/packet.rs b/src/packet.rs
index 0711fd419602a877eeffba833a33e329da4646d7..66f05704ed3ddad9d82bdcb95ab83f3d720d83bf 100644
--- a/src/packet.rs
+++ b/src/packet.rs
@@ -416,7 +416,7 @@ mod tests {
     fn route_clear() {
         let mut buf = [0; 1024];
         let mut p: Packet<1024> = Packet::new(&mut buf);
-        p.add_identification(Identification::new(123, "call", 43).unwrap())
+        p.add_identification(Identification::new("call", 43, 123).unwrap())
             .unwrap();
         let mut r = Route::new(8);
         r.push_internet().unwrap();
@@ -426,7 +426,7 @@ mod tests {
         p.clear_route();
 
         assert_eq!(
-            Identification::new(123, "call", 43).unwrap(),
+            Identification::new("call", 43, 123).unwrap(),
             p.identification().unwrap()
         );
         assert_eq!(None, p.route());
diff --git a/src/whisker/identification.rs b/src/whisker/identification.rs
index 66641cd645c94b4e3fa8e2fd461da941f12f9dc0..2ba9c2050d6e1239f3942c98939bd3c5d667b38c 100644
--- a/src/whisker/identification.rs
+++ b/src/whisker/identification.rs
@@ -2,13 +2,13 @@ use arrayvec::ArrayString;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct Identification {
-    pub icon: u16,
     pub callsign: ArrayString<252>,
     pub ssid: u8,
+    pub icon: u16,
 }
 
 impl Identification {
-    pub fn new(icon: u16, call: &str, ssid: u8) -> Option<Self> {
+    pub fn new(call: &str, ssid: u8, icon: u16) -> Option<Self> {
         let callsign = ArrayString::from(call).ok()?;
 
         Some(Self {
diff --git a/src/whisker/mod.rs b/src/whisker/mod.rs
index 661661b33062d59746fc438872d5232bcb2e0b73..d08f9c380e98afba638a6c91e69cf70a3451fe46 100644
--- a/src/whisker/mod.rs
+++ b/src/whisker/mod.rs
@@ -204,7 +204,7 @@ mod tests {
         let call = "VE9ABCDEFGZZ4839-???";
         let ssid = 17;
 
-        let ident = Identification::new(icon, call, ssid).unwrap();
+        let ident = Identification::new(call, ssid, icon).unwrap();
         let mut buf = [0; 256];
 
         let encoded = ident.encode(&mut buf).unwrap();