From 2fb5125075e512e37f2e5c22039bdd25b2062cd2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 25 Nov 2015 21:00:49 -0500
Subject: [PATCH] CRM-16415 - Stray button icons

---
 CRM/Admin/Form/Setting/Smtp.php | 2 +-
 CRM/Custom/Form/Option.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Admin/Form/Setting/Smtp.php b/CRM/Admin/Form/Setting/Smtp.php
index 25c80062e1..1eb9661009 100644
--- a/CRM/Admin/Form/Setting/Smtp.php
+++ b/CRM/Admin/Form/Setting/Smtp.php
@@ -65,7 +65,7 @@ class CRM_Admin_Form_Setting_Smtp extends CRM_Admin_Form_Setting {
     $this->addFormRule(array('CRM_Admin_Form_Setting_Smtp', 'formRule'));
     parent::buildQuickForm();
     $buttons = $this->getElement('buttons')->getElements();
-    $buttons[] = $this->createElement('submit', $this->_testButtonName, ts('Save & Send Test Email'), array('crm-icon' => 'mail-closed'));
+    $buttons[] = $this->createElement('submit', $this->_testButtonName, ts('Save & Send Test Email'), array('crm-icon' => 'fa-envelope-o'));
     $this->getElement('buttons')->setElements($buttons);
   }
 
diff --git a/CRM/Custom/Form/Option.php b/CRM/Custom/Form/Option.php
index 09707e756a..c12912e5e5 100644
--- a/CRM/Custom/Form/Option.php
+++ b/CRM/Custom/Form/Option.php
@@ -223,7 +223,7 @@ class CRM_Custom_Form_Option extends CRM_Core_Form {
         $this->addElement('button',
           'done',
           ts('Done'),
-          array('onclick' => "location.href='$url'", 'class' => 'crm-form-submit cancel', 'crm-icon' => 'close')
+          array('onclick' => "location.href='$url'", 'class' => 'crm-form-submit cancel', 'crm-icon' => 'fa-times')
         );
       }
     }
-- 
2.25.1