diff --git a/classes/struts/option/image.php b/classes/struts/option/image.php
index 45625d4..3f79d84 100644
--- a/classes/struts/option/image.php
+++ b/classes/struts/option/image.php
@@ -8,7 +8,7 @@ public function input_html() {
 		$value = esc_attr( $this->value() );
 
 		echo "<input type='text' id='$id' name='$name' value='$value' class='image-input' />";
-		echo "<input type='button' id='{$id}_button' value='Upload Image' data-type='image' data-field-id='$id' class='button struts-image-upload'>";
+		echo "<input type='button' id='{$id}_button' value='" . esc_attr( __( 'Upload Image', 'struts' ) ) . "' data-type='image' data-field-id='$id' class='button struts-image-upload'>";
 	}
 
 	protected function standard_validation( $value ) {
diff --git a/classes/struts/options.php b/classes/struts/options.php
index 02d9d7e..c9e4a96 100644
--- a/classes/struts/options.php
+++ b/classes/struts/options.php
@@ -315,10 +315,11 @@ public function echo_form_html() { ?>
 						<?php
 							settings_fields( $this->name() );
 							$this->do_options_html();
+							$confirm_text = 'Click OK if you want to reset your theme options to the defaults.';
 						?>
 						<div class="struts-buttons-container">
-							<input name="<?php echo $this->name(); ?>[struts_submit]" type="submit" class="button-primary struts-save-button" value="<?php esc_attr_e( 'Save Settings', 'struts' ); ?>" />
-							<input name="<?php echo $this->name(); ?>[struts_reset]" type="submit" class="button-secondary struts-reset-button" value="<?php esc_attr_e( 'Reset Defaults', 'struts' ); ?>" onclick="return confirm('Click OK if you want to reset your theme options to the defaults.')" />
+							<input name="<?php echo esc_attr( $this->name() ); ?>[struts_submit]" type="submit" class="button-primary struts-save-button" value="<?php esc_attr_e( 'Save Settings', 'struts' ); ?>" />
+							<input name="<?php echo esc_attr( $this->name() ); ?>[struts_reset]" type="submit" class="button-secondary struts-reset-button" value="<?php esc_attr_e( 'Reset Defaults', 'struts' ); ?>" onclick="return confirm('<?php esc_attr_e( $confirm_text, 'struts' ); ?>')" />
 						</div>
 					</form>
 				</div>
diff --git a/classes/struts/section.php b/classes/struts/section.php
index 1e50394..c8d8821 100644
--- a/classes/struts/section.php
+++ b/classes/struts/section.php
@@ -101,7 +101,7 @@ public function to_html() {
 		}
 
 		echo '<div class="struts-save-button submit">';
-		echo '<input type="submit" class="button-primary struts-save-button" value="' . __( 'Save changes', 'struts' ) . '" />';
+		echo '<input type="submit" class="button-primary struts-save-button" value="' . esc_attr( __( 'Save changes', 'struts' ) ) . '" />';
 
         do_action( 'struts_after_' . $this->id() . '_submit' );