diff --git a/CHANGELOG.md b/CHANGELOG.md
index b504736ee..1c9dbf14c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ zixaphir
 - Fix Board Subtitle option
 - Revert to Mayhem-style notifications
 - Add options for adding QR Shortcuts to the header or page
+- Try to tighten up mascot positions in relation to the post form
 
 ### 2.0.1 - 2013-05-08
 seaweed
diff --git a/builds/appchan-x.js b/builds/appchan-x.js
index f610f6c87..ea36d5cc1 100644
--- a/builds/appchan-x.js
+++ b/builds/appchan-x.js
@@ -10505,7 +10505,7 @@
           return null;
         }
       }
-      position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 19.6 + (g.VIEW !== 'thread' || !!$('#postForm input[name=spoiler]') ? 1.4 : 0) + (Conf['Show Post Form Header'] ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em";
+      position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 20.1 + (Conf['Show Post Form Header'] && ['fixed', 'transparent fade', 'slideout'].contains(Conf['Post Form Style']) ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em";
       if (Conf['editMode']) {
         if (!(mascot = editMascot || (mascot = Mascots[Conf["mascot"]]))) {
           return;
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 2452ddd41..17ec496b8 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -10526,7 +10526,7 @@
           return null;
         }
       }
-      position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 19.6 + (g.VIEW !== 'thread' || !!$('#postForm input[name=spoiler]') ? 1.4 : 0) + (Conf['Show Post Form Header'] ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em";
+      position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 20.1 + (Conf['Show Post Form Header'] && ['fixed', 'transparent fade', 'slideout'].contains(Conf['Post Form Style']) ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em";
       if (Conf['editMode']) {
         if (!(mascot = editMascot || (mascot = Mascots[Conf["mascot"]]))) {
           return;
diff --git a/builds/crx.crx b/builds/crx.crx
index a3a600440..77808890f 100644
Binary files a/builds/crx.crx and b/builds/crx.crx differ
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 732baaff8..c89415815 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -10509,7 +10509,7 @@
           return null;
         }
       }
-      position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 19.6 + (g.VIEW !== 'thread' || !!$('#postForm input[name=spoiler]') ? 1.4 : 0) + (Conf['Show Post Form Header'] ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em";
+      position = "" + (Conf['Mascot Position'] === 'bottom' || (Conf['Mascot Position'] === "default" && Conf['Post Form Style'] !== "fixed") ? 0 + Style.pfOffset : 20.1 + (Conf['Show Post Form Header'] && ['fixed', 'transparent fade', 'slideout'].contains(Conf['Post Form Style']) ? 1.5 : 0) + (Conf['Post Form Decorations'] ? 0.2 : 0) + Style.pfOffset) + "em";
       if (Conf['editMode']) {
         if (!(mascot = editMascot || (mascot = Mascots[Conf["mascot"]]))) {
           return;
diff --git a/src/General/css/layout.css b/src/General/css/layout.css
index 7580f1155..99a700a83 100644
--- a/src/General/css/layout.css
+++ b/src/General/css/layout.css
@@ -1276,7 +1276,7 @@ if _conf['Compact Post Form Inputs'] then "
   margin: 0 0 0 0.4%;
 }
 #qr textarea.field {
-  height: 14.8em;
+  height: 14.9em;
   min-height: 9em;
 }
 #qr.has-captcha textarea.field {
diff --git a/src/Theming/Mascots.coffee b/src/Theming/Mascots.coffee
index db17b8437..3aeabf051 100644
--- a/src/Theming/Mascots.coffee
+++ b/src/Theming/Mascots.coffee
@@ -7,10 +7,20 @@ MascotTools =
     if !Conf['Mascots'] or (g.CATALOG and Conf['Hide Mascots on Catalog'])
       return if el then el.src = "" else null
 
-    position = "#{if Conf['Mascot Position'] is 'bottom' or (Conf['Mascot Position'] is "default" and Conf['Post Form Style'] isnt "fixed")
-      0 + Style.pfOffset
-    else
-      19.6 + (if g.VIEW isnt 'thread' or !!$ '#postForm input[name=spoiler]' then 1.4 else 0) + (if Conf['Show Post Form Header'] then 1.5 else 0) + (if Conf['Post Form Decorations'] then 0.2 else 0) + Style.pfOffset
+    position = "#{
+      if Conf['Mascot Position'] is 'bottom' or (Conf['Mascot Position'] is "default" and Conf['Post Form Style'] isnt "fixed")
+        0 + Style.pfOffset
+      else
+        20.1 + (
+          if Conf['Show Post Form Header'] and ['fixed', 'transparent fade', 'slideout'].contains Conf['Post Form Style']
+            1.5
+          else 0
+        ) + (
+          if Conf['Post Form Decorations']
+            0.2
+          else
+            0
+        ) + Style.pfOffset
     }em"
 
     # If we're editting anything, let's not change mascots any time we change a value.