diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index e99026a429a..b508d585413 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -228,7 +228,10 @@ public void Populate(SharedPaperComponent.PaperBoundUserInterfaceState state)
             StampDisplay.RemoveStamps();
             foreach(var stamper in state.StampedBy)
             {
-                StampDisplay.AddStamp(new StampWidget(stamper.StampedBorderless) { StampInfo = stamper });
+                if (stamper.StampedBorderless)
+                    StampDisplay.AddStamp(new StampWidget(true) { StampInfo = stamper });
+                else
+                    StampDisplay.AddStamp(new StampWidget { StampInfo = stamper });
             }
         }
 
diff --git a/Content.Client/Paper/UI/StampWidget.xaml.cs b/Content.Client/Paper/UI/StampWidget.xaml.cs
index e943320df27..66e1e162f26 100644
--- a/Content.Client/Paper/UI/StampWidget.xaml.cs
+++ b/Content.Client/Paper/UI/StampWidget.xaml.cs
@@ -44,6 +44,7 @@ public StampWidget()
         var prototypes = IoCManager.Resolve<IPrototypeManager>();
         _stampShader = prototypes.Index<ShaderPrototype>("PaperStamp").InstanceUnique();
     }
+
     public StampWidget(bool borderless)
     {
         RobustXamlLoader.Load(this);
@@ -61,28 +62,6 @@ public StampWidget(bool borderless)
         _stampShader = prototypes.Index<ShaderPrototype>("PaperStamp").InstanceUnique();
     }
 
-    //public StampWidget(bool borderless)
-    //{
-    //    RobustXamlLoader.Load(this);
-    //    var resCache = IoCManager.Resolve<IResourceCache>();
-    //    var borderImage = resCache.GetResource<TextureResource>(
-    //            "/Textures/Interface/Paper/paper_stamp_border.svg.96dpi.png");
-
-    //    if (borderless)
-    //    {
-    //        borderImage = resCache.GetResource<TextureResource>(
-    //                "/Textures/Interface/Paper/paper_stamp_noborder.svg.96dpi.png");
-    //    }
-
-    //    _borderTexture = new StyleBoxTexture
-    //    {
-    //        Texture = borderImage,
-    //    };
-
-    //    var prototypes = IoCManager.Resolve<IPrototypeManager>();
-    //    _stampShader = prototypes.Index<ShaderPrototype>("PaperStamp").InstanceUnique();
-    //}
-
     protected override void Draw(DrawingHandleScreen handle)
     {
         _stampShader?.SetParameter("objCoord", GlobalPosition * UIScale * new Vector2(1, -1));
diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs
index 15a738d468c..eb0ff3edb2b 100644
--- a/Content.Server/Paper/PaperSystem.cs
+++ b/Content.Server/Paper/PaperSystem.cs
@@ -133,6 +133,9 @@ private void OnInteractUsing(EntityUid uid, PaperComponent paperComp, InteractUs
             // If a stamp, attempt to stamp paper
             if (TryComp<StampComponent>(args.Used, out var stampComp) && TryStamp(uid, GetStampInfo(stampComp), stampComp.StampState, paperComp))
             {
+                var actionOther = "stamps";
+                var actionSelf = "stamp";
+
                 if (stampComp.StampedPersonal)
                 {
                     stampComp.StampedIdUser = args.User;
@@ -149,15 +152,18 @@ private void OnInteractUsing(EntityUid uid, PaperComponent paperComp, InteractUs
                     //string stampedName = userJob + " - " + userName;
                     string stampedName = userName;
                     stampComp.StampedName = stampedName;
+
+                    actionOther = "signs";
+                    actionSelf = "sign";
                 }
 
                 // successfully stamped, play popup
                 var stampPaperOtherMessage = Loc.GetString("paper-component-action-stamp-paper-other",
-                        ("user", args.User), ("target", args.Target), ("stamp", args.Used));
+                        ("action", actionOther), ("user", args.User), ("target", args.Target), ("stamp", args.Used));
 
                 _popupSystem.PopupEntity(stampPaperOtherMessage, args.User, Filter.PvsExcept(args.User, entityManager: EntityManager), true);
                 var stampPaperSelfMessage = Loc.GetString("paper-component-action-stamp-paper-self",
-                        ("target", args.Target), ("stamp", args.Used));
+                        ("action", actionSelf), ("target", args.Target), ("stamp", args.Used));
                 _popupSystem.PopupEntity(stampPaperSelfMessage, args.User, args.User);
 
                 _audio.PlayPvs(stampComp.Sound, uid);
diff --git a/Resources/Locale/en-US/paper/paper-component.ftl b/Resources/Locale/en-US/paper/paper-component.ftl
index d10201b4cf9..689dea665f3 100644
--- a/Resources/Locale/en-US/paper/paper-component.ftl
+++ b/Resources/Locale/en-US/paper/paper-component.ftl
@@ -8,5 +8,5 @@ paper-component-examine-detail-has-words = {CAPITALIZE(THE($paper))} has somethi
 # Shown when paper with stamps examined
 paper-component-examine-detail-stamped-by = {CAPITALIZE(THE($paper))} {CONJUGATE-HAVE($paper)} been stamped by: {$stamps}.
 
-paper-component-action-stamp-paper-other = {CAPITALIZE(THE($user))} stamps {THE($target)} with {THE($stamp)}.
-paper-component-action-stamp-paper-self = You stamp {THE($target)} with {THE($stamp)}.
+paper-component-action-stamp-paper-other = {CAPITALIZE(THE($user))} {$action} {THE($target)} with {THE($stamp)}.
+paper-component-action-stamp-paper-self = You {$action} {THE($target)} with {THE($stamp)}.