diff --git a/libr/anal/var.c b/libr/anal/var.c
index 5510eee0f9aa8..410a656307d79 100644
--- a/libr/anal/var.c
+++ b/libr/anal/var.c
@@ -1361,12 +1361,14 @@ R_API void r_anal_extract_rarg(RAnal *anal, RAnalOp *op, RAnalFunction *fcn, int
 				}
 				continue;
 			}
-			if (is_reg_in_src (regname, anal, op) || STR_EQUAL (regname, opdreg)) {
+			if (is_reg_in_src (regname, anal, op)) {
 				reg_set[i] = 1;
 			}
 			if (var) {
 				r_anal_var_set_access (anal, var, var->regname, op->addr, R_PERM_R, 0);
-				r_meta_set_string (anal, R_META_TYPE_VARTYPE, op->addr, var->name);
+				if (is_reg_in_src (regname, anal, op)) {
+					r_meta_set_string (anal, R_META_TYPE_VARTYPE, op->addr, var->name);
+				}
 			}
 		}
 	}
@@ -1386,7 +1388,9 @@ R_API void r_anal_extract_rarg(RAnal *anal, RAnalOp *op, RAnalFunction *fcn, int
 			if (newvar) {
 				r_anal_var_set_access (anal, newvar, newvar->regname, op->addr, R_PERM_R, 0);
 			}
-			r_meta_set_string (anal, R_META_TYPE_VARTYPE, op->addr, vname);
+			if (is_reg_in_src (selfreg, anal, op)) {
+				r_meta_set_string (anal, R_META_TYPE_VARTYPE, op->addr, vname);
+			}
 			free (vname);
 			(*count)++;
 		} else {
diff --git a/test/db/anal/arm b/test/db/anal/arm
index 6d2a1b2be12d9..1121bdb0099ac 100644
--- a/test/db/anal/arm
+++ b/test/db/anal/arm
@@ -683,7 +683,7 @@ EXPECT=<<EOF
 |           0x00010420      00482de9       push {fp, lr}
 |           0x00010424      04b08de2       add fp, sp, 4
 |           0x00010428      08d04de2       sub sp, sp, 8
-|           0x0001042c      08000be5       str r0, [var_8h]            ; 8 ; arg1
+|           0x0001042c      08000be5       str r0, [var_8h]            ; 8
 |           0x00010430      14009fe5       ldr r0, [0x0001044c]        ; [0x1044c:4]=0x104f0 "%d"
 |           0x00010434      08101be5       ldr r1, [var_8h]            ; 8
 |           0x00010438      a2ffffeb       bl sym.imp.printf
@@ -697,7 +697,7 @@ EXPECT=<<EOF
 |           0x00010420      00482de9       push {fp, lr}
 |           0x00010424      04b08de2       add fp, sp, 4
 |           0x00010428      08d04de2       sub sp, sp, 8
-|           0x0001042c      08000be5       str r0, [var_8h]            ; 8 ; arg1
+|           0x0001042c      08000be5       str r0, [var_8h]            ; 8
 |           0x00010430      14009fe5       ldr r0, [0x0001044c]        ; [0x1044c:4]=0x104f0 "%d"
 |           0x00010434      08101be5       ldr r1, [var_8h]            ; 8
 |           0x00010438      a2ffffeb       bl sym.imp.printf
@@ -1211,7 +1211,7 @@ EXPECT=<<EOF
 |           0x000083c0      04109de4       pop {r1}
 |           0x000083c4      0d20a0e1       mov r2, sp
 |           0x000083c8      04202de5       str r2, [sp, -4]!
-|           0x000083cc      04002de5       str r0, [sp, -4]!           ; arg1
+|           0x000083cc      04002de5       str r0, [sp, -4]!
 |           0x000083d0      10c09fe5       ldr ip, fcn.00008664        ; [0x83e8:4]=0x8664 fcn.00008664
 |           0x000083d4      04c02de5       str ip, [sp, -4]!
 |           0x000083d8      0c009fe5       ldr r0, main                ; [0x83ec:4]=0x8470 main
diff --git a/test/db/anal/jmptbl b/test/db/anal/jmptbl
index 5729878f50a18..e864bcd945c80 100644
--- a/test/db/anal/jmptbl
+++ b/test/db/anal/jmptbl
@@ -153,7 +153,7 @@ EXPECT=<<EOF
 0x100004148      ldr x8, [x8, 0x390]
 0x10000414c      ldr x8, [x8]
 0x100004150      stur x8, [x29, -0x60]
-0x100004154      str x1, [var_80h]                                     ; arg2
+0x100004154      str x1, [var_80h]
 0x100004158      lsr x25, x1, 0x3e                                     ; arg2
 0x10000415c      adrp x24, reloc.Foundation.__DataStorage.bytes.allocator_...itcfc_ ; 0x10000c000
 0x100004160      ldr x24, [x24, 0x398]
@@ -195,7 +195,7 @@ EXPECT=<<EOF
 0x1000041b8      stur x24, [x29, -0x68]
 0x1000041bc      cmp x26, 0
 0x1000041c0      csel x1, x26, xzr, gt
-0x1000041c4      str x0, [arg_140hx88]                                 ; arg1
+0x1000041c4      str x0, [arg_140hx88]
 0x1000041c8      sub x20, x29, 0x68
 0x1000041cc      mov w0, 0
 0x1000041d0      mov w2, 0
diff --git a/test/db/cmd/arg_annotations b/test/db/cmd/arg_annotations
new file mode 100644
index 0000000000000..3227ea704e330
--- /dev/null
+++ b/test/db/cmd/arg_annotations
@@ -0,0 +1,33 @@
+NAME=Register argument annotations show on sources not destinations (AT&T)
+FILE=-
+CMDS=<<EOF
+e asm.arch=x86
+e asm.bits=64
+e asm.syntax=att
+wx 4889fa89f1
+aaa
+e asm.comments=true
+pd 2~mov
+EOF
+EXPECT=<<EOF
+|           0x00000000      4889fa         movq %rdi, %rdx             ; arg3
+|           0x00000003      89f1           movl %esi, %ecx             ; arg4
+EOF
+RUN
+
+NAME=Register argument annotations show on sources not destinations (Intel)
+FILE=-
+CMDS=<<EOF
+e asm.arch=x86
+e asm.bits=64
+e asm.syntax=intel
+wx 4889fa89f1
+aaa
+e asm.comments=true
+pd 2~mov
+EOF
+EXPECT=<<EOF
+|           0x00000000      4889fa         mov rdx, rdi                ; arg1
+|           0x00000003      89f1           mov ecx, esi                ; arg2
+EOF
+RUN
diff --git a/test/db/cmd/cmd_graph b/test/db/cmd/cmd_graph
index 1252be216e4aa..0c5ce74462b64 100644
--- a/test/db/cmd/cmd_graph
+++ b/test/db/cmd/cmd_graph
@@ -421,10 +421,10 @@ digraph code {
 	graph [fontsize=8 fontname="Courier" bgcolor=azure splines="ortho"];
 	node [fillcolor=white style=filled shape=box];
 	edge [arrowhead="normal"];
-	"0x0000044b" [URL="fcn.0000044b/0x0000044b", fontcolor="#767676", fontname="Courier", label="54: fcn.0000044b (int64_t arg1, int64_t arg2, int64_t arg_4h, int64_t arg_8h, int64_t arg_34h, int64_t arg_38h);\l; arg int64_t arg1 @ rdi\l; arg int64_t arg2 @ rsi\l; arg int64_t arg_4h @ rsp+0x4\l; arg int64_t arg_8h @ rsp+0x8\l; arg int64_t arg_34h @ rsp+0x34\l; arg int64_t arg_38h @ rsp+0x38\l0x0000044b      sar esi, 2                                             ; arg2\l0x0000044e      test esi, esi                                          ; arg2\l0x00000450      je 0x479\l"]
+	"0x0000044b" [URL="fcn.0000044b/0x0000044b", fontcolor="#767676", fontname="Courier", label="54: fcn.0000044b (int64_t arg1, int64_t arg2, int64_t arg_4h, int64_t arg_8h, int64_t arg_34h, int64_t arg_38h);\l; arg int64_t arg1 @ rdi\l; arg int64_t arg2 @ rsi\l; arg int64_t arg_4h @ rsp+0x4\l; arg int64_t arg_8h @ rsp+0x8\l; arg int64_t arg_34h @ rsp+0x34\l; arg int64_t arg_38h @ rsp+0x38\l0x0000044b      sar esi, 2\l0x0000044e      test esi, esi                                          ; arg2\l0x00000450      je 0x479\l"]
 	"0x00000479" [URL="fcn.0000044b/0x00000479", fontcolor="#767676", fontname="Courier", label="0x00000479      add esp, 0x1c\l0x0000047c      pop rbx\l0x0000047d      pop rsi\l0x0000047e      pop rdi\l0x0000047f      pop rbp\l0x00000480      ret\l"]
 	"0x00000452" [URL="fcn.0000044b/0x00000452", fontcolor="#767676", fontname="Courier", label="0x00000452      lea esi, [rsi]                                         ; arg2\l"]
-	"0x00000458" [URL="fcn.0000044b/0x00000458", fontcolor="#767676", fontname="Courier", label="0x00000458      mov eax, dword [arg_38h]\l0x0000045c      mov dword [rsp], ebp\l0x0000045f      mov dword [arg_8h], eax\l0x00000463      mov eax, dword [arg_34h]\l0x00000467      mov dword [arg_4h], eax\l0x0000046b      call qword [rbx + rdi*4 - 0xf8]\l0x00000472      add edi, 1                                             ; arg1\l0x00000475      cmp edi, esi                                           ; arg2\l0x00000477      jne 0x458\l"]
+	"0x00000458" [URL="fcn.0000044b/0x00000458", fontcolor="#767676", fontname="Courier", label="0x00000458      mov eax, dword [arg_38h]\l0x0000045c      mov dword [rsp], ebp\l0x0000045f      mov dword [arg_8h], eax\l0x00000463      mov eax, dword [arg_34h]\l0x00000467      mov dword [arg_4h], eax\l0x0000046b      call qword [rbx + rdi*4 - 0xf8]\l0x00000472      add edi, 1\l0x00000475      cmp edi, esi                                           ; arg2\l0x00000477      jne 0x458\l"]
         "0x0000044b" -> "0x00000479" [color="#13a10e"];
         "0x0000044b" -> "0x00000452" [color="#c50f1f"];
         "0x00000452" -> "0x00000458" [color="cyan"];
diff --git a/test/db/cmd/dwarf b/test/db/cmd/dwarf
index 99d08d868fec8..c9c682cd2e03f 100644
--- a/test/db/cmd/dwarf
+++ b/test/db/cmd/dwarf
@@ -495,8 +495,8 @@ EXPECT=<<EOF
 |       :   0x100012e4      7c283840       cmpld r8, r7
 |       `=< 0x100012e8      4082ffe0       bne 0x100012c8
 |           0x100012ec      39200000       li r9, 0
-|           0x100012f0      91230144       stw r9, 0x144(r3)           ; arg1
-|           0x100012f4      91230148       stw r9, 0x148(r3)           ; arg1
+|           0x100012f0      91230144       stw r9, 0x144(r3)
+|           0x100012f4      91230148       stw r9, 0x148(r3)
 \           0x100012f8      4e800020       blr
 EOF
 RUN
diff --git a/test/db/formats/elf/random b/test/db/formats/elf/random
index a42ec7c4e51b4..ed2ec9f2d7a62 100644
--- a/test/db/formats/elf/random
+++ b/test/db/formats/elf/random
@@ -36,18 +36,18 @@ EXPECT=<<EOF
 |           0x08000814      e91300f9       str x9, [var_20h]
 |           0x08000818      e90308aa       mov x9, x8
 |           0x0800081c      e81340f9       ldr x8, [var_20h]
-|           0x08000820      e21700f9       str x2, [var_28h]           ; arg3
-|           0x08000824      002100f9       str x0, [x8, 0x40]          ; arg1
-|           0x08000828      011d00f9       str x1, [x8, 0x38]          ; arg2
-|           0x0800082c      031900f9       str x3, [x8, 0x30]          ; arg4
-|           0x08000830      041500f9       str x4, [x8, 0x28]          ; arg5
+|           0x08000820      e21700f9       str x2, [var_28h]
+|           0x08000824      002100f9       str x0, [x8, 0x40]
+|           0x08000828      011d00f9       str x1, [x8, 0x38]
+|           0x0800082c      031900f9       str x3, [x8, 0x30]
+|           0x08000830      041500f9       str x4, [x8, 0x28]
 |           0x08000834      08000090       adrp x8, segment.ehdr       ; 0x8000000; RELOC 32 .rodata @ 0x080057f8 + 0x18
 |           0x08000838      08010091       add x8, x8, 0               ; RELOC 32 .rodata @ 0x080057f8 + 0x18 ; segment.ehdr
 |           0x0800083c      0001c03d       ldr q0, [x8]                ; segment.ehdr
 |           0x08000840      2001803d       str q0, [x9]
 |           0x08000844      080940f9       ldr x8, [x8, 0x10]
 |           0x08000848      280900f9       str x8, [x9, 0x10]
-|           0x0800084c      5f0000b9       str wzr, [x2]               ; arg3
+|           0x0800084c      5f0000b9       str wzr, [x2]
 EOF
 EXPECT_ERR=<<EOF
 WARN: Poorly supported AARCH64 instruction reloc type 275 at 0x08000074
@@ -117,18 +117,18 @@ EXPECT=<<EOF
 |           0x00000fa8      e91300f9       str x9, [var_20h]
 |           0x00000fac      e90308aa       mov x9, x8
 |           0x00000fb0      e81340f9       ldr x8, [var_20h]
-|           0x00000fb4      e21700f9       str x2, [var_28h]           ; arg3
-|           0x00000fb8      002100f9       str x0, [x8, 0x40]          ; arg1
-|           0x00000fbc      011d00f9       str x1, [x8, 0x38]          ; arg2
-|           0x00000fc0      031900f9       str x3, [x8, 0x30]          ; arg4
-|           0x00000fc4      041500f9       str x4, [x8, 0x28]          ; arg5
+|           0x00000fb4      e21700f9       str x2, [var_28h]
+|           0x00000fb8      002100f9       str x0, [x8, 0x40]
+|           0x00000fbc      011d00f9       str x1, [x8, 0x38]
+|           0x00000fc0      031900f9       str x3, [x8, 0x30]
+|           0x00000fc4      041500f9       str x4, [x8, 0x28]
 |           0x00000fc8      280000b0       adrp x8, 0x5000
 |           0x00000fcc      08e13e91       add x8, x8, 0xfb8           ; str.O_n_
 |           0x00000fd0      0001c03d       ldr q0, [x8]                ; str.O_n_
 |           0x00000fd4      2001803d       str q0, [x9]
 |           0x00000fd8      080940f9       ldr x8, [x8, 0x10]
 |           0x00000fdc      280900f9       str x8, [x9, 0x10]
-|           0x00000fe0      5f0000b9       str wzr, [x2]               ; arg3
+|           0x00000fe0      5f0000b9       str wzr, [x2]
 0x00005fb8  0x5a8a51be3e7c0a4f                       O.|>.Q.Z
 EOF
 EXPECT_ERR=<<EOF