diff --git a/src/core/containers/core_widget.py b/src/core/containers/base_container.py
similarity index 88%
rename from src/core/containers/core_widget.py
rename to src/core/containers/base_container.py
index 616ab1a..0c74967 100644
--- a/src/core/containers/core_widget.py
+++ b/src/core/containers/base_container.py
@@ -11,9 +11,9 @@ from .right_box import RightBox
 
 
 
-class CoreWidget(Gtk.Box):
+class BaseContainer(Gtk.Box):
     def __init__(self):
-        super(CoreWidget, self).__init__()
+        super(BaseContainer, self).__init__()
 
         self._builder = settings.get_builder()
 
diff --git a/src/core/controller.py b/src/core/controller.py
index 5e0748c..c4c12b9 100644
--- a/src/core/controller.py
+++ b/src/core/controller.py
@@ -13,7 +13,7 @@ from gi.repository import GLib
 from .mixins.signals_mixins import SignalsMixins
 from .controller_data import ControllerData
 from .screenshot_controller import ScreenshotController
-from .containers.core_widget import CoreWidget
+from .containers.base_container import BaseContainer
 
 
 
@@ -55,18 +55,18 @@ class Controller(SignalsMixins, ControllerData):
     def _load_widgets(self):
         ScreenshotController()
 
+    def _tggl_top_main_menubar(self):
+        print("_tggl_top_main_menubar > stub...")
+
     def load_glade_file(self):
         self.builder     = Gtk.Builder()
         # self.builder.add_from_file(settings.get_glade_file())
         self.builder.expose_object("main_window", self.window)
 
         settings.set_builder(self.builder)
-        self.core_widget = CoreWidget()
+        self.base_container = BaseContainer()
 
-        settings.register_signals_to_builder([self, self.core_widget])
+        settings.register_signals_to_builder([self, self.base_container])
 
-    def get_core_widget(self):
-        return self.core_widget
-
-    def _tggl_top_main_menubar(self):
-        print("_tggl_top_main_menubar > stub...")
+    def get_base_container(self):
+        return self.base_container
diff --git a/src/core/controller_data.py b/src/core/controller_data.py
index a444284..847d85a 100644
--- a/src/core/controller_data.py
+++ b/src/core/controller_data.py
@@ -15,7 +15,7 @@ class ControllerData:
     def setup_controller_data(self) -> None:
         self.window      = settings.get_main_window()
         self.builder     = None
-        self.core_widget = None
+        self.base_container   = None
         self.was_midified_key = False
         self.ctrl_down   = False
         self.shift_down  = False
diff --git a/src/core/window.py b/src/core/window.py
index 0545ed0..27ebfd1 100644
--- a/src/core/window.py
+++ b/src/core/window.py
@@ -67,7 +67,7 @@ class Window(Gtk.ApplicationWindow):
         if not self._controller:
             raise ControllerStartException("Controller exited and doesn't exist...")
 
-        self.add( self._controller.get_core_widget() )
+        self.add( self._controller.get_base_container() )
 
     def _set_window_data(self) -> None:
         screen = self.get_screen()
diff --git a/user_config/usr/applications/cornea.desktop b/user_config/usr/applications/cornea.desktop
index e4184fa..68a40bf 100755
--- a/user_config/usr/applications/cornea.desktop
+++ b/user_config/usr/applications/cornea.desktop
@@ -3,7 +3,7 @@ Name=Cornea
 GenericName=A Python and Gtk+ screenshot application.
 Comment=Take screenshots of your desktop.
 Exec=/bin/cornea
-Icon=/usr/share/cornea/cornea.png
+Icon=/usr/share/cornea/icons/cornea.png
 Type=Application
 StartupNotify=true
 Categories=Utility;