diff --git a/Robot-Framework/resources/gui_keywords.resource b/Robot-Framework/resources/gui_keywords.resource
index b370d60..039f4e5 100644
--- a/Robot-Framework/resources/gui_keywords.resource
+++ b/Robot-Framework/resources/gui_keywords.resource
@@ -25,28 +25,12 @@ GUI Log out
     [Documentation]   Log out and optionally verify that desktop is not available
     [Arguments]        ${log_out_icon}=./logout.png
     Start ydotoold
-    Log To Console    Going to click the app menu icon
-    Locate and click  ${start_menu}  0.95  5
-    Log To Console    Checking if logout icon is in app menu
-    ${login_icon_found_status}  ${msg}  Run Keyword And Ignore Error  Get icon  app  system-log-out.svg  crop=10  output_filename=logout.png
-    ${locate_status}=  Set Variable  FAIL
-    IF  $login_icon_found_status == "PASS"
-        ${locate_status}  ${msg}  Run Keyword And Ignore Error  Locate image on screen  ./logout.png
-    END
-    IF  $locate_status == "PASS"
-        Log To Console    Going to click the Log Out icon
-        Locate and click  ${log_out_icon}  0.95  5
-    ELSE
-        Log To Console    No logout icon on app menu detected. Searching logout from the taskbar power icon
-        # Previously opened app menu needs to be closed
-        Locate and click  ${start_menu}  0.95  5
-        Get icon  ghaf-artwork  power.svg  crop=0  background=black
-        Locate and click  ./icon.png  0.95  5
-        Get icon  ghaf-artwork  logout.svg  crop=0  background=black
-        Locate and click  ./icon.png  0.95  5
-    END
+    Get icon           ghaf-artwork  power.svg  crop=0  background=black
+    Locate and click   ./icon.png  0.95  5
+    Get icon           ghaf-artwork  logout.svg  crop=0  background=black
+    Locate and click   ./icon.png  0.95  5
     Verify logout
-    Run Keyword If    ${LOGGED_IN_STATUS}  FAIL   Log out failed. Desktop is still running.
+    Run Keyword If     ${LOGGED_IN_STATUS}  FAIL   Log out failed. Desktop is still running.
 
 Type string and press enter
     [Arguments]   ${string}