diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index c36e8d1f38..c762d2e4bf 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -95,8 +95,11 @@ Editor::add_external_audio_action (ImportMode mode_hint)
 void
 Editor::external_audio_dialog ()
 {
-	WavesImportDialog import_dialog;
-	import_dialog.run ();
+	WavesImportDialog import_dialog (_session);
+	int result = import_dialog.run_import ();
+
+	std::cout << "***************** import_dialog.run () returned with " << result << std::endl;
+
 	vector<string> paths;
 	uint32_t audio_track_cnt;
 	uint32_t midi_track_cnt;
diff --git a/gtk2_ardour/ui/waves_import_dialog.xml b/gtk2_ardour/ui/waves_import_dialog.xml
index 648dc5edae..e9de52d402 100644
--- a/gtk2_ardour/ui/waves_import_dialog.xml
+++ b/gtk2_ardour/ui/waves_import_dialog.xml
@@ -24,68 +24,16 @@
          fgnormal="#C1C1C1"
          textcolornormal="#C1C1C1"
          bgnormal="#6C6C6C"
-         normalicon="dropdown_90x20"
-         activeicon="dropdown_90x20_active"
-         inactiveicon="dropdown_90x20_inactive"
-         width="90"
+         normalicon="dropdown_126x20"
+         activeicon="dropdown_126x20_active"
+         inactiveicon="dropdown_126x20_inactive"
+         width="126"
          height="20"
          horzalignment="start"/>
   <style name="generic_dropdown_menu"
          style="generic_dropdown"
          height="-1"
          width="-1"/>
-  <style name="topbar_dropdown"
-         bgnormal="#10474b"
-         fgdisabled="#335b63"
-         fgnormal="#ffffff"
-         fgactive="#ffffff"
-         fghover="#ffffff"
-         winfont ="Arial 10"
-         macfont ="Helvetica 10"
-         width="63"
-         height="18"/>
-  <style name="topbar_dropdown_menu"
-         bgnormal="#43919A"
-         fgnormal="#ffffff"
-         fgactive="#ffffff"
-         fghover="#ffffff"
-         winfont ="Arial Bold 9"
-         macfont ="Helvetica 10"/>
-  <HBox spacing="10" borderwidth="10">
-  <Dropdown id="display_format_dropdown"
-            style="topbar_dropdown"
-            x="200"
-            y="28"
-            normalicon="topbar_button"
-            activeicon="topbar_button_active"
-            inactiveicon="topbar_button">
-    <Label style="topbar_dropdown_menu" text="The Drop Down" state="disabled" 
-            baseinactive="#ff0000" usemarkup="true"/>
-    <DropdownMenu style="topbar_dropdown_menu">
-      <DropdownItem style="topbar_dropdown_menu"
-                         title="Skip Ruler"
-                         horzalignment="start"/>
-      <DropdownItem style="topbar_dropdown_menu"
-                         title="Skip Ruler Again"
-                         horzalignment="start"
-                    state="disabled"/>
-    </DropdownMenu>
-  </Dropdown>
-    <Dropdown id="display_format_dropdown"
-              style="topbar_dropdown"
-              x="200"
-              y="28"
-              normalicon="topbar_button"
-              activeicon="topbar_button_active"
-              inactiveicon="topbar_button">
-      <Label style="topbar_dropdown_menu" text="The Drop Down"/>
-      <DropdownMenu style="topbar_dropdown_menu">
-        <DropdownItem style="topbar_dropdown_menu"
-                           title="Skip Ruler"
-                           horzalignment="start"/>
-      </DropdownMenu>
-    </Dropdown>
-  </HBox>
   <EventBox bgnormal="#EDECE8">
     <VBox borderwidth="10"
           spacing="10">
@@ -128,6 +76,7 @@
                  text="Mapping"/>
           <Dropdown id="mapping_dropdown"
                     style="generic_dropdown">
+            <!--Former channel_combo-->
             <HBox>
               <VBox width="5"/>
               <Label style="generic_dropdown_menu"/>
@@ -157,11 +106,13 @@
             </DropdownMenu>
           </Dropdown>
         </HBox>
-        <HBox spacing="5">
+        <HBox id="copy_to_session_home"
+              spacing="5">
           <Label style="generic_label"
                  text="Copy files to session"/>
           <HBox style="generic_dropdown">
           <Iconbutton id="copy_to_session_button"
+                      state="active"
                       width="20"
                       height="20"
                       normalicon="waves_darker_check_box"
diff --git a/gtk2_ardour/waves_import_dialog.h b/gtk2_ardour/waves_import_dialog.h
index 3187ac64e3..81172ce39a 100644
--- a/gtk2_ardour/waves_import_dialog.h
+++ b/gtk2_ardour/waves_import_dialog.h
@@ -38,7 +38,12 @@
 class WavesImportDialog : public WavesDialog
 {
 public:
-	WavesImportDialog ();
+	WavesImportDialog (ARDOUR::Session*);
+	int run_import ();
+
+protected:
+	bool check_link_status ();
+	bool check_info (bool&, bool&, bool&);
 
 private:
 	enum Impord {
@@ -71,11 +76,13 @@ private:
 	
     int _status;
     bool _done;
+	std::vector<std::string> _files_to_import;
 
 	WavesDropdown& _add_as_dropdown;
 	WavesDropdown& _insert_at_dropdown; 
 	WavesDropdown& _mapping_dropdown;
 	WavesDropdown& _quality_dropdown;
+	Gtk::Container& _copy_to_session_home;
 	WavesButton& _copy_to_session_button;
 };