diff --git a/ImGuiToolkit.cpp b/ImGuiToolkit.cpp
index 1e0dd7f..2349f17 100644
--- a/ImGuiToolkit.cpp
+++ b/ImGuiToolkit.cpp
@@ -148,7 +148,7 @@ bool ImGuiToolkit::ButtonIcon(int i, int j, const char *tooltip)
     bool ret =  ImGui::ImageButton((void*)(intptr_t)textureicons, ImVec2(ImGui::GetTextLineHeightWithSpacing(),ImGui::GetTextLineHeightWithSpacing()), uv0, uv1, 3);
     ImGui::PopID();
 
-    if (tooltip != nullptr)
+    if (tooltip != nullptr && ImGui::IsItemHovered())
         ImGuiToolkit::ToolTip(tooltip);
 
     return ret;
diff --git a/UserInterfaceManager.cpp b/UserInterfaceManager.cpp
index d7c0935..2b9fc6d 100644
--- a/UserInterfaceManager.cpp
+++ b/UserInterfaceManager.cpp
@@ -1225,7 +1225,7 @@ void UserInterface::RenderPreview()
         ImGui::InputText("##cmd1", dummy_str, IM_ARRAYSIZE(dummy_str), ImGuiInputTextFlags_ReadOnly);
         ImGui::SameLine();
         ImGui::PushID(358794);
-        if ( ImGuiToolkit::ButtonIcon(3,6, "Copy to clipboard") )
+        if ( ImGuiToolkit::ButtonIcon(11,2, "Copy to clipboard") )
             ImGui::SetClipboardText(dummy_str);
         ImGui::PopID();
 
@@ -1235,7 +1235,7 @@ void UserInterface::RenderPreview()
         ImGui::InputText("##cmd2", dummy_str, IM_ARRAYSIZE(dummy_str), ImGuiInputTextFlags_ReadOnly);
         ImGui::SameLine();
         ImGui::PushID(899872);
-        if ( ImGuiToolkit::ButtonIcon(3,6, "Copy to clipboard") )
+        if ( ImGuiToolkit::ButtonIcon(11,2, "Copy to clipboard") )
             ImGui::SetClipboardText(dummy_str);
         ImGui::PopID();