diff --git a/404.php b/404.php
index 375f78a..64a45d7 100644
--- a/404.php
+++ b/404.php
@@ -8,11 +8,11 @@ if ( !defined( 'WPINC' ) ) {
 
 <div class="singular">
     <div class="singular-main">
-        <h1 class="404-title"><?php _e( 'You&apos;ve reached the edge of the world.', 'minimalistflex' ) ?></h1>
-        <p><?php _e( 'It looks like the page you are looking for doesn&apos;t exist.', 'minimalistflex' ) ?></p>
-        <p><?php _e( 'What about a search?', 'minimalistflex' ) ?></p>
+        <h1 class="404-title"><?php esc_html_e( 'You&apos;ve reached the edge of the world.', 'minimalistflex' ) ?></h1>
+        <p><?php esc_html_e( 'It looks like the page you are looking for doesn&apos;t exist.', 'minimalistflex' ) ?></p>
+        <p><?php esc_html_e( 'What about a search?', 'minimalistflex' ) ?></p>
         <?php get_search_form() ?>
-        <p><a href="javascript:history.go(-1)"><?php _e( 'Go back', 'minimalistflex' ) ?></a></p>
+        <p><a href="javascript:history.go(-1)"><?php esc_html_e( 'Go back', 'minimalistflex' ) ?></a></p>
     </div>
 </div>
 
diff --git a/comments.php b/comments.php
index 7d293e9..a7219c4 100644
--- a/comments.php
+++ b/comments.php
@@ -16,13 +16,13 @@ if ( post_password_required() ) {
 			<?php
 			printf(
 				/* translators: %1$s: Number of comments. %2$s: Post title. */
-				_nx(
+				esc_html( _nx(
 					'One comment on "%2$s"',
 					'%1$s comments on "%2$s"',
 					get_comments_number(),
 					'comments title',
 					'minimalistflex'
-				),
+				) ),
 				number_format_i18n( get_comments_number() ),
 				'<span>' . get_the_title() . '</span>'
 			);
@@ -41,14 +41,14 @@ if ( post_password_required() ) {
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
 			<nav class="nav-links navigation comment-navigation" role="navigation">
-				<h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'minimalistflex' ); ?></h1>
-				<div class="previous"><?php previous_comments_link( __( '&larr; Older Comments', 'minimalistflex' ) ); ?></div>
-				<div class="next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'minimalistflex' ) ); ?></div>
+				<h1 class="screen-reader-text section-heading"><?php esc_html_e( 'Comment navigation', 'minimalistflex' ); ?></h1>
+				<div class="previous"><?php previous_comments_link( esc_html__( '&larr; Older Comments', 'minimalistflex' ) ); ?></div>
+				<div class="next"><?php next_comments_link( esc_html__( 'Newer Comments &rarr;', 'minimalistflex' ) ); ?></div>
 			</nav>
 		<?php endif; ?>
 
 		<?php if ( ! comments_open() && get_comments_number() ) : ?>
-			<p class="no-comments"><?php _e( 'Comments are closed.', 'minimalistflex' ); ?></p>
+			<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'minimalistflex' ); ?></p>
 		<?php endif; ?>
 
 	<?php endif; ?>
diff --git a/footer.php b/footer.php
index 9a30c5a..e82e171 100644
--- a/footer.php
+++ b/footer.php
@@ -36,7 +36,7 @@ if( is_home() ) {
 
 <ul class="minimalistflex-controls">
     <?php if ( get_theme_mod( 'minimalistflex_interface_scroll_top', 'yes' ) === 'yes' ): ?>
-        <li><a href="#" aria-label="<?php esc_attr_e( 'Back to top', 'minimalistflex' ) ?>">:D</a></li>
+        <li><a href="#" aria-label="<?php esc_attr_e( 'Back to top', 'minimalistflex' ) ?>"><i class="dashicons dashicons-arrow-up-alt"></i></a></li>
     <?php endif; ?>
 </ul>
 
@@ -75,7 +75,7 @@ if( is_home() ) {
                 <?php
                     printf(
                         /* translators: %s: Link to theme author website. */
-                        __( 'Theme <a href="%s">MinimalistFlex</a>.', 'minimalistflex' ),
+                        esc_html__( 'Theme <a href="%s">MinimalistFlex</a>.', 'minimalistflex' ),
                         esc_url( 'https://onmyodev.com/' )
                     )
                 ?>
diff --git a/functions.php b/functions.php
index f4ea89b..274ba3c 100644
--- a/functions.php
+++ b/functions.php
@@ -53,6 +53,7 @@ add_action( 'after_setup_theme', 'minimalistflex_add_supports' );
 function minimalistflex_enqueue_files() {
     wp_enqueue_script( 'comment-reply' );
     wp_enqueue_style( 'style', get_stylesheet_uri() );
+	wp_enqueue_style( 'dashicons' );
     wp_enqueue_script( 'minimalistflex-script', get_template_directory_uri() . '/js/menu.js', array('jquery'), null, true);
 	if ( get_theme_mod( 'minimalistflex_interface_autoh2label', 'no' ) == 'yes' ) {
 		wp_enqueue_style( 'minimalistflex-autoh2label-style', get_template_directory_uri() . '/css/autoh2label.css' );
diff --git a/search.php b/search.php
index 9200814..962f1d3 100644
--- a/search.php
+++ b/search.php
@@ -13,7 +13,7 @@ if ( !defined( 'WPINC' ) ) {
                 <?php
                     printf(
                         /* translators: %s: The search query. */
-                        __( 'You have searched for: "%s"', 'minimalistflex' ),
+                        esc_html__( 'You have searched for: "%s"', 'minimalistflex' ),
                         get_search_query()
                     )
                 ?>
@@ -37,7 +37,7 @@ if ( !defined( 'WPINC' ) ) {
                 <?php
                     printf(
                         /* translators: %s: The search query. */
-                        __( 'You have searched for: "%s"', 'minimalistflex' ),
+                        esc_html__( 'You have searched for: "%s"', 'minimalistflex' ),
                         get_search_query()
                     )
                 ?>
diff --git a/sidebar.php b/sidebar.php
index 331ef9d..f2a6591 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -23,7 +23,7 @@ if ( !defined( 'WPINC' ) ) {
         </li>
         
         <li id="archives" class="panel widget">
-            <h3 class="widget-title"><?php _e( 'Archives', 'minimalistflex' ); ?></h3>
+            <h3 class="widget-title"><?php esc_html_e( 'Archives', 'minimalistflex' ); ?></h3>
             <ul>
                 <?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
             </ul>
diff --git a/singular.php b/singular.php
index 90931c0..7d02977 100644
--- a/singular.php
+++ b/singular.php
@@ -55,7 +55,7 @@ $default_image_location = get_theme_mod( 'minimalistflex_default_featured_images
         <?php if ( comments_open() || get_comments_number() ) :
 	        comments_template();
         else: ?>
-            <p class="no-comments"><?php _e( 'Comments are closed.', 'minimalistflex' ); ?></p>
+            <p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'minimalistflex' ); ?></p>
         <?php endif; ?>
     </div>
 <?php else: ?>
diff --git a/templates/author.php b/templates/author.php
index 870d488..3e8792a 100644
--- a/templates/author.php
+++ b/templates/author.php
@@ -11,7 +11,7 @@ if ( !defined( 'WPINC' ) ) {
             <?php echo get_avatar( $userid, 80 ); ?>
         </div>
         <div class="author-description">
-            <a class="author-link" href="<?php echo get_author_posts_url( $userid ) ?>"><?php the_author() ?></a>
+            <a class="author-link" href="<?php echo esc_url( get_author_posts_url( $userid ) ) ?>"><?php the_author() ?></a>
             <p class="author-tagline"><?php the_author_meta( 'description' ) ?></p>
         </div>
     </div>
diff --git a/templates/loop.php b/templates/loop.php
index 57090c6..d76f997 100644
--- a/templates/loop.php
+++ b/templates/loop.php
@@ -69,7 +69,7 @@ $default_image_location = get_theme_mod( 'minimalistflex_default_featured_images
             <div class="panel-main">
                 <?php the_excerpt(); ?>
                 <?php wp_link_pages( Array(
-                    'before' => '<p class="panel post-nav-links"><span class="post-nav-links-indicator">' . __('Pages: ', 'minimalistflex') . '</span>'
+                    'before' => '<p class="panel post-nav-links"><span class="post-nav-links-indicator">' . esc_html__('Pages: ', 'minimalistflex') . '</span></p>'
                 ) ); ?>
             </div>
             <div class="panel-meta">
@@ -85,13 +85,13 @@ $default_image_location = get_theme_mod( 'minimalistflex_default_featured_images
                         <?php if ( $datemode === 'publish' || get_the_modified_date() <> get_the_date() ): ?>
                             <?php printf(
                                 /* translators: %s: Post publish time. */
-                                __( 'Published on %s', 'minimalistflex' ),
+                                esc_html__( 'Published on %s', 'minimalistflex' ),
                                 get_the_date()
                             ) ?>
                         <?php else: ?>
                             <?php printf(
                                 /* translators: %s: Post last modified time. */
-                                __( 'Last modified on %s', 'minimalistflex' ),
+                                esc_html__( 'Last modified on %s', 'minimalistflex' ),
                                 get_the_modified_date()
                             ) ?>
                         <?php endif; ?>
@@ -100,7 +100,7 @@ $default_image_location = get_theme_mod( 'minimalistflex_default_featured_images
                 <a class="panel panel-link" href="<?php the_permalink(); ?>" aria-label="<?php
                         printf(
                             /* translators: %s: Post title. */
-                            __( 'Read more of %s', 'minimalistflex' ),
+                            esc_attr__( 'Read more of %s', 'minimalistflex' ),
                             get_the_title()
                         )
                     ?>">
diff --git a/templates/publisher.php b/templates/publisher.php
index de28ef4..e5d8fdf 100644
--- a/templates/publisher.php
+++ b/templates/publisher.php
@@ -16,13 +16,13 @@ if ( !defined( 'WPINC' ) ) {
         <?php if ( $datemode == 'publish' || get_the_modified_date() <> get_the_date() ): ?>
             <?php printf(
                 /* translators: %s: Post publish time. */
-                __( 'Published on %s', 'minimalistflex' ),
+                esc_html__( 'Published on %s', 'minimalistflex' ),
                 get_the_date()
             ) ?>
         <?php else: ?>
             <?php printf(
                 /* translators: %s: Post last modified time. */
-                __( 'Last modified on %s', 'minimalistflex' ),
+                esc_html__( 'Last modified on %s', 'minimalistflex' ),
                 get_the_modified_date()
             ) ?>
         <?php endif; ?>