Using Child Theme correctly to update to new version

Hello,

I’ve never used child theme before until today when I realize it’s better to use child theme to preserve customization of my existing site for the upgrade of 3.0 to 3.1.

I’d like to describe what I did and ask if you see any problems with my process and explain why the new child theme doesn’t look like the original, existing enfold theme that has been customized.

As far as I know, 5 files that have been modified under the enfold fold/subfolder

footer.php
header.php
/css/base.css
/css/layout.css
/includes/helper-main-menu.php

This is what I did as far as creating child theme

1. install a plug-in, One-Click Child Theme, then install a Child Theme with 3 files in it, function.php, style.css and a rtl.css. (please see below for screen shots)

2. I then import Parent Theme Setting under Import/Export

3. I then import Theme Setting from previous exported Theme Setting from the parent theme

4. I then copy (via ftp) the 5 files above with folder structure into the enfold child folder (see image below)

5. Now I check the website, there are two problems I notice. (see below)
a. the search icon appears on the main menu. Now I checked the parent theme, the search icon didn’t appear on the main menu, but the option is actually selected in the Append search icon to main menu. Now I have to un-check this in the child theme to get rid of it.
b. the big problem is, there are extra pages displayed on the main menu even though in the menu set up, these additional tabs were clearly not selected and they didn’t appear in the parent theme neither.
(see images attached)

So I’d like to clarify two things before I proceed to upgrade the enfold them because I have other sites built with the theme that I also need to upgrade therefore need to understand this correctly.

1. Did I create the child theme, specifically copy files correctly? Now I didn’t modify either style.css file or function.php or rtl.css file because I’m not 100% sure everything that has been modified in those 5 files above.

2. Related to question above, do I have to copy codes in css file or php files above that have been modified into the style.css file or function.php for child theme to work properly? I only know and back up the files that have been modified. So I don’t really know what codes exactly have been modified (have some ideas but, dare not to copy and paste into style.css file or function.php, or rtl.css files).

3. Why I have the two problems in 5. a) and 5. b)? I can manually un-check the option to resolve 5. a), but I have no idea what to do to resolve 5. b). I’d really like to know why it happened.

I will wait for your answers before doing further upgrade.

Thank you