diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 3fcd0ad12..39b12d517 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -12,6 +12,7 @@
 -**Divider** - Fixed issue where descenders like "g" would be cut off in `horizontal divider` #3585
 -**Popup** - Fixed issue where checking `instanceof SVGGraphicsElement` caused error in IE11 #3043
 -**Form Validation / Dropdown** - Fixed issue where using "enter" key in a `search dropdown` could cause a form to be submitted #3676
+-**Button** - Fixes issue where `right icon` like `right arrow icon` would have additional margin inside an `icon button` #3525
 
 **Enhancements**
 - **Build Tools** - Added new `autoInstall` option to allow for Semantic to be installed without user interaction. See [docs explanation](http://www.semantic-ui.com/introduction/advanced-usage.html#Auto-Install) for how to use. #3616 **Thanks @algorithme**
diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less
index 553582383..f8c522c17 100755
--- a/src/definitions/elements/button.less
+++ b/src/definitions/elements/button.less
@@ -591,7 +591,11 @@
   vertical-align: @iconVerticalAlign;
   color: @iconColor;
 }
-.ui.button > .right.icon:not(.button) {
+
+.ui.button:not(.icon) > .icon:not(.button) {
+  margin: @iconMargin;
+}
+.ui.button:not(.icon) > .right.icon:not(.button) {
   margin: @rightIconMargin;
 }